summaryrefslogtreecommitdiffstats
path: root/tdeprint
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/cups/cupsaddsmb2.cpp4
-rw-r--r--tdeprint/cups/cupsdconf2/addressdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/browsedialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdcomment.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdconf.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.cpp6
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddirpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdjobspage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdlogpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp4
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdserverpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdsplash.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/locationdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/main.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/portdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/sizewidget.cpp2
-rw-r--r--tdeprint/cups/cupsinfos.cpp2
-rw-r--r--tdeprint/cups/ippreportdlg.cpp4
-rw-r--r--tdeprint/cups/ipprequest.cpp4
-rw-r--r--tdeprint/cups/kmconfigcups.cpp2
-rw-r--r--tdeprint/cups/kmconfigcupsdir.cpp2
-rw-r--r--tdeprint/cups/kmcupsconfigwidget.cpp2
-rw-r--r--tdeprint/cups/kmcupsfactory.cpp2
-rw-r--r--tdeprint/cups/kmcupsjobmanager.cpp2
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp4
-rw-r--r--tdeprint/cups/kmcupsuimanager.cpp4
-rw-r--r--tdeprint/cups/kmpropbanners.cpp2
-rw-r--r--tdeprint/cups/kmpropquota.cpp2
-rw-r--r--tdeprint/cups/kmpropusers.cpp2
-rw-r--r--tdeprint/cups/kmwbanners.cpp2
-rw-r--r--tdeprint/cups/kmwfax.cpp2
-rw-r--r--tdeprint/cups/kmwipp.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.cpp4
-rw-r--r--tdeprint/cups/kmwippselect.cpp2
-rw-r--r--tdeprint/cups/kmwother.cpp2
-rw-r--r--tdeprint/cups/kmwquota.cpp2
-rw-r--r--tdeprint/cups/kmwusers.cpp2
-rw-r--r--tdeprint/cups/kphpgl2page.cpp2
-rw-r--r--tdeprint/cups/kpimagepage.cpp2
-rw-r--r--tdeprint/cups/kpschedulepage.cpp2
-rw-r--r--tdeprint/cups/kptagspage.cpp2
-rw-r--r--tdeprint/cups/kptextpage.cpp2
-rw-r--r--tdeprint/driver.cpp2
-rw-r--r--tdeprint/driverview.cpp2
-rw-r--r--tdeprint/droptionview.cpp2
-rw-r--r--tdeprint/ext/kextprinterimpl.cpp2
-rw-r--r--tdeprint/ext/kmextmanager.cpp2
-rw-r--r--tdeprint/ext/kmextuimanager.cpp2
-rw-r--r--tdeprint/foomatic/kfoomaticprinterimpl.cpp2
-rw-r--r--tdeprint/foomatic/kmfoomaticmanager.cpp2
-rw-r--r--tdeprint/foomatic2loader.cpp2
-rw-r--r--tdeprint/kmfactory.cpp4
-rw-r--r--tdeprint/kmjob.cpp2
-rw-r--r--tdeprint/kmmanager.cpp2
-rw-r--r--tdeprint/kmprinter.cpp2
-rw-r--r--tdeprint/kmspecialmanager.cpp4
-rw-r--r--tdeprint/kmuimanager.cpp2
-rw-r--r--tdeprint/kmvirtualmanager.cpp4
-rw-r--r--tdeprint/kpcopiespage.cpp2
-rw-r--r--tdeprint/kpdriverpage.cpp2
-rw-r--r--tdeprint/kpfileselectpage.cpp2
-rw-r--r--tdeprint/kpfilterpage.cpp4
-rw-r--r--tdeprint/kpgeneralpage.cpp2
-rw-r--r--tdeprint/kpmarginpage.cpp4
-rw-r--r--tdeprint/kpposterpage.cpp2
-rw-r--r--tdeprint/kpqtpage.cpp2
-rw-r--r--tdeprint/kprintaction.cpp2
-rw-r--r--tdeprint/kprintdialog.cpp6
-rw-r--r--tdeprint/kprinter.cpp6
-rw-r--r--tdeprint/kprinterimpl.cpp4
-rw-r--r--tdeprint/kprinterpropertydialog.cpp4
-rw-r--r--tdeprint/kprintpreview.cpp4
-rw-r--r--tdeprint/kprintprocess.cpp2
-rw-r--r--tdeprint/kxmlcommand.cpp4
-rw-r--r--tdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--tdeprint/lpd/kmlpdmanager.cpp2
-rw-r--r--tdeprint/lpd/kmlpduimanager.cpp2
-rw-r--r--tdeprint/lpd/lpdtools.cpp2
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.cpp2
-rw-r--r--tdeprint/lpdunix/kmlpdunixmanager.cpp2
-rw-r--r--tdeprint/lpdunix/kmlpdunixuimanager.cpp2
-rw-r--r--tdeprint/lpr/apshandler.cpp2
-rw-r--r--tdeprint/lpr/editentrydialog.cpp2
-rw-r--r--tdeprint/lpr/kmconfiglpr.cpp2
-rw-r--r--tdeprint/lpr/kmlprjobmanager.cpp2
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp4
-rw-r--r--tdeprint/lpr/kmlpruimanager.cpp2
-rw-r--r--tdeprint/lpr/lpchelper.cpp2
-rw-r--r--tdeprint/lpr/lprhandler.cpp2
-rw-r--r--tdeprint/lpr/lprngtoolhandler.cpp2
-rw-r--r--tdeprint/lpr/matichandler.cpp2
-rw-r--r--tdeprint/management/kaddprinterwizard.cpp6
-rw-r--r--tdeprint/management/kmconfigcommand.cpp2
-rw-r--r--tdeprint/management/kmconfigdialog.cpp2
-rw-r--r--tdeprint/management/kmconfigfilter.cpp2
-rw-r--r--tdeprint/management/kmconfigfonts.cpp2
-rw-r--r--tdeprint/management/kmconfiggeneral.cpp4
-rw-r--r--tdeprint/management/kmconfigjobs.cpp2
-rw-r--r--tdeprint/management/kmconfigpreview.cpp2
-rw-r--r--tdeprint/management/kmdbcreator.cpp2
-rw-r--r--tdeprint/management/kmdriverdb.cpp2
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kmdriverdialog.cpp4
-rw-r--r--tdeprint/management/kminfopage.cpp2
-rw-r--r--tdeprint/management/kminstancepage.cpp4
-rw-r--r--tdeprint/management/kmjobviewer.cpp6
-rw-r--r--tdeprint/management/kmlistview.cpp2
-rw-r--r--tdeprint/management/kmmainview.cpp6
-rw-r--r--tdeprint/management/kmpages.cpp2
-rw-r--r--tdeprint/management/kmprinterview.cpp2
-rw-r--r--tdeprint/management/kmpropbackend.cpp2
-rw-r--r--tdeprint/management/kmpropcontainer.cpp2
-rw-r--r--tdeprint/management/kmpropdriver.cpp2
-rw-r--r--tdeprint/management/kmpropgeneral.cpp2
-rw-r--r--tdeprint/management/kmpropmembers.cpp2
-rw-r--r--tdeprint/management/kmpropwidget.cpp4
-rw-r--r--tdeprint/management/kmspecialprinterdlg.cpp4
-rw-r--r--tdeprint/management/kmwbackend.cpp2
-rw-r--r--tdeprint/management/kmwclass.cpp2
-rw-r--r--tdeprint/management/kmwdriver.cpp2
-rw-r--r--tdeprint/management/kmwdriverselect.cpp4
-rw-r--r--tdeprint/management/kmwdrivertest.cpp4
-rw-r--r--tdeprint/management/kmwend.cpp2
-rw-r--r--tdeprint/management/kmwfile.cpp2
-rw-r--r--tdeprint/management/kmwinfopage.cpp2
-rw-r--r--tdeprint/management/kmwizard.cpp4
-rw-r--r--tdeprint/management/kmwlocal.cpp4
-rw-r--r--tdeprint/management/kmwlpd.cpp4
-rw-r--r--tdeprint/management/kmwname.cpp4
-rw-r--r--tdeprint/management/kmwpassword.cpp2
-rw-r--r--tdeprint/management/kmwsmb.cpp2
-rw-r--r--tdeprint/management/kmwsocket.cpp4
-rw-r--r--tdeprint/management/kmwsocketutil.cpp4
-rw-r--r--tdeprint/management/kxmlcommanddlg.cpp4
-rw-r--r--tdeprint/management/kxmlcommandselector.cpp4
-rw-r--r--tdeprint/management/networkscanner.cpp4
-rw-r--r--tdeprint/management/smbview.cpp6
-rw-r--r--tdeprint/management/tdeprint_management_module.cpp4
-rw-r--r--tdeprint/marginpreview.cpp2
-rw-r--r--tdeprint/marginwidget.cpp4
-rw-r--r--tdeprint/plugincombobox.cpp2
-rw-r--r--tdeprint/posterpreview.cpp4
-rw-r--r--tdeprint/ppdloader.cpp2
-rw-r--r--tdeprint/printerfilter.cpp2
-rw-r--r--tdeprint/rlpr/kmconfigproxy.cpp2
-rw-r--r--tdeprint/rlpr/kmproprlpr.cpp2
-rw-r--r--tdeprint/rlpr/kmproxywidget.cpp2
-rw-r--r--tdeprint/rlpr/kmrlprmanager.cpp2
-rw-r--r--tdeprint/rlpr/kmrlpruimanager.cpp2
-rw-r--r--tdeprint/rlpr/kmwrlpr.cpp2
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--tdeprint/tdefilelist.cpp2
-rw-r--r--tdeprint/tdeprintd.cpp4
-rw-r--r--tdeprint/tests/helpwindow.cpp2
-rw-r--r--tdeprint/tools/escputil/escpwidget.cpp4
-rw-r--r--tdeprint/util.h2
161 files changed, 214 insertions, 214 deletions
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index 685ce6e7e..256f5ee23 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -26,8 +26,8 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqmessagebox.h>
#include <tqfile.h>
#include <tdeio/passdlg.h>
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 )
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 330429583..f6d392bd9 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -24,7 +24,7 @@
#include <tdeio/passdlg.h>
#include <tdeio/authinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp
index 1e07789ac..ed56804bc 100644
--- a/tdeprint/cups/ippreportdlg.cpp
+++ b/tdeprint/cups/ippreportdlg.cpp
@@ -21,9 +21,9 @@
#include "ipprequest.h"
#include "kprinter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <ktextedit.h>
#include <tqsimplerichtext.h>
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index 4edaefb58..ebbefefe9 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -24,8 +24,8 @@
#include <string>
#include <cups/language.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqdatetime.h>
#include <tqregexp.h>
#include <cups/cups.h>
diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp
index 1b0ccdaea..6bc9ec155 100644
--- a/tdeprint/cups/kmconfigcups.cpp
+++ b/tdeprint/cups/kmconfigcups.cpp
@@ -20,7 +20,7 @@
#include "kmconfigcups.h"
#include "kmcupsconfigwidget.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdialog.h>
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 6f16f5dfa..10a455226 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -21,7 +21,7 @@
#include <tqcheckbox.h>
#include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tdeconfig.h>
#include <tqgroupbox.h>
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index a62583b1b..f93c1a4b3 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -28,7 +28,7 @@
#include <tqpushbutton.h>
#include <tqvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcursor.h>
#include <tdeconfig.h>
#include <kstringhandler.h>
diff --git a/tdeprint/cups/kmcupsfactory.cpp b/tdeprint/cups/kmcupsfactory.cpp
index 47384eab6..f42bc449e 100644
--- a/tdeprint/cups/kmcupsfactory.cpp
+++ b/tdeprint/cups/kmcupsfactory.cpp
@@ -22,7 +22,7 @@
#include "kmcupsuimanager.h"
#include "kcupsprinterimpl.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kgenericfactory.h>
typedef K_TYPELIST_4( KMCupsManager, KMCupsJobManager, KMCupsUiManager, KCupsPrinterImpl ) Products;
diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp
index b7284d1ad..fa208e551 100644
--- a/tdeprint/cups/kmcupsjobmanager.cpp
+++ b/tdeprint/cups/kmcupsjobmanager.cpp
@@ -32,7 +32,7 @@
#include "kpcopiespage.h"
#include "kptagspage.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kurl.h>
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index cd472eefa..eaf5070b8 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -42,12 +42,12 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tdesocketbase.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <kdialogbase.h>
#include <kextendedsocket.h>
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index 60e683b84..03b85bb0a 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -55,10 +55,10 @@
#include <tqlistview.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "config.h"
diff --git a/tdeprint/cups/kmpropbanners.cpp b/tdeprint/cups/kmpropbanners.cpp
index 22098cdff..602af7f6d 100644
--- a/tdeprint/cups/kmpropbanners.cpp
+++ b/tdeprint/cups/kmpropbanners.cpp
@@ -24,7 +24,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropBanners::KMPropBanners(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/cups/kmpropquota.cpp b/tdeprint/cups/kmpropquota.cpp
index 9df6cbcb2..773e667e9 100644
--- a/tdeprint/cups/kmpropquota.cpp
+++ b/tdeprint/cups/kmpropquota.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
// some forward declarations (see kmwquota.cpp)
const char* unitKeyword(int);
diff --git a/tdeprint/cups/kmpropusers.cpp b/tdeprint/cups/kmpropusers.cpp
index 0f67205b0..2a2147aed 100644
--- a/tdeprint/cups/kmpropusers.cpp
+++ b/tdeprint/cups/kmpropusers.cpp
@@ -23,7 +23,7 @@
#include <tqtextview.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/cups/kmwbanners.cpp b/tdeprint/cups/kmwbanners.cpp
index c221f69d7..86f1347fb 100644
--- a/tdeprint/cups/kmwbanners.cpp
+++ b/tdeprint/cups/kmwbanners.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
TQStringList defaultBanners()
{
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 05b1b2cfa..15d4f8180 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kurl.h>
diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp
index cb9dedd6c..a8ec8d425 100644
--- a/tdeprint/cups/kmwipp.cpp
+++ b/tdeprint/cups/kmwipp.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvalidator.h>
#include <cups/http.h>
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index e80478f61..f7a4f0593 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -29,12 +29,12 @@
#include <kpushbutton.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtextview.h>
#include <tqlayout.h>
#include <tqregexp.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kguiitem.h>
#include <kurl.h>
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index c3f48ad27..237d74fd1 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -25,7 +25,7 @@
#include <tdelistbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 4e640d536..497fa03c3 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -29,7 +29,7 @@
#include <tqheader.h>
#include <tqdict.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/tdeprint/cups/kmwquota.cpp b/tdeprint/cups/kmwquota.cpp
index 67245fb20..5085913d0 100644
--- a/tdeprint/cups/kmwquota.cpp
+++ b/tdeprint/cups/kmwquota.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#ifdef HAVE_LIMITS_H
#include <limits.h>
diff --git a/tdeprint/cups/kmwusers.cpp b/tdeprint/cups/kmwusers.cpp
index 714f6f4d4..eed7c08af 100644
--- a/tdeprint/cups/kmwusers.cpp
+++ b/tdeprint/cups/kmwusers.cpp
@@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <keditlistbox.h>
KMWUsers::KMWUsers(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp
index 67ad61aec..f804b249d 100644
--- a/tdeprint/cups/kphpgl2page.cpp
+++ b/tdeprint/cups/kphpgl2page.cpp
@@ -23,7 +23,7 @@
#include <tqgroupbox.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index 669bab190..8d23fe3e0 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -32,7 +32,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kseparator.h>
#include <kstandarddirs.h>
diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp
index f778139dc..d7f13c8a4 100644
--- a/tdeprint/cups/kpschedulepage.cpp
+++ b/tdeprint/cups/kpschedulepage.cpp
@@ -27,7 +27,7 @@
#include <tqdatetime.h>
#include <tqlineedit.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kseparator.h>
#include <knuminput.h>
diff --git a/tdeprint/cups/kptagspage.cpp b/tdeprint/cups/kptagspage.cpp
index a5d465683..db134d9ba 100644
--- a/tdeprint/cups/kptagspage.cpp
+++ b/tdeprint/cups/kptagspage.cpp
@@ -26,7 +26,7 @@
#include <tqregexp.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name)
: KPrintDialogPage(parent, name)
diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp
index eb8bc3553..955434da4 100644
--- a/tdeprint/cups/kptextpage.cpp
+++ b/tdeprint/cups/kptextpage.cpp
@@ -29,7 +29,7 @@
#include <tqradiobutton.h>
#include <tqwhatsthis.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kseparator.h>
#include <kdebug.h>
diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp
index abc468f7a..6afc75d0f 100644
--- a/tdeprint/driver.cpp
+++ b/tdeprint/driver.cpp
@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <tqstringlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
#include <math.h>
diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp
index 02c7be610..fece6c40c 100644
--- a/tdeprint/driverview.cpp
+++ b/tdeprint/driverview.cpp
@@ -27,7 +27,7 @@
#include <tqheader.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
DrListView::DrListView(TQWidget *parent, const char *name)
: TDEListView(parent,name)
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index 1ec954251..77a910b0c 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -34,7 +34,7 @@
#include <kcursor.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
OptionBaseView::OptionBaseView(TQWidget *parent, const char *name)
: TQWidget(parent,name)
diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp
index 8959aa3e8..7923ea729 100644
--- a/tdeprint/ext/kextprinterimpl.cpp
+++ b/tdeprint/ext/kextprinterimpl.cpp
@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
KExtPrinterImpl::KExtPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KPrinterImpl(parent,name)
diff --git a/tdeprint/ext/kmextmanager.cpp b/tdeprint/ext/kmextmanager.cpp
index 598dd6648..abc832d6f 100644
--- a/tdeprint/ext/kmextmanager.cpp
+++ b/tdeprint/ext/kmextmanager.cpp
@@ -20,7 +20,7 @@
#include "kmextmanager.h"
#include "kmprinter.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMExtManager::KMExtManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMManager(parent,name)
diff --git a/tdeprint/ext/kmextuimanager.cpp b/tdeprint/ext/kmextuimanager.cpp
index 2fa200848..ee1c4e186 100644
--- a/tdeprint/ext/kmextuimanager.cpp
+++ b/tdeprint/ext/kmextuimanager.cpp
@@ -21,7 +21,7 @@
#include "kpqtpage.h"
#include "kprinterpropertydialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMExtUiManager::KMExtUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMUiManager(parent,name)
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index aacf6be8d..dd694b31b 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -21,7 +21,7 @@
#include "kprinter.h"
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KPrinterImpl(parent,name)
diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp
index 19e8401d8..e1e741003 100644
--- a/tdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/tdeprint/foomatic/kmfoomaticmanager.cpp
@@ -22,7 +22,7 @@
#include "driver.h"
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kprocess.h>
diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp
index 6add13378..0d0637c90 100644
--- a/tdeprint/foomatic2loader.cpp
+++ b/tdeprint/foomatic2loader.cpp
@@ -24,7 +24,7 @@
#include <tqregexp.h>
#include <tqbuffer.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void tdeprint_foomatic2scanner_init( TQIODevice* );
void tdeprint_foomatic2scanner_terminate();
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 09a2cf45a..16ec56c32 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -36,8 +36,8 @@
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstaticdeleter.h>
#include <tdeapplication.h>
diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index 7ff1efb95..2b42506f5 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -19,7 +19,7 @@
#include "kmjob.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMJob::KMJob()
: KMObject()
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index ca9b1036f..d43239fd7 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -30,7 +30,7 @@
#include <tqfile.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <klibloader.h>
diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp
index 22fc9d970..c7676e382 100644
--- a/tdeprint/kmprinter.cpp
+++ b/tdeprint/kmprinter.cpp
@@ -21,7 +21,7 @@
#include "kprinter.h"
#include "driver.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
KMPrinter::KMPrinter()
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index 84e120e77..910de4931 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -26,9 +26,9 @@
#include <tqfile.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <unistd.h>
diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp
index 962653dd2..4dd6966d3 100644
--- a/tdeprint/kmuimanager.cpp
+++ b/tdeprint/kmuimanager.cpp
@@ -36,7 +36,7 @@
#include "kxmlcommand.h"
#include "kpposterpage.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
KMUiManager::KMUiManager(TQObject *parent, const char *name)
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index b13637904..dabad3093 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -28,11 +28,11 @@
#include <tqtextstream.h>
#include <tqdir.h>
#include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <unistd.h>
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index d804cc9f2..10eb6e204 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -35,7 +35,7 @@
#include <tqlayout.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kseparator.h>
diff --git a/tdeprint/kpdriverpage.cpp b/tdeprint/kpdriverpage.cpp
index 18cfeb207..2bea47bc8 100644
--- a/tdeprint/kpdriverpage.cpp
+++ b/tdeprint/kpdriverpage.cpp
@@ -22,7 +22,7 @@
#include "driver.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KPDriverPage::KPDriverPage(KMPrinter *p, DrMain *d, TQWidget *parent, const char *name)
: KPrintDialogPage(p,d,parent,name)
diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp
index 6847ade2b..8b20386bd 100644
--- a/tdeprint/kpfileselectpage.cpp
+++ b/tdeprint/kpfileselectpage.cpp
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqregexp.h>
#include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
KPFileSelectPage::KPFileSelectPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 4704abb15..6f46085ee 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -27,9 +27,9 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kactivelabel.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp
index ea1ec61e3..821290704 100644
--- a/tdeprint/kpgeneralpage.cpp
+++ b/tdeprint/kpgeneralpage.cpp
@@ -34,7 +34,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Some ID's
#define ORIENT_PORTRAIT_ID 0
diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp
index ab70211c8..78b9ca6ef 100644
--- a/tdeprint/kpmarginpage.cpp
+++ b/tdeprint/kpmarginpage.cpp
@@ -31,9 +31,9 @@
#include <tqpaintdevicemetrics.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, const char *name)
: KPrintDialogPage(0, driver, parent, name)
diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp
index f719e251b..9c0a42501 100644
--- a/tdeprint/kpposterpage.cpp
+++ b/tdeprint/kpposterpage.cpp
@@ -31,7 +31,7 @@
#include <tqlineedit.h>
#include <tqwhatsthis.h>
#include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kiconloader.h>
diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp
index 11b5a6574..c0ca5656e 100644
--- a/tdeprint/kpqtpage.cpp
+++ b/tdeprint/kpqtpage.cpp
@@ -32,7 +32,7 @@
#include <tqwhatsthis.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#define ORIENT_PORTRAIT_ID 0
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index cc94fe3c8..4a4aac597 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -23,7 +23,7 @@
#include <tdeprint/kmmanager.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
class KPrintAction::KPrintActionPrivate
{
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 312146855..d881971ff 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -46,18 +46,18 @@
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqdir.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <klineedit.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kguiitem.h>
#include <kstdguiitem.h>
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 95cfc1733..4b9a1c98f 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -35,15 +35,15 @@
#include <tqguardedptr.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <krun.h>
#include <knotifyclient.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
static void dumpOptions(const TQMap<TQString,TQString>& opts);
static void reportError(KPrinter*);
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index ac79220f5..edd380009 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -32,14 +32,14 @@
#include <tqfile.h>
#include <tqregexp.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kdatastream.h>
#include <kdebug.h>
#include <kmimemagic.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <tdeconfig.h>
diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp
index 1128a7d3a..c120ba843 100644
--- a/tdeprint/kprinterpropertydialog.cpp
+++ b/tdeprint/kprinterpropertydialog.cpp
@@ -25,9 +25,9 @@
#include "kmprinter.h"
#include "driver.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kguiitem.h>
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 0311f543d..623a7f934 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -34,8 +34,8 @@
#include <krun.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdetoolbar.h>
diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp
index ec93fcce6..89ef5e2ca 100644
--- a/tdeprint/kprintprocess.cpp
+++ b/tdeprint/kprintprocess.cpp
@@ -19,7 +19,7 @@
#include "kprintprocess.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
KPrintProcess::KPrintProcess()
diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp
index f2dcb99ce..2d5712674 100644
--- a/tdeprint/kxmlcommand.cpp
+++ b/tdeprint/kxmlcommand.cpp
@@ -30,13 +30,13 @@
#include <tqmap.h>
#include <tqvaluelist.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdialogbase.h>
#include <kdebug.h>
#include <kprocess.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
static void setOptionText(DrBase *opt, const TQString& s)
{
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index e81b3a8cd..3647f0b38 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name)
: KPrinterImpl(parent,name)
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index 23c0422d0..e72733f89 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -32,7 +32,7 @@
#include <tqmap.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <kprocess.h>
diff --git a/tdeprint/lpd/kmlpduimanager.cpp b/tdeprint/lpd/kmlpduimanager.cpp
index fad3fcd58..173c03b2b 100644
--- a/tdeprint/lpd/kmlpduimanager.cpp
+++ b/tdeprint/lpd/kmlpduimanager.cpp
@@ -27,7 +27,7 @@
#include "kmpropdriver.h"
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMLpdUiManager::KMLpdUiManager(TQObject *parent, const char *name)
: KMUiManager(parent,name)
diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp
index 5131b33f3..54f19c405 100644
--- a/tdeprint/lpd/lpdtools.cpp
+++ b/tdeprint/lpd/lpdtools.cpp
@@ -22,7 +22,7 @@
#include "kmprinter.h"
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char *pt_pagesize[] = {
"ledger", I18N_NOOP("Ledger"),
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index 4237bda59..e628a1c41 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmacroexpander.h>
KLpdUnixPrinterImpl::KLpdUnixPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 232a49eb0..7a291f6df 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -26,7 +26,7 @@
#include <tqfileinfo.h>
#include <tqtextstream.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/tdeprint/lpdunix/kmlpdunixuimanager.cpp b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
index 686dfecbb..b7f059f1a 100644
--- a/tdeprint/lpdunix/kmlpdunixuimanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixuimanager.cpp
@@ -21,7 +21,7 @@
#include "kpqtpage.h"
#include "kprinterpropertydialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMLpdUnixUiManager::KMLpdUnixUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMUiManager(parent,name)
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index 3d144644a..acb0e0c2d 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -31,7 +31,7 @@
#include <tqtextstream.h>
#include <tqvaluestack.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <sys/types.h>
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index 3977f12f8..9a8f9caa2 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -28,7 +28,7 @@
#include <tdelistview.h>
#include <tqlayout.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const char *name)
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index 8a6988188..fed1dd17d 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -24,7 +24,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
diff --git a/tdeprint/lpr/kmlprjobmanager.cpp b/tdeprint/lpr/kmlprjobmanager.cpp
index 851663664..0738d17c1 100644
--- a/tdeprint/lpr/kmlprjobmanager.cpp
+++ b/tdeprint/lpr/kmlprjobmanager.cpp
@@ -25,7 +25,7 @@
#include "lprsettings.h"
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMLprJobManager::KMLprJobManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMJobManager(parent, name)
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 157105e60..046f082f7 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -30,13 +30,13 @@
#include <tqfileinfo.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kprinter.h>
#include <kprocess.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klibloader.h>
#include <stdlib.h>
diff --git a/tdeprint/lpr/kmlpruimanager.cpp b/tdeprint/lpr/kmlpruimanager.cpp
index 655309e0c..b7d23bb42 100644
--- a/tdeprint/lpr/kmlpruimanager.cpp
+++ b/tdeprint/lpr/kmlpruimanager.cpp
@@ -29,7 +29,7 @@
#include "kmwbackend.h"
#include "kmconfiglpr.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMLprUiManager::KMLprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMUiManager(parent,name)
diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp
index f72901865..b366537e5 100644
--- a/tdeprint/lpr/lpchelper.cpp
+++ b/tdeprint/lpr/lpchelper.cpp
@@ -26,7 +26,7 @@
#include <tqtextstream.h>
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <stdlib.h>
diff --git a/tdeprint/lpr/lprhandler.cpp b/tdeprint/lpr/lprhandler.cpp
index fcb838bb9..767b55382 100644
--- a/tdeprint/lpr/lprhandler.cpp
+++ b/tdeprint/lpr/lprhandler.cpp
@@ -27,7 +27,7 @@
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqvaluestack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <unistd.h>
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index d3e283123..960f5adb8 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -28,7 +28,7 @@
#include <tqfile.h>
#include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index e1242c5fc..826867cd2 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -29,7 +29,7 @@
#include "util.h"
#include "foomatic2loader.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 256b85011..466c75853 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -1,9 +1,9 @@
#include "kmmanager.h"
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
static TDECmdLineOptions options[] =
{
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 32fb7db11..4cf33998f 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -24,7 +24,7 @@
#include <tqgroupbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp
index 6f0e76e19..50eabe9b1 100644
--- a/tdeprint/management/kmconfigdialog.cpp
+++ b/tdeprint/management/kmconfigdialog.cpp
@@ -30,7 +30,7 @@
#include "kmconfigjobs.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeconfig.h>
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index 21cbc418e..b7be0a1e6 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -28,7 +28,7 @@
#include <tqlabel.h>
#include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <tdelistbox.h>
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 54ebdb87c..890a42045 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -28,7 +28,7 @@
#include <tqsettings.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kurlrequester.h>
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index b7c0a1522..635667cec 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -26,13 +26,13 @@
#include <tqwhatsthis.h>
#include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <krun.h>
#include <kmimemagic.h>
#include <tdeconfig.h>
#include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcursor.h>
#include <klineedit.h>
#include <kguiitem.h>
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 667b40381..c31e525be 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdialog.h>
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 3d084f735..2fdcbcb4b 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -24,7 +24,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <tdeconfig.h>
#include <kdialog.h>
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 2297d4034..6154ebea2 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -24,7 +24,7 @@
#include <tqprogressdialog.h>
#include <tqfileinfo.h>
#include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 9eb28cf87..5a172281b 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -29,7 +29,7 @@
#include <tqfileinfo.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
KMDriverDB* KMDriverDB::m_self = 0;
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 42d573e71..50297bdca 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -28,12 +28,12 @@
#include <tqcheckbox.h>
#include <kcursor.h>
#include <tqapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqstrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcursor.h>
#include <tdefiledialog.h>
#include <kguiitem.h>
diff --git a/tdeprint/management/kmdriverdialog.cpp b/tdeprint/management/kmdriverdialog.cpp
index ef37e333c..c43017cc7 100644
--- a/tdeprint/management/kmdriverdialog.cpp
+++ b/tdeprint/management/kmdriverdialog.cpp
@@ -20,8 +20,8 @@
#include "kmdriverdialog.h"
#include "driverview.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
KMDriverDialog::KMDriverDialog(TQWidget *parent, const char *name)
: KDialogBase(KDialogBase::Swallow,i18n("Configure"),KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok,parent,name,true,false)
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index 9987ccb4c..bae2b6ad6 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -23,7 +23,7 @@
#include <tqpixmap.h>
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kseparator.h>
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 8c263bb48..0cadf3dba 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -30,10 +30,10 @@
#include <tqregexp.h>
#include <tqwhatsthis.h>
#include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinputdialog.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 741e69378..98e9595f9 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -33,15 +33,15 @@
#include <tdelistview.h>
#include <kstatusbar.h>
#include <tqpopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kiconloader.h>
#include <tdeapplication.h>
#include <kcursor.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kdebug.h>
#include <twin.h>
#include <tdeio/netaccess.h>
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 10741d7fe..806cc0d9f 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -23,7 +23,7 @@
#include <tqheader.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kcursor.h>
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 5e68f3726..4aba92dad 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -36,15 +36,15 @@
#include "messagewindow.h"
#include <tqdockarea.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tqtimer.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqpopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
diff --git a/tdeprint/management/kmpages.cpp b/tdeprint/management/kmpages.cpp
index 4f0f1f4f7..d0c413966 100644
--- a/tdeprint/management/kmpages.cpp
+++ b/tdeprint/management/kmpages.cpp
@@ -23,7 +23,7 @@
#include "kmpropertypage.h"
#include "kminstancepage.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdialog.h>
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index 6d7edb707..d311f75c3 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -27,7 +27,7 @@
#include <tqlayout.h>
#include <tqpopupmenu.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
: TQWidgetStack(parent,name), m_type(KMPrinterView::Icons)
diff --git a/tdeprint/management/kmpropbackend.cpp b/tdeprint/management/kmpropbackend.cpp
index 98004d2ed..00aac2b40 100644
--- a/tdeprint/management/kmpropbackend.cpp
+++ b/tdeprint/management/kmpropbackend.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp
index 9c7808199..c94838098 100644
--- a/tdeprint/management/kmpropcontainer.cpp
+++ b/tdeprint/management/kmpropcontainer.cpp
@@ -22,7 +22,7 @@
#include <kpushbutton.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kseparator.h>
#include <kguiitem.h>
diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp
index 55daf0ed5..6f20494fc 100644
--- a/tdeprint/management/kmpropdriver.cpp
+++ b/tdeprint/management/kmpropdriver.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropgeneral.cpp b/tdeprint/management/kmpropgeneral.cpp
index c55603da9..6b24b0466 100644
--- a/tdeprint/management/kmpropgeneral.cpp
+++ b/tdeprint/management/kmpropgeneral.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp
index 26671eed8..7fc4155a0 100644
--- a/tdeprint/management/kmpropmembers.cpp
+++ b/tdeprint/management/kmpropmembers.cpp
@@ -23,7 +23,7 @@
#include <tqtextview.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp
index ae8b03cbf..50c1a75e8 100644
--- a/tdeprint/management/kmpropwidget.cpp
+++ b/tdeprint/management/kmpropwidget.cpp
@@ -23,8 +23,8 @@
#include "kmmanager.h"
#include "kmtimer.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
KMPropWidget::KMPropWidget(TQWidget *parent, const char *name)
: TQWidget(parent,name)
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index 2d2a245c7..7c4c0173d 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -34,8 +34,8 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
#include <tqgroupbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kicondialog.h>
#include <tdefiledialog.h>
#include <kseparator.h>
diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp
index 6fd8cf2dc..b2e8fdcd4 100644
--- a/tdeprint/management/kmwbackend.cpp
+++ b/tdeprint/management/kmwbackend.cpp
@@ -28,7 +28,7 @@
#include <tqwhatsthis.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kseparator.h>
#include <kdialog.h>
#include <kdebug.h>
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index aee060e5f..e04467632 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqtoolbutton.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
KMWClass::KMWClass(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwdriver.cpp b/tdeprint/management/kmwdriver.cpp
index 58793c192..9876c0420 100644
--- a/tdeprint/management/kmwdriver.cpp
+++ b/tdeprint/management/kmwdriver.cpp
@@ -24,7 +24,7 @@
#include "kmdriverdb.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMWDriver::KMWDriver(TQWidget *parent, const char *name)
: KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index f60dcface..cc52f1015 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -27,8 +27,8 @@
#include <tqlayout.h>
#include <kpushbutton.h>
#include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
: KMWizardPage(parent,name)
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index cb46a45a0..73871988a 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -28,9 +28,9 @@
#include <tqlabel.h>
#include <kpushbutton.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kguiitem.h>
#include <tdeio/netaccess.h>
diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp
index 2881b4ea0..4ad564cf6 100644
--- a/tdeprint/management/kmwend.cpp
+++ b/tdeprint/management/kmwend.cpp
@@ -23,7 +23,7 @@
#include "util.h"
#include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
KMWEnd::KMWEnd(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index f3b54dcdc..58a61e8e4 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
KMWFile::KMWFile(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwinfopage.cpp b/tdeprint/management/kmwinfopage.cpp
index fd9e92697..175ff7e74 100644
--- a/tdeprint/management/kmwinfopage.cpp
+++ b/tdeprint/management/kmwinfopage.cpp
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kactivelabel.h>
KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index 5bb86967a..bc894c478 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -26,9 +26,9 @@
#include <kpushbutton.h>
#include <tqlabel.h>
#include <tqwidgetstack.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kseparator.h>
#include <tdeapplication.h>
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index ea79563ec..424e40100 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -23,13 +23,13 @@
#include "kmfactory.h"
#include "kmmanager.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqlabel.h>
#include <tqheader.h>
#include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
KMWLocal::KMWLocal(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index 352a075c5..3c4794ad1 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -23,11 +23,11 @@
#include "kmprinter.h"
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <kdebug.h>
#include <tqlineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kextsock.h>
static bool checkLpdQueue(const char *host, const char *queue);
diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp
index fe567f7bb..e8378371a 100644
--- a/tdeprint/management/kmwname.cpp
+++ b/tdeprint/management/kmwname.cpp
@@ -23,8 +23,8 @@
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqregexp.h>
KMWName::KMWName(TQWidget *parent, const char *name)
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 8490a179c..3cd71aadd 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -26,7 +26,7 @@
#include <tqvbuttongroup.h>
#include <tqradiobutton.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcursor.h>
#include <stdlib.h>
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index e76240cf8..836a7fb15 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -23,7 +23,7 @@
#include "kmprinter.h"
#include "util.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <tqlayout.h>
#include <tqlineedit.h>
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index 6b8f4aae9..a3fb71b3d 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -26,9 +26,9 @@
#include <tqheader.h>
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kseparator.h>
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index a4f23959a..02b0a6b69 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -27,13 +27,13 @@
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqregexp.h>
#include <knumvalidator.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kextsock.h>
#include <kdebug.h>
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 2080149d9..9b165e432 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -38,13 +38,13 @@
#include <tqapplication.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdialogbase.h>
#include <kseparator.h>
#include <tdelistbox.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kguiitem.h>
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 67627fb53..08722cf6e 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -30,9 +30,9 @@
#include <tqtooltip.h>
#include <tqlineedit.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <kseparator.h>
#include <kguiitem.h>
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index 1943f9354..ee4e7dbc7 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -30,9 +30,9 @@
#include <tqlineedit.h>
#include <tqregexp.h>
#include <tqsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kextendedsocket.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <kdebug.h>
#include <unistd.h>
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index 10ac359f9..f5977bfb0 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -20,14 +20,14 @@
#include "smbview.h"
#include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqheader.h>
#include <tqapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcursor.h>
#include <tqfile.h>
diff --git a/tdeprint/management/tdeprint_management_module.cpp b/tdeprint/management/tdeprint_management_module.cpp
index d15ef791f..89d315c0f 100644
--- a/tdeprint/management/tdeprint_management_module.cpp
+++ b/tdeprint/management/tdeprint_management_module.cpp
@@ -26,9 +26,9 @@
#include "kmprinter.h"
#include "kmmainview.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp
index 2a5e21e59..45f70b7f1 100644
--- a/tdeprint/marginpreview.cpp
+++ b/tdeprint/marginpreview.cpp
@@ -19,7 +19,7 @@
#include "marginpreview.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqpainter.h>
#include <kcursor.h>
diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp
index 3ec1872f2..c483be123 100644
--- a/tdeprint/marginwidget.cpp
+++ b/tdeprint/marginwidget.cpp
@@ -27,8 +27,8 @@
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricUnit)
: TQWidget(parent, name), m_default(4, 0), m_pagesize( 2 )
diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp
index 9ccfc8074..b2a686f6e 100644
--- a/tdeprint/plugincombobox.cpp
+++ b/tdeprint/plugincombobox.cpp
@@ -24,7 +24,7 @@
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqwhatsthis.h>
PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index b76c0181a..0839af3d7 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -25,9 +25,9 @@
#include <tqtimer.h>
#include <tqpixmap.h>
#include <kprinter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcursor.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
PosterPreview::PosterPreview( TQWidget *parent, const char *name )
: TQFrame( parent, name )
diff --git a/tdeprint/ppdloader.cpp b/tdeprint/ppdloader.cpp
index dcf272b0a..b829e2e17 100644
--- a/tdeprint/ppdloader.cpp
+++ b/tdeprint/ppdloader.cpp
@@ -23,7 +23,7 @@
#include <kfilterdev.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <math.h>
diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp
index d1889dd1c..4fc362350 100644
--- a/tdeprint/printerfilter.cpp
+++ b/tdeprint/printerfilter.cpp
@@ -22,7 +22,7 @@
#include "kmfactory.h"
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
PrinterFilter::PrinterFilter(TQObject *parent, const char *name)
diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp
index 78513dad3..d41adcdee 100644
--- a/tdeprint/rlpr/kmconfigproxy.cpp
+++ b/tdeprint/rlpr/kmconfigproxy.cpp
@@ -21,7 +21,7 @@
#include "kmproxywidget.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMConfigProxy::KMConfigProxy(TQWidget *parent)
: KMConfigPage(parent,"Proxy")
diff --git a/tdeprint/rlpr/kmproprlpr.cpp b/tdeprint/rlpr/kmproprlpr.cpp
index 62fe97827..08713a784 100644
--- a/tdeprint/rlpr/kmproprlpr.cpp
+++ b/tdeprint/rlpr/kmproprlpr.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index a2a3e6a85..870da43c4 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
#include <tqvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kcursor.h>
diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp
index c6704ed09..7b8ceac2d 100644
--- a/tdeprint/rlpr/kmrlprmanager.cpp
+++ b/tdeprint/rlpr/kmrlprmanager.cpp
@@ -26,7 +26,7 @@
#include <tqmap.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMManager(parent,name)
diff --git a/tdeprint/rlpr/kmrlpruimanager.cpp b/tdeprint/rlpr/kmrlpruimanager.cpp
index 9bae2cdc4..fa6383962 100644
--- a/tdeprint/rlpr/kmrlpruimanager.cpp
+++ b/tdeprint/rlpr/kmrlpruimanager.cpp
@@ -26,7 +26,7 @@
#include "kmproprlpr.h"
#include "kmconfigproxy.h"
-#include <klocale.h>
+#include <tdelocale.h>
KMRlprUiManager::KMRlprUiManager(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KMUiManager(parent,name)
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index 79682b91a..056cba1f0 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -29,7 +29,7 @@
#include <tqlineedit.h>
#include <tqheader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
static TQListViewItem* rlpr_findChild(TQListViewItem *c, const TQString& txt)
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 8ca1c6569..4ef5ebe1e 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -26,7 +26,7 @@
#include <tqfile.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
KRlprPrinterImpl::KRlprPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/)
: KPrinterImpl(parent,name)
diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp
index 19ffb481b..bf2fb3d12 100644
--- a/tdeprint/tdefilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -29,7 +29,7 @@
#include <tdeio/netaccess.h>
#include <kurldrag.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdelistview.h>
#include <krun.h>
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 5080cc40c..9b7b6c955 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -21,9 +21,9 @@
#include "kprintprocess.h"
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <dcopclient.h>
#include <tdeio/passdlg.h>
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 11cf22fd2..54d160c73 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -13,7 +13,7 @@
#include <tqstatusbar.h>
#include <tqpixmap.h>
#include <tqpopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdetoolbar.h>
#include <kstatusbar.h>
#include <tqtoolbutton.h>
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index de54f2de1..9afff64ac 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -25,8 +25,8 @@
#include <tqcheckbox.h>
#include <tqaccel.h>
#include <kdemacros.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kdialogbase.h>
diff --git a/tdeprint/util.h b/tdeprint/util.h
index dafcdaa90..75811aee6 100644
--- a/tdeprint/util.h
+++ b/tdeprint/util.h
@@ -23,7 +23,7 @@
#include "kprinter.h"
#include <tqstring.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
KURL smbToUrl(const TQString& work, const TQString& server, const TQString& printer);
void urlToSmb(const KURL& url, TQString& work, TQString& server, TQString& printer);