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

16 files changed, 21 insertions, 21 deletions

diff --git a/tdeprint/management/CMakeLists.txt b/tdeprint/management/CMakeLists.txt
index ccaf2a70a..47dcda996 100644
--- a/tdeprint/management/CMakeLists.txt
+++ b/tdeprint/management/CMakeLists.txt
@@ -24,9 +24,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdefx
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${CMAKE_SOURCE_DIR}/tdeprint
 )
 
diff --git a/tdeprint/management/Makefile.am b/tdeprint/management/Makefile.am
index f0d1acd9f..f9f5c0ce4 100644
--- a/tdeprint/management/Makefile.am
+++ b/tdeprint/management/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -D_TDEPRINT_COMPILE
 
-INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdefx -I$(top_srcdir)/tdeprint -I$(top_builddir)/tdeprint -I$(top_srcdir)/tdeio -I$(top_srcdir)/tdefile -I$(top_srcdir) $(all_includes)
 
 lib_LTLIBRARIES = libtdeprint_management.la
 kde_module_LTLIBRARIES = libtdeprint_management_module.la
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index ee63e9eeb..b3ef6e329 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -32,7 +32,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name)
 : KDialogBase(IconList,i18n("TDE Print Configuration"),Ok|Cancel,Ok,parent,name,true,true)
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 2eea53b0e..bcbe1b0f7 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -29,7 +29,7 @@
 #include <tqapplication.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klistbox.h>
 #include <kdialog.h>
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index b933cab00..91861f5ca 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -29,10 +29,10 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kurlrequester.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klistview.h>
 #include <kdialog.h>
 
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index f02cfa854..b7c0a1522 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -30,7 +30,7 @@
 #include <kurlrequester.h>
 #include <krun.h>
 #include <kmimemagic.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kmessagebox.h>
 #include <kcursor.h>
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 0fb40fb7b..667b40381 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -24,7 +24,7 @@
 
 #include <knuminput.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 548968701..3d084f735 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 
 KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 704a20db5..1b05f8e9c 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -35,9 +35,9 @@
 
 #include <klocale.h>
 #include <kcursor.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kguiitem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index da8a98016..5e4561c19 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -44,7 +44,7 @@
 #include <kmenubar.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqtimer.h>
 #include <tqlayout.h>
 #include <stdlib.h>
@@ -52,7 +52,7 @@
 #include <kdialogbase.h>
 #include <tqcheckbox.h>
 #include <kurldrag.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #undef m_manager
 #define	m_manager	KMFactory::self()->jobManager()
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index daafbff97..858fca0fc 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -45,7 +45,7 @@
 #include <kmessagebox.h>
 #include <kaction.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 #include <kdebug.h>
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 9e3775c14..ba6801769 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kicondialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 
 KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index 5acc27351..a45a9caa0 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -20,7 +20,7 @@
 #include "kmtimer.h"
 #include "kmfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KMTimer* KMTimer::m_self = 0;
 
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 0e0cd306b..4f57762aa 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -32,7 +32,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index 1fbaf45ff..f3b54dcdc 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -26,7 +26,7 @@
 
 #include <kurlrequester.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 KMWFile::KMWFile(TQWidget *parent, const char *name)
 : KMWizardPage(parent,name)
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 6f2b4485e..093d2a909 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 #include <kguiitem.h>
 #include <kactivelabel.h>