From 2e2770563e10ef054a5eb920a2ff6478ea4c7a9f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:43:41 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 adept/adept/acqprogress.cpp               | 4 ++--
 adept/adept/acqprogress.h                 | 2 +-
 adept/adept/acqprogresswidget.cpp         | 2 +-
 adept/adept/application.cpp               | 4 ++--
 adept/adept/commitprogress.cpp            | 2 +-
 adept/adept/desktoplist.cpp               | 2 +-
 adept/adept/desktoplist.h                 | 2 +-
 adept/adept/dpkgpm-gui.cpp                | 2 +-
 adept/adept/easytagfilter.cpp             | 2 +-
 adept/adept/easytagfilter.h               | 2 +-
 adept/adept/extendablelist.h              | 2 +-
 adept/adept/filterwidget.cpp              | 2 +-
 adept/adept/groupeddesktopselector.cpp    | 2 +-
 adept/adept/installerview.cpp             | 2 +-
 adept/adept/lister.cpp                    | 4 ++--
 adept/adept/packagedetails.cpp            | 2 +-
 adept/adept/packageinfo.cpp               | 2 +-
 adept/adept/quickfilter.cpp               | 2 +-
 adept/adept/quickfilter.h                 | 2 +-
 adept/adept/sourceseditor.cpp             | 2 +-
 adept/adept/statefilter.cpp               | 2 +-
 adept/adept/statefilter.h                 | 2 +-
 adept/adept/tagchooser.cpp                | 2 +-
 adept/adept/tagfilter.h                   | 2 +-
 adept/adept/taglist.cpp                   | 2 +-
 adept/batch/app.cpp                       | 4 ++--
 adept/installer/app.cpp                   | 6 +++---
 adept/kubuntu_upgrader/upgradewizard.cpp  | 4 ++--
 adept/libadept/acqprogress.cpp            | 4 ++--
 adept/libadept/acqprogress.h              | 2 +-
 adept/libadept/acqprogresswidget.cpp      | 2 +-
 adept/libadept/application.cpp            | 4 ++--
 adept/libadept/commitprogress.cpp         | 2 +-
 adept/libadept/desktoplist.cpp            | 2 +-
 adept/libadept/desktoplist.h              | 2 +-
 adept/libadept/dpkgpm-gui.cpp             | 2 +-
 adept/libadept/easytagfilter.cpp          | 2 +-
 adept/libadept/easytagfilter.h            | 2 +-
 adept/libadept/extendablelist.h           | 2 +-
 adept/libadept/filterwidget.cpp           | 2 +-
 adept/libadept/groupeddesktopselector.cpp | 2 +-
 adept/libadept/installerview.cpp          | 2 +-
 adept/libadept/lister.cpp                 | 4 ++--
 adept/libadept/packagedetails.cpp         | 2 +-
 adept/libadept/packageinfo.cpp            | 2 +-
 adept/libadept/quickfilter.cpp            | 2 +-
 adept/libadept/quickfilter.h              | 2 +-
 adept/libadept/sourceseditor.cpp          | 2 +-
 adept/libadept/statefilter.cpp            | 2 +-
 adept/libadept/statefilter.h              | 2 +-
 adept/libadept/tagchooser.cpp             | 2 +-
 adept/libadept/tagfilter.h                | 2 +-
 adept/libadept/taglist.cpp                | 2 +-
 adept/manager/app.cpp                     | 4 ++--
 adept/notifier/app.cpp                    | 6 +++---
 adept/updater/app.cpp                     | 4 ++--
 56 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp
index 9381175..a4bd1c4 100644
--- a/adept/adept/acqprogress.cpp
+++ b/adept/adept/acqprogress.cpp
@@ -6,8 +6,8 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqstyle.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "acqprogress.h"
diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h
index f75d3bd..ac6d70c 100644
--- a/adept/adept/acqprogress.h
+++ b/adept/adept/acqprogress.h
@@ -6,7 +6,7 @@
 #ifndef ACTQPROGRESS_H
 #define ACTQPROGRESS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
 #include <kprogress.h>
diff --git a/adept/adept/acqprogresswidget.cpp b/adept/adept/acqprogresswidget.cpp
index 1b28fa5..54dadf6 100644
--- a/adept/adept/acqprogresswidget.cpp
+++ b/adept/adept/acqprogresswidget.cpp
@@ -1,7 +1,7 @@
 #include <kprogress.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "acqprogresswidget.h"
 #include "acqprogress.h"
 
diff --git a/adept/adept/application.cpp b/adept/adept/application.cpp
index cfd6366..fe4bbbf 100644
--- a/adept/adept/application.cpp
+++ b/adept/adept/application.cpp
@@ -4,8 +4,8 @@
 */
 
 #include <tqprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
diff --git a/adept/adept/commitprogress.cpp b/adept/adept/commitprogress.cpp
index 488fb61..a55938e 100644
--- a/adept/adept/commitprogress.cpp
+++ b/adept/adept/commitprogress.cpp
@@ -7,7 +7,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <klibloader.h>
diff --git a/adept/adept/desktoplist.cpp b/adept/adept/desktoplist.cpp
index cbba30c..10ddc89 100644
--- a/adept/adept/desktoplist.cpp
+++ b/adept/adept/desktoplist.cpp
@@ -10,7 +10,7 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <adept/desktoplist.h>
diff --git a/adept/adept/desktoplist.h b/adept/adept/desktoplist.h
index 3740879..16108fb 100644
--- a/adept/adept/desktoplist.h
+++ b/adept/adept/desktoplist.h
@@ -4,7 +4,7 @@
 */
 
 #include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <apt-front/cache/entity/desktop.h>
 #include <adept/extendablelist.h>
diff --git a/adept/adept/dpkgpm-gui.cpp b/adept/adept/dpkgpm-gui.cpp
index 558e626..fb5e2dc 100644
--- a/adept/adept/dpkgpm-gui.cpp
+++ b/adept/adept/dpkgpm-gui.cpp
@@ -9,7 +9,7 @@
 #include <tqstrlist.h>
 #include <tdeapplication.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <apt-pkg/configuration.h>
diff --git a/adept/adept/easytagfilter.cpp b/adept/adept/easytagfilter.cpp
index 7eed0f5..184ef74 100644
--- a/adept/adept/easytagfilter.cpp
+++ b/adept/adept/easytagfilter.cpp
@@ -1,7 +1,7 @@
 #include <cstddef>
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
diff --git a/adept/adept/easytagfilter.h b/adept/adept/easytagfilter.h
index 8adb151..b6e174b 100644
--- a/adept/adept/easytagfilter.h
+++ b/adept/adept/easytagfilter.h
@@ -3,7 +3,7 @@
 	@author Peter Rockai <me@mornfall.net>
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kdebug.h>
 
diff --git a/adept/adept/extendablelist.h b/adept/adept/extendablelist.h
index acaecb3..bef2f3f 100644
--- a/adept/adept/extendablelist.h
+++ b/adept/adept/extendablelist.h
@@ -2,7 +2,7 @@
 #include <tdelistview.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <vector>
 
 #include <apt-front/utils/range.h>
diff --git a/adept/adept/filterwidget.cpp b/adept/adept/filterwidget.cpp
index 1f1fd18..b8d3385 100644
--- a/adept/adept/filterwidget.cpp
+++ b/adept/adept/filterwidget.cpp
@@ -1,7 +1,7 @@
 #include <cstddef>
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include "filterwidget.h"
 
diff --git a/adept/adept/groupeddesktopselector.cpp b/adept/adept/groupeddesktopselector.cpp
index f99be8c..07875b7 100644
--- a/adept/adept/groupeddesktopselector.cpp
+++ b/adept/adept/groupeddesktopselector.cpp
@@ -8,7 +8,7 @@
 #include <tqlabel.h>
 #include <tqtimer.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kseparator.h>
 #include <tdeapplication.h>
 
diff --git a/adept/adept/installerview.cpp b/adept/adept/installerview.cpp
index c6e995a..a148335 100644
--- a/adept/adept/installerview.cpp
+++ b/adept/adept/installerview.cpp
@@ -2,7 +2,7 @@
 #include <tqcombobox.h>
 #include <tqtextbrowser.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <cmath>
diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp
index 845afc2..f62886f 100644
--- a/adept/adept/lister.cpp
+++ b/adept/adept/lister.cpp
@@ -11,9 +11,9 @@
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <functional>
diff --git a/adept/adept/packagedetails.cpp b/adept/adept/packagedetails.cpp
index d10b30e..327ce10 100644
--- a/adept/adept/packagedetails.cpp
+++ b/adept/adept/packagedetails.cpp
@@ -1,7 +1,7 @@
 #include <tqtoolbutton.h>
 #include <tqtextbrowser.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqpushbutton.h>
 #include <tdetoolbar.h>
diff --git a/adept/adept/packageinfo.cpp b/adept/adept/packageinfo.cpp
index 5adf40d..b443342 100644
--- a/adept/adept/packageinfo.cpp
+++ b/adept/adept/packageinfo.cpp
@@ -7,7 +7,7 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <adept/packageinfo.h>
 #include <adept/utils.h>
diff --git a/adept/adept/quickfilter.cpp b/adept/adept/quickfilter.cpp
index bd5c2bd..b7bfad0 100644
--- a/adept/adept/quickfilter.cpp
+++ b/adept/adept/quickfilter.cpp
@@ -2,7 +2,7 @@
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
 #include <tqobjectlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <tqcheckbox.h>
diff --git a/adept/adept/quickfilter.h b/adept/adept/quickfilter.h
index c3b3a7f..94a3dba 100644
--- a/adept/adept/quickfilter.h
+++ b/adept/adept/quickfilter.h
@@ -3,7 +3,7 @@
 	@author Peter Rockai <me@mornfall.net>
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 
diff --git a/adept/adept/sourceseditor.cpp b/adept/adept/sourceseditor.cpp
index ef2dcd0..9a88b2a 100644
--- a/adept/adept/sourceseditor.cpp
+++ b/adept/adept/sourceseditor.cpp
@@ -7,7 +7,7 @@
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sourceseditor.h"
 #include <adept/utils.h>
diff --git a/adept/adept/statefilter.cpp b/adept/adept/statefilter.cpp
index e201df9..5ad0034 100644
--- a/adept/adept/statefilter.cpp
+++ b/adept/adept/statefilter.cpp
@@ -1,7 +1,7 @@
 #include <cstddef>
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqcheckbox.h>
 #include <tqobjectlist.h>
diff --git a/adept/adept/statefilter.h b/adept/adept/statefilter.h
index 908b9b2..6810328 100644
--- a/adept/adept/statefilter.h
+++ b/adept/adept/statefilter.h
@@ -12,7 +12,7 @@
 #include <adept/filterlist.h>
 #include <adept/lister.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <iostream>
 #include <sstream>
diff --git a/adept/adept/tagchooser.cpp b/adept/adept/tagchooser.cpp
index 0e2cdce..db0c379 100644
--- a/adept/adept/tagchooser.cpp
+++ b/adept/adept/tagchooser.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdragobject.h>
 
 #include <ept/debtags/vocabulary.h>
diff --git a/adept/adept/tagfilter.h b/adept/adept/tagfilter.h
index 575ee95..aaf9a98 100644
--- a/adept/adept/tagfilter.h
+++ b/adept/adept/tagfilter.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- adept/tagfilter.h
    written by Peter Rockai <me@mornfall.net> */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqpoint.h>
diff --git a/adept/adept/taglist.cpp b/adept/adept/taglist.cpp
index b7029be..20d3ed5 100644
--- a/adept/adept/taglist.cpp
+++ b/adept/adept/taglist.cpp
@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <tqdragobject.h>
 #include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <apt-front/cache/cache.h>
 #include <ept/debtags/vocabulary.h>
diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp
index 8d02e4e..1af6912 100644
--- a/adept/batch/app.cpp
+++ b/adept/batch/app.cpp
@@ -5,8 +5,8 @@
 #include <tqwidgetstack.h>
 
 #include <kpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>
diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp
index 77109c4..131f595 100644
--- a/adept/installer/app.cpp
+++ b/adept/installer/app.cpp
@@ -6,8 +6,8 @@
 #include <tqwidgetstack.h>
 
 #include <kpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>
@@ -18,7 +18,7 @@
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-front/manager.h>
diff --git a/adept/kubuntu_upgrader/upgradewizard.cpp b/adept/kubuntu_upgrader/upgradewizard.cpp
index 23b4d32..5b112bf 100644
--- a/adept/kubuntu_upgrader/upgradewizard.cpp
+++ b/adept/kubuntu_upgrader/upgradewizard.cpp
@@ -21,8 +21,8 @@
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ktar.h>
 #include <kdebug.h>
diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp
index 9381175..a4bd1c4 100644
--- a/adept/libadept/acqprogress.cpp
+++ b/adept/libadept/acqprogress.cpp
@@ -6,8 +6,8 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqstyle.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "acqprogress.h"
diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h
index f75d3bd..ac6d70c 100644
--- a/adept/libadept/acqprogress.h
+++ b/adept/libadept/acqprogress.h
@@ -6,7 +6,7 @@
 #ifndef ACTQPROGRESS_H
 #define ACTQPROGRESS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
 #include <kprogress.h>
diff --git a/adept/libadept/acqprogresswidget.cpp b/adept/libadept/acqprogresswidget.cpp
index 1b28fa5..54dadf6 100644
--- a/adept/libadept/acqprogresswidget.cpp
+++ b/adept/libadept/acqprogresswidget.cpp
@@ -1,7 +1,7 @@
 #include <kprogress.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "acqprogresswidget.h"
 #include "acqprogress.h"
 
diff --git a/adept/libadept/application.cpp b/adept/libadept/application.cpp
index f10f7b9..7a98b4d 100644
--- a/adept/libadept/application.cpp
+++ b/adept/libadept/application.cpp
@@ -3,8 +3,8 @@
     @author Peter Rockai <me@mornfall.net>
 */
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
 
diff --git a/adept/libadept/commitprogress.cpp b/adept/libadept/commitprogress.cpp
index 6db8a6f..1d7da00 100644
--- a/adept/libadept/commitprogress.cpp
+++ b/adept/libadept/commitprogress.cpp
@@ -7,7 +7,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ktrader.h>
 #include <klibloader.h>
diff --git a/adept/libadept/desktoplist.cpp b/adept/libadept/desktoplist.cpp
index cbba30c..10ddc89 100644
--- a/adept/libadept/desktoplist.cpp
+++ b/adept/libadept/desktoplist.cpp
@@ -10,7 +10,7 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <adept/desktoplist.h>
diff --git a/adept/libadept/desktoplist.h b/adept/libadept/desktoplist.h
index 3740879..16108fb 100644
--- a/adept/libadept/desktoplist.h
+++ b/adept/libadept/desktoplist.h
@@ -4,7 +4,7 @@
 */
 
 #include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <apt-front/cache/entity/desktop.h>
 #include <adept/extendablelist.h>
diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp
index 558e626..fb5e2dc 100644
--- a/adept/libadept/dpkgpm-gui.cpp
+++ b/adept/libadept/dpkgpm-gui.cpp
@@ -9,7 +9,7 @@
 #include <tqstrlist.h>
 #include <tdeapplication.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <apt-pkg/configuration.h>
diff --git a/adept/libadept/easytagfilter.cpp b/adept/libadept/easytagfilter.cpp
index 55a1925..2646bea 100644
--- a/adept/libadept/easytagfilter.cpp
+++ b/adept/libadept/easytagfilter.cpp
@@ -1,6 +1,6 @@
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
diff --git a/adept/libadept/easytagfilter.h b/adept/libadept/easytagfilter.h
index e4044f9..0011138 100644
--- a/adept/libadept/easytagfilter.h
+++ b/adept/libadept/easytagfilter.h
@@ -3,7 +3,7 @@
 	@author Peter Rockai <me@mornfall.net>
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kdebug.h>
 
diff --git a/adept/libadept/extendablelist.h b/adept/libadept/extendablelist.h
index ddaa7b1..4a81560 100644
--- a/adept/libadept/extendablelist.h
+++ b/adept/libadept/extendablelist.h
@@ -2,7 +2,7 @@
 #include <tdelistview.h>
 #include <tqpixmap.h>
 #include <tqlayout.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <vector>
 
 #include <apt-front/utils/range.h>
diff --git a/adept/libadept/filterwidget.cpp b/adept/libadept/filterwidget.cpp
index 1adf827..f5b76a1 100644
--- a/adept/libadept/filterwidget.cpp
+++ b/adept/libadept/filterwidget.cpp
@@ -1,6 +1,6 @@
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include "filterwidget.h"
 
diff --git a/adept/libadept/groupeddesktopselector.cpp b/adept/libadept/groupeddesktopselector.cpp
index f99be8c..07875b7 100644
--- a/adept/libadept/groupeddesktopselector.cpp
+++ b/adept/libadept/groupeddesktopselector.cpp
@@ -8,7 +8,7 @@
 #include <tqlabel.h>
 #include <tqtimer.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kseparator.h>
 #include <tdeapplication.h>
 
diff --git a/adept/libadept/installerview.cpp b/adept/libadept/installerview.cpp
index ef9eae3..923b2cf 100644
--- a/adept/libadept/installerview.cpp
+++ b/adept/libadept/installerview.cpp
@@ -2,7 +2,7 @@
 #include <tqcombobox.h>
 #include <tqtextbrowser.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <apt-front/cache/entity/desktop.h>
 #include <apt-front/predicate/factory.h>
diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp
index 2588646..6bc07df 100644
--- a/adept/libadept/lister.cpp
+++ b/adept/libadept/lister.cpp
@@ -9,9 +9,9 @@
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <functional>
diff --git a/adept/libadept/packagedetails.cpp b/adept/libadept/packagedetails.cpp
index 339a8a2..ec4fb6e 100644
--- a/adept/libadept/packagedetails.cpp
+++ b/adept/libadept/packagedetails.cpp
@@ -1,7 +1,7 @@
 #include <tqtoolbutton.h>
 #include <tqtextbrowser.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqpushbutton.h>
 #include <tdetoolbar.h>
diff --git a/adept/libadept/packageinfo.cpp b/adept/libadept/packageinfo.cpp
index 5adf40d..b443342 100644
--- a/adept/libadept/packageinfo.cpp
+++ b/adept/libadept/packageinfo.cpp
@@ -7,7 +7,7 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <adept/packageinfo.h>
 #include <adept/utils.h>
diff --git a/adept/libadept/quickfilter.cpp b/adept/libadept/quickfilter.cpp
index 7300727..3fc8787 100644
--- a/adept/libadept/quickfilter.cpp
+++ b/adept/libadept/quickfilter.cpp
@@ -1,7 +1,7 @@
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
 #include <tqobjectlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <tqcheckbox.h>
diff --git a/adept/libadept/quickfilter.h b/adept/libadept/quickfilter.h
index c3b3a7f..94a3dba 100644
--- a/adept/libadept/quickfilter.h
+++ b/adept/libadept/quickfilter.h
@@ -3,7 +3,7 @@
 	@author Peter Rockai <me@mornfall.net>
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 
diff --git a/adept/libadept/sourceseditor.cpp b/adept/libadept/sourceseditor.cpp
index 63acb93..d89820d 100644
--- a/adept/libadept/sourceseditor.cpp
+++ b/adept/libadept/sourceseditor.cpp
@@ -7,7 +7,7 @@
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sourceseditor.h"
 #include <adept/utils.h>
diff --git a/adept/libadept/statefilter.cpp b/adept/libadept/statefilter.cpp
index cd4f6bb..fa50249 100644
--- a/adept/libadept/statefilter.cpp
+++ b/adept/libadept/statefilter.cpp
@@ -1,6 +1,6 @@
 #include <apt-front/predicate/combinators.h>
 #include <apt-front/predicate/factory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqcheckbox.h>
 #include <tqobjectlist.h>
diff --git a/adept/libadept/statefilter.h b/adept/libadept/statefilter.h
index bd8cba2..d57d3b6 100644
--- a/adept/libadept/statefilter.h
+++ b/adept/libadept/statefilter.h
@@ -11,7 +11,7 @@
 #include <adept/filterlist.h>
 #include <adept/lister.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <iostream>
 #include <sstream>
diff --git a/adept/libadept/tagchooser.cpp b/adept/libadept/tagchooser.cpp
index 56070a3..3b0e657 100644
--- a/adept/libadept/tagchooser.cpp
+++ b/adept/libadept/tagchooser.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdragobject.h>
 
 #include <apt-front/cache/component/tags.h>
diff --git a/adept/libadept/tagfilter.h b/adept/libadept/tagfilter.h
index 6c6eefd..236f3b2 100644
--- a/adept/libadept/tagfilter.h
+++ b/adept/libadept/tagfilter.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- adept/tagfilter.h
    written by Peter Rockai <me@mornfall.net> */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqpoint.h>
diff --git a/adept/libadept/taglist.cpp b/adept/libadept/taglist.cpp
index 13717bc..eed31f0 100644
--- a/adept/libadept/taglist.cpp
+++ b/adept/libadept/taglist.cpp
@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <tqdragobject.h>
 #include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <apt-front/cache/component/tags.h>
 #include <adept/taglist.h>
diff --git a/adept/manager/app.cpp b/adept/manager/app.cpp
index 08d2823..6fd7e10 100644
--- a/adept/manager/app.cpp
+++ b/adept/manager/app.cpp
@@ -4,8 +4,8 @@
 #include <tqsplitter.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>
diff --git a/adept/notifier/app.cpp b/adept/notifier/app.cpp
index 48d021d..7fe637d 100644
--- a/adept/notifier/app.cpp
+++ b/adept/notifier/app.cpp
@@ -7,10 +7,10 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeaboutapplication.h>
 #include <tdeaction.h>
diff --git a/adept/updater/app.cpp b/adept/updater/app.cpp
index c7aef84..67bd445 100644
--- a/adept/updater/app.cpp
+++ b/adept/updater/app.cpp
@@ -5,8 +5,8 @@
 #include <tqwidgetstack.h>
 
 #include <kpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>