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

12 files changed, 16 insertions, 16 deletions

diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp
index be6546214..5ee3cdde8 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -36,7 +36,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <ktempfile.h>
diff --git a/tdeprint/printmgr/printers.desktop b/tdeprint/printmgr/printers.desktop
index fff6ba026..c6e5679b5 100644
--- a/tdeprint/printmgr/printers.desktop
+++ b/tdeprint/printmgr/printers.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell printers
+Exec=tdecmshell printers
 Icon=printmgr
 Type=Application
 DocPath=tdeprint/index.html
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am
index 46dbe4250..8cfba4dd7 100644
--- a/tdeprint/slave/Makefile.am
+++ b/tdeprint/slave/Makefile.am
@@ -19,4 +19,4 @@ servicesdir = $(kde_servicesdir)
 services_DATA = print.protocol printdb.protocol
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_print.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_print.pot
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index 8c8001ddc..844934137 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -29,11 +29,11 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
diff --git a/tdeprint/slave/kio_print.h b/tdeprint/slave/kio_print.h
index afd337ba6..1b7158eb9 100644
--- a/tdeprint/slave/kio_print.h
+++ b/tdeprint/slave/kio_print.h
@@ -20,8 +20,8 @@
 #ifndef KIO_PRINT_H
 #define KIO_PRINT_H
 
-#include <kio/slavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/global.h>
 #include <tqstring.h>
 #include <tqbuffer.h>
 
diff --git a/tdeprint/slave/print.protocol b/tdeprint/slave/print.protocol
index 38989160b..7fe7c7fd0 100644
--- a/tdeprint/slave/print.protocol
+++ b/tdeprint/slave/print.protocol
@@ -11,5 +11,5 @@ deleting=false
 moving=false
 linking=false
 Icon=postscript
-DocPath=kioslave/print.html
+DocPath=tdeioslave/print.html
 defaultMimetype=application/octet-stream
diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp
index 97d5e036a..26b6b77ab 100644
--- a/tdeprint/tdeprintfax/conffax.cpp
+++ b/tdeprint/tdeprintfax/conffax.cpp
@@ -27,7 +27,7 @@
 #include <tqprinter.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp
index 0526ee684..d7471fc5d 100644
--- a/tdeprint/tdeprintfax/confgeneral.cpp
+++ b/tdeprint/tdeprintfax/confgeneral.cpp
@@ -26,7 +26,7 @@
 #include <tqcheckbox.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp
index e1171962a..167e8b6f7 100644
--- a/tdeprint/tdeprintfax/confsystem.cpp
+++ b/tdeprint/tdeprintfax/confsystem.cpp
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
  
 #include <kglobal.h> 
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp
index fd0073b7a..6cc0e115f 100644
--- a/tdeprint/tdeprintfax/faxab.cpp
+++ b/tdeprint/tdeprintfax/faxab.cpp
@@ -32,7 +32,7 @@
 #include <krun.h>
 #include <kstdguiitem.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 FaxAB::FaxAB(TQWidget *parent, const char *name)
 : KDialog(parent, name, true)
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 2c8faffc6..78f0a119a 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -37,7 +37,7 @@
 
 #include <kprocess.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
@@ -47,7 +47,7 @@
 #include <kemailsettings.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 #include <stdlib.h>
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 95266a95b..015bf7172 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.cpp
+++ b/tdeprint/tdeprintfax/tdeprintfax.cpp
@@ -43,9 +43,9 @@
 #include <tqheader.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmimetype.h>
 #include <kseparator.h>
 #include <ksystemtray.h>