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

kdialogd3/CMakeLists.txt

@@ -35,6 +35,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdecore-shared tdeui-shared kio-shared
+  LINK tdecore-shared tdeui-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kdialogd3/kdialogd.cpp

@@ -5,10 +5,10 @@
 #include <kdiroperator.h>
 #include <kuniqueapplication.h>
 #include <tqsocketnotifier.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurlcombobox.h>
 #ifdef USE_KWIN
 #include <twin.h>

kdialogd3/kdialogd.h

@@ -1,9 +1,9 @@
 #ifndef __KDIALOGD_H__
 #define __KDIALOGD_H__
 
-#include <kfile.h>
-#include <kfiledialog.h>
-#include <kfiledialog.h>
+#include <tdefile.h>
+#include <tdefiledialog.h>
+#include <tdefiledialog.h>
 #include <kdirselectdialog.h>
 #include "common.h"
 #include "config.h"

kgtk-wrapper

@@ -72,7 +72,7 @@ if [ "$toolkit" = "" ] && [ ! -z "$realApp" ] ; then
         fi
 
         if [ "$toolkit" = "qt3" ] || [ "$toolkit" = "qt4" ] ; then
-            if [ "0" != "`echo $libs | grep libkio | wc -l`" ] ; then
+            if [ "0" != "`echo $libs | grep libtdeio | wc -l`" ] ; then
                 toolkit=""
             fi
         fi