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

common/config_file.c

@@ -664,8 +664,8 @@ static const char *qtcConfDir()
 #else
         /*
            Hmm... for 'root' dont bother to check env var, just set to ~/.config
-           - as problems would arise if "sudo kcmshell style", and then
+           - as problems would arise if "sudo tdecmshell style", and then
-           "sudo su" / "kcmshell style". The 1st would write to ~/.config, but
+           "sudo su" / "tdecmshell style". The 1st would write to ~/.config, but
            if root has a XDG_ set then that would be used on the second :-(
         */
 #ifndef _WIN32

common/config_file.c-orig

@@ -329,8 +329,8 @@ static const char *xdgConfigFolder()
 #else
         /*
            Hmm... for 'root' dont bother to check env var, just set to ~/.config
-           - as problems would arise if "sudo kcmshell style", and then
+           - as problems would arise if "sudo tdecmshell style", and then
-           "sudo su" / "kcmshell style". The 1st would write to ~/.config, but
+           "sudo su" / "tdecmshell style". The 1st would write to ~/.config, but
            if root has a XDG_ set then that would be used on the second :-(
         */
         char *env=0==getuid() ? NULL : getenv("XDG_CONFIG_HOME");

config/CMakeLists.txt

@@ -34,6 +34,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdeui-shared kio-shared
+  LINK tdeui-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

config/exportthemedialog.cpp

@@ -23,7 +23,7 @@
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqdir.h>
 #include <tqlabel.h>
 #include <tqlayout.h>

config/qtcurveconfig.cpp

@@ -39,8 +39,8 @@
 #include <tqwidgetstack.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kcharselect.h>