diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/clock | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/clock')
| -rw-r--r-- | kcontrol/clock/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/clock/clock.desktop | 2 | ||||
| -rw-r--r-- | kcontrol/clock/dtime.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/clock/tzone.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/clock/CMakeLists.txt b/kcontrol/clock/CMakeLists.txt index 0be0eabd1..b64527389 100644 --- a/kcontrol/clock/CMakeLists.txt +++ b/kcontrol/clock/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES clock.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_clock AUTOMOC SOURCES dtime.cpp tzone.cpp main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/clock/clock.desktop b/kcontrol/clock/clock.desktop index d74a8a6f4..2d5f06467 100644 --- a/kcontrol/clock/clock.desktop +++ b/kcontrol/clock/clock.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kcmshell tde-clock.desktop +Exec=tdecmshell tde-clock.desktop Icon=date DocPath=kcontrol/clock/index.html diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index 663b4735e..f46031640 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -37,7 +37,7 @@ #include <kprocess.h> #include <kmessagebox.h> #include <kdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "dtime.h" #include "dtime.moc" diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 541f0cf83..4af720b04 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -32,7 +32,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> //#include "xpm/world.xpm" #include "tzone.h" |