Rename a number of libraries and executables to avoid conflicts with KDE4

18 files changed, 24 insertions, 24 deletions

diff --git a/klaptopdaemon/CMakeLists.txt b/klaptopdaemon/CMakeLists.txt
index 86b0735..2558f04 100644
--- a/klaptopdaemon/CMakeLists.txt
+++ b/klaptopdaemon/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 
 tde_add_executable( klaptop_acpi_helper
   SOURCES acpi_helper.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -38,7 +38,7 @@ tde_add_executable( klaptop_acpi_helper
 
 tde_add_executable( klaptop_check
   SOURCES laptop_check.cpp
-  LINK kio-shared kcmlaptop-shared
+  LINK tdeio-shared kcmlaptop-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -49,7 +49,7 @@ tde_add_library( kcmlaptop SHARED AUTOMOC
   SOURCES portable.cpp smapidev.c
     daemon_state.cpp wake_laptop.cpp
     krichtextlabel.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
@@ -62,7 +62,7 @@ tde_add_kpart( kcm_laptop AUTOMOC
     power.cpp warning.cpp acpi.cpp sony.cpp
     profile.cpp buttons.cpp apm.cpp 
     ${CMAKE_CURRENT_BINARY_DIR}/crcresult.h
-  LINK kio-shared kcmlaptop-shared
+  LINK tdeio-shared kcmlaptop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 # crcresult.h header is included here cause it is
@@ -76,7 +76,7 @@ tde_add_kpart( kded_klaptopdaemon AUTOMOC
     xautolock.cc kpcmciainfo.cpp daemondock.cpp
     xautolock_diy.c xautolock_engine.c
     laptop_daemon.skel
-  LINK kio-shared kcmlaptop-shared 
+  LINK tdeio-shared kcmlaptop-shared 
     tdeinit_kded-shared ${XTEST_LIBRARIES} 
     ${XSCREENSAVER_LIBRARIES} ${XEXT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 48b3788..cf04dab 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -30,7 +30,7 @@
 
 // other KDE headers:
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 80e61b4..8f231e5 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -31,7 +31,7 @@
 
 // other KDE headers:
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop
index 98d7435..3312168 100644
--- a/klaptopdaemon/applnk/laptop.desktop
+++ b/klaptopdaemon/applnk/laptop.desktop
@@ -2,7 +2,7 @@
 X-TDE-Library=laptop
 X-TDE-FactoryName=laptop
 X-TDE-Init=laptop
-Exec=kcmshell laptop
+Exec=tdecmshell laptop
 Icon=laptop_battery
 Type=Application
 DocPath=kcontrol/laptop/index.html
diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop
index 4825dae..0d276d7 100644
--- a/klaptopdaemon/applnk/pcmcia.desktop
+++ b/klaptopdaemon/applnk/pcmcia.desktop
@@ -3,7 +3,7 @@ X-TDE-ModuleType=Library
 X-TDE-Library=laptop
 X-TDE-FactoryName=pcmcia
 X-TDE-ParentApp=kinfocenter
-Exec=kcmshell pcmcia
+Exec=tdecmshell pcmcia
 Icon=laptop_pcmcia
 Type=Application
 DocPath=kinfocenter/pcmcia/index.html
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 4523b4c..12edee7 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -30,7 +30,7 @@
 
 // other KDE headers:
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index 2ab0396..a489944 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -28,7 +28,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knumvalidator.h>
 #include <kdialog.h>
 #include <kapplication.h>
diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp
index 6d1fe7d..9daaca6 100644
--- a/klaptopdaemon/daemon_state.cpp
+++ b/klaptopdaemon/daemon_state.cpp
@@ -31,7 +31,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include "daemon_state.h"
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7c03af8..cdac1e1 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 #include <tqvbox.h>
@@ -526,7 +526,7 @@ void laptop_dock::invokeLockSuspend()
 void laptop_dock::invokeSetup()
 {
 	TDEProcess proc;
-	proc << KStandardDirs::findExe("kcmshell");
+	proc << KStandardDirs::findExe("tdecmshell");
 	proc << "laptop";
 	proc.start(TDEProcess::DontCare);
 	proc.detach();
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 8e9c042..3fffeed 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -31,7 +31,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include "laptop_daemon.h"
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 1687437..27d2451 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqlayout.h>
 #include <unistd.h>
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index d1af1a5..9f551dd 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -92,7 +92,7 @@
 #include <tqvaluevector.h>
 
 #include <kactivelabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <krichtextlabel.h>
diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h
index d2d2ef3..42d8c16 100644
--- a/klaptopdaemon/portable.h
+++ b/klaptopdaemon/portable.h
@@ -1,6 +1,6 @@
 #include <tqlabel.h>
 #include <kactivelabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqvgroupbox.h>
 #include <tqstringlist.h>
 
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index b7e387a..e1dfd5e 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -28,7 +28,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knumvalidator.h>
 #include <kdialog.h>
 #include <kapplication.h>
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index f60630b..f2c9a3b 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -32,7 +32,7 @@
 
 // other KDE headers:
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index ad2bda2..16d0155 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -32,7 +32,7 @@
 
 // other KDE headers:
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp
index 8902be8..1e9d92b 100644
--- a/klaptopdaemon/wake_laptop.cpp
+++ b/klaptopdaemon/wake_laptop.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatastream.h>
 #include <dcopclient.h>
 #include <kapplication.h>
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index f7f3b85..259c48c 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -26,9 +26,9 @@
 #include "version.h"
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kapplication.h>
 #include <kcombobox.h>