Rename additional header files to avoid conflicts with KDE4

20 files changed, 23 insertions, 23 deletions

diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp
index fab6a6fba..83b4d0813 100644
--- a/tdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 AddressDialog::AddressDialog(TQWidget *parent, const char *name)
 	: KDialogBase(Swallow, i18n("ACL Address"), Ok|Cancel, Ok, parent, name, true, true)
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp
index b337eb883..3268c72bc 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
 	: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index 4b056cdb0..e66048b73 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -28,7 +28,7 @@
 #include <tqcombobox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
index d17c8bd0c..8a788cad3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -21,7 +21,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 TQString Comment::comment()
diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
index 102ead1c8..2c5610411 100644
--- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index c9b219112..22a3b2d54 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -33,11 +33,11 @@
 
 #include <tqdir.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqstringlist.h>
 #include <tqwhatsthis.h>
diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
index 268465a76..282657255 100644
--- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
index 79c8a9401..e9cb1a0ad 100644
--- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
@@ -27,7 +27,7 @@
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index f12f82f1e..49fdecc7c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index 00972e368..22128b39c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index 9edca5868..e939c151f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index d11851c60..6d6061264 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -28,9 +28,9 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
 	: CupsdPage(parent, name)
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index cfd731430..e89356af9 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 int findComboItem(TQComboBox *cb, const TQString& str)
 {
diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
index a058299f0..c28329e67 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 3e3fa80e2..936dee212 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -22,7 +22,7 @@
 #include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kguiitem.h>
 
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp
index 3896f7845..0754ae573 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 LocationDialog::LocationDialog(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp
index abc81477c..78b0e1edf 100644
--- a/tdeprint/cups/cupsdconf2/main.cpp
+++ b/tdeprint/cups/cupsdconf2/main.cpp
@@ -20,7 +20,7 @@
 #include "cupsddialog.h"
 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 
diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp
index 18cade9fc..f758d5d1e 100644
--- a/tdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/portdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 PortDialog::PortDialog(TQWidget *parent, const char *name)
 	: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true)
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index 628e8d40c..0992e2935 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -23,7 +23,7 @@
 #include <tqheader.h>
 #include <tqpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 
diff --git a/tdeprint/cups/cupsdconf2/sizewidget.cpp b/tdeprint/cups/cupsdconf2/sizewidget.cpp
index 742702e48..eaa39152f 100644
--- a/tdeprint/cups/cupsdconf2/sizewidget.cpp
+++ b/tdeprint/cups/cupsdconf2/sizewidget.cpp
@@ -23,7 +23,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SizeWidget::SizeWidget( TQWidget *parent, const char *name )
 	: TQWidget( parent, name )