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

8 files changed, 8 insertions, 8 deletions

diff --git a/krfb/kcm_krfb/CMakeLists.txt b/krfb/kcm_krfb/CMakeLists.txt
index 4f7e0b95..194e2ac5 100644
--- a/krfb/kcm_krfb/CMakeLists.txt
+++ b/krfb/kcm_krfb/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES kcmkrfb.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_krfb AUTOMOC
   SOURCES configurationwidget.ui kcm_krfb.cpp
-  LINK krfbconfig-static srvloc-static tdednssd-shared kio-shared
+  LINK krfbconfig-static srvloc-static tdednssd-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index dfa8acf1..4279fb0f 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -32,7 +32,7 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kdatastream.h>
 #include <kdebug.h>
diff --git a/krfb/kcm_krfb/kcmkrfb.desktop b/krfb/kcm_krfb/kcmkrfb.desktop
index 857c8962..c79fb2f2 100644
--- a/krfb/kcm_krfb/kcmkrfb.desktop
+++ b/krfb/kcm_krfb/kcmkrfb.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=krfb
 Type=Application
-Exec=kcmshell kcmkrfb
+Exec=tdecmshell kcmkrfb
 DocPath=krfb/krfb-configuration.html
 
 X-TDE-ModuleType=Library
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index 369b1549..4a5abecd 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -25,7 +25,7 @@
 #include <kservicetype.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <ksockaddr.h>
 #include <kextsock.h>
diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt
index 9f720945..799444d2 100644
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( krfb AUTOMOC
     rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
     krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
   LINK
-    krfbconfig-static vncserver-static srvloc-static tdeui-shared kio-shared jpeg Xext pthread ${XTST_LIBRARIES}
+    krfbconfig-static vncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index 40812960..e34c1ec8 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -467,7 +467,7 @@ void Configuration::inviteEmail() {
 ////////////// invoke kcontrol module //////////////////////////
 
 void Configuration::showConfigurationModule() {
-		KRun::run( "kcmshell kcmkrfb", KURL::List() );
+		KRun::run( "tdecmshell kcmkrfb", KURL::List() );
 }
 
 
diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h
index f405ea11..dceceb9b 100644
--- a/krfb/krfb/configuration.h
+++ b/krfb/krfb/configuration.h
@@ -25,7 +25,7 @@
 #include "invitedialog.h"
 
 #include <dcopref.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 #include <tqobject.h>
 #include <tqvalidator.h>
diff --git a/krfb/krfb/invitation.h b/krfb/krfb/invitation.h
index 2f7dbcd5..49b116ed 100644
--- a/krfb/krfb/invitation.h
+++ b/krfb/krfb/invitation.h
@@ -20,7 +20,7 @@
 
 #include <kapplication.h>
 #include <klistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqdatetime.h>