From 5ff32d08eb8398b35a662a47c7549a7b7b30cc79 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:53:00 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 kdialogd3/CMakeLists.txt | 2 +-
 kdialogd3/kdialogd.cpp   | 4 ++--
 kdialogd3/kdialogd.h     | 6 +++---
 kgtk-wrapper             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kdialogd3/CMakeLists.txt b/kdialogd3/CMakeLists.txt
index d9900ed..d56ee22 100644
--- a/kdialogd3/CMakeLists.txt
+++ b/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}
 )
\ No newline at end of file
diff --git a/kdialogd3/kdialogd.cpp b/kdialogd3/kdialogd.cpp
index 1490452..e1e9f1f 100644
--- a/kdialogd3/kdialogd.cpp
+++ b/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>
diff --git a/kdialogd3/kdialogd.h b/kdialogd3/kdialogd.h
index f7e5901..9193ca0 100644
--- a/kdialogd3/kdialogd.h
+++ b/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"
diff --git a/kgtk-wrapper b/kgtk-wrapper
index a46c646..5420e19 100755
--- a/kgtk-wrapper
+++ b/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