summaryrefslogtreecommitdiffstats
path: root/kmilo/thinkpad
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:05:57 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:05:57 -0600
commit0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch)
tree14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 /kmilo/thinkpad
parent0ec14ccb8401eff2be20f861953a77431410955c (diff)
downloadtdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz
tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kmilo/thinkpad')
-rw-r--r--kmilo/thinkpad/CMakeLists.txt2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/CMakeLists.txt2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/main.cpp2
-rw-r--r--kmilo/thinkpad/kcmthinkpad/thinkpad.desktop2
-rw-r--r--kmilo/thinkpad/thinkpad.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/kmilo/thinkpad/CMakeLists.txt b/kmilo/thinkpad/CMakeLists.txt
index 7907fd8..1bee777 100644
--- a/kmilo/thinkpad/CMakeLists.txt
+++ b/kmilo/thinkpad/CMakeLists.txt
@@ -30,7 +30,7 @@ link_directories(
tde_add_kpart( kmilo_thinkpad AUTOMOC
SOURCES thinkpad.cpp
- LINK kio-shared kmilo-shared
+ LINK tdeio-shared kmilo-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt
index 0a79639..11f1409 100644
--- a/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt
+++ b/kmilo/thinkpad/kcmthinkpad/CMakeLists.txt
@@ -29,7 +29,7 @@ add_definitions(
tde_add_kpart( kcm_thinkpad AUTOMOC
SOURCES kcmthinkpad_general.ui main.cpp
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index bb61c87..5b8d8d3 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -33,7 +33,7 @@
#include <kgenericfactory.h>
#include <kaboutdata.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kurlrequester.h>
#include <tdecmodule.h>
diff --git a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
index 4b0b0d4..6b76314 100644
--- a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
+++ b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=kcmshell thinkpad
+Exec=tdecmshell thinkpad
Icon=laptop
DocPath=kcontrol/thinkpad/index.html
diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp
index 2a57daa..16e22a9 100644
--- a/kmilo/thinkpad/thinkpad.cpp
+++ b/kmilo/thinkpad/thinkpad.cpp
@@ -30,7 +30,7 @@
*/
#include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <krun.h>
#include <kurl.h>
#include "kmilointerface.h"