From 0ea54195f4400f13a5cc109feee4b3779fbd2f0f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:57 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 khexedit/CMakeLists.txt     | 2 +-
 khexedit/dialog.cc          | 2 +-
 khexedit/exportdialog.cc    | 2 +-
 khexedit/hexeditorwidget.cc | 4 ++--
 khexedit/hextoolwidget.h    | 2 +-
 khexedit/stringdialog.cc    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'khexedit')

diff --git a/khexedit/CMakeLists.txt b/khexedit/CMakeLists.txt
index fbc83c5..89323d2 100644
--- a/khexedit/CMakeLists.txt
+++ b/khexedit/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( khexedit AUTOMOC
     bitswapwidget.cc chartabledialog.cc
     hexdrag.cc exportdialog.cc fileinfodialog.cc
     converterdialog.cc listview.cc searchbar.cc
-  LINK kio-shared tdeprint-shared
+  LINK tdeio-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index 6daed1a..ce9b615 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqvalidator.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index 612c245..25ee291 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -22,7 +22,7 @@
 #include <tqbuttongroup.h>
 #include <tqlineedit.h> 
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 0656e96..f0ac048 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -24,9 +24,9 @@
 
 #undef Unsorted
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h
index fda0058..1a6ddf4 100644
--- a/khexedit/hextoolwidget.h
+++ b/khexedit/hextoolwidget.h
@@ -21,7 +21,7 @@
 #ifndef _HEX_TOOL_WIDGET_H_
 #define _HEX_TOOL_WIDGET_H_
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TQGridLayout;
 class TQComboBox;
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index a1367b4..1fa8d1a 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -24,7 +24,7 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-- 
cgit v1.2.1