From 6592a47e5dd48c7b5c506c3bde0dce57fe858298 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:50:28 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 apps/ktcachecheck/cachechecker.cpp              | 2 +-
 apps/ktorrent/addpeerwidget.cpp                 | 4 ++--
 apps/ktorrent/fileselectdlg.cpp                 | 4 ++--
 apps/ktorrent/filterbar.cpp                     | 2 +-
 apps/ktorrent/groups/activedownloadsgroup.cpp   | 2 +-
 apps/ktorrent/groups/activegroup.cpp            | 2 +-
 apps/ktorrent/groups/activeuploadsgroup.cpp     | 2 +-
 apps/ktorrent/groups/allgroup.cpp               | 2 +-
 apps/ktorrent/groups/downloadgroup.cpp          | 2 +-
 apps/ktorrent/groups/group.cpp                  | 2 +-
 apps/ktorrent/groups/groupmanager.h             | 2 +-
 apps/ktorrent/groups/groupview.cpp              | 6 +++---
 apps/ktorrent/groups/inactivedownloadsgroup.cpp | 2 +-
 apps/ktorrent/groups/inactivegroup.cpp          | 2 +-
 apps/ktorrent/groups/inactiveuploadsgroup.cpp   | 2 +-
 apps/ktorrent/groups/queueddownloadsgroup.cpp   | 2 +-
 apps/ktorrent/groups/queueduploadsgroup.cpp     | 2 +-
 apps/ktorrent/groups/torrentdrag.cpp            | 2 +-
 apps/ktorrent/groups/uploadgroup.cpp            | 2 +-
 apps/ktorrent/groups/userdownloadsgroup.cpp     | 2 +-
 apps/ktorrent/groups/useruploadsgroup.cpp       | 2 +-
 apps/ktorrent/ipfilterwidget.cpp                | 4 ++--
 apps/ktorrent/ktorrent.cpp                      | 8 ++++----
 apps/ktorrent/ktorrentapp.cpp                   | 4 ++--
 apps/ktorrent/ktorrentcore.cpp                  | 6 +++---
 apps/ktorrent/ktorrentview.cpp                  | 6 +++---
 apps/ktorrent/ktorrentviewitem.cpp              | 4 ++--
 apps/ktorrent/ktorrentviewmenu.cpp              | 4 ++--
 apps/ktorrent/main.cpp                          | 2 +-
 apps/ktorrent/newui/button.cpp                  | 2 +-
 apps/ktorrent/newui/buttonbar.cpp               | 2 +-
 apps/ktorrent/newui/ddockwindow.cpp             | 4 ++--
 apps/ktorrent/pastedialog.cpp                   | 4 ++--
 apps/ktorrent/pref.cpp                          | 8 ++++----
 apps/ktorrent/queuedialog.cpp                   | 4 ++--
 apps/ktorrent/scandialog.cpp                    | 4 ++--
 apps/ktorrent/speedlimitsdlg.cpp                | 2 +-
 apps/ktorrent/torrentcreatordlg.cpp             | 4 ++--
 apps/ktorrent/trayicon.cpp                      | 2 +-
 apps/ktorrent/viewmanager.cpp                   | 2 +-
 apps/ktupnptest/main.cpp                        | 2 +-
 apps/ktupnptest/upnptestapp.cpp                 | 4 ++--
 42 files changed, 66 insertions(+), 66 deletions(-)

(limited to 'apps')

diff --git a/apps/ktcachecheck/cachechecker.cpp b/apps/ktcachecheck/cachechecker.cpp
index c8371a7..3c3b35e 100644
--- a/apps/ktcachecheck/cachechecker.cpp
+++ b/apps/ktcachecheck/cachechecker.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/log.h>
 #include <util/file.h>
 #include <util/error.h>
diff --git a/apps/ktorrent/addpeerwidget.cpp b/apps/ktorrent/addpeerwidget.cpp
index f93be34..063a6a9 100644
--- a/apps/ktorrent/addpeerwidget.cpp
+++ b/apps/ktorrent/addpeerwidget.cpp
@@ -22,11 +22,11 @@
 #include <util/constants.h>
 #include <interfaces/torrentinterface.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <klineedit.h>
 #include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index c483f94..1dc1f1f 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index 78dde74..1c05b51 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdetoolbarbutton.h>
 #include <klineedit.h>
diff --git a/apps/ktorrent/groups/activedownloadsgroup.cpp b/apps/ktorrent/groups/activedownloadsgroup.cpp
index e4dd02f..ec3730e 100644
--- a/apps/ktorrent/groups/activedownloadsgroup.cpp
+++ b/apps/ktorrent/groups/activedownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "activedownloadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/activegroup.cpp b/apps/ktorrent/groups/activegroup.cpp
index 48a60ae..7a5e640 100644
--- a/apps/ktorrent/groups/activegroup.cpp
+++ b/apps/ktorrent/groups/activegroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "activegroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/activeuploadsgroup.cpp b/apps/ktorrent/groups/activeuploadsgroup.cpp
index aa50e97..80413b8 100644
--- a/apps/ktorrent/groups/activeuploadsgroup.cpp
+++ b/apps/ktorrent/groups/activeuploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "activeuploadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/allgroup.cpp b/apps/ktorrent/groups/allgroup.cpp
index eba5391..6b8ffb5 100644
--- a/apps/ktorrent/groups/allgroup.cpp
+++ b/apps/ktorrent/groups/allgroup.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include "allgroup.h"
 
 namespace kt
diff --git a/apps/ktorrent/groups/downloadgroup.cpp b/apps/ktorrent/groups/downloadgroup.cpp
index 085eb77..adf4f02 100644
--- a/apps/ktorrent/groups/downloadgroup.cpp
+++ b/apps/ktorrent/groups/downloadgroup.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 #include "downloadgroup.h"
 
diff --git a/apps/ktorrent/groups/group.cpp b/apps/ktorrent/groups/group.cpp
index 31142df..7a3cbf2 100644
--- a/apps/ktorrent/groups/group.cpp
+++ b/apps/ktorrent/groups/group.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "group.h"
 
 namespace kt
diff --git a/apps/ktorrent/groups/groupmanager.h b/apps/ktorrent/groups/groupmanager.h
index 135698c..5c5491e 100644
--- a/apps/ktorrent/groups/groupmanager.h
+++ b/apps/ktorrent/groups/groupmanager.h
@@ -21,7 +21,7 @@
 #define KTGROUPMANAGER_H
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <util/ptrmap.h>
 
 
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index dd4204b..2ed8682 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
diff --git a/apps/ktorrent/groups/inactivedownloadsgroup.cpp b/apps/ktorrent/groups/inactivedownloadsgroup.cpp
index b383160..548ba17 100644
--- a/apps/ktorrent/groups/inactivedownloadsgroup.cpp
+++ b/apps/ktorrent/groups/inactivedownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "inactivedownloadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/inactivegroup.cpp b/apps/ktorrent/groups/inactivegroup.cpp
index 3270697..326436f 100644
--- a/apps/ktorrent/groups/inactivegroup.cpp
+++ b/apps/ktorrent/groups/inactivegroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "inactivegroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/inactiveuploadsgroup.cpp b/apps/ktorrent/groups/inactiveuploadsgroup.cpp
index 8110a1a..2de8732 100644
--- a/apps/ktorrent/groups/inactiveuploadsgroup.cpp
+++ b/apps/ktorrent/groups/inactiveuploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "inactiveuploadsgroup.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/queueddownloadsgroup.cpp b/apps/ktorrent/groups/queueddownloadsgroup.cpp
index c182472..36fab9f 100644
--- a/apps/ktorrent/groups/queueddownloadsgroup.cpp
+++ b/apps/ktorrent/groups/queueddownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "queueddownloadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/queueduploadsgroup.cpp b/apps/ktorrent/groups/queueduploadsgroup.cpp
index 8c346a4..c51ab42 100644
--- a/apps/ktorrent/groups/queueduploadsgroup.cpp
+++ b/apps/ktorrent/groups/queueduploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "queueduploadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/torrentdrag.cpp b/apps/ktorrent/groups/torrentdrag.cpp
index 0860ab6..c7296fe 100644
--- a/apps/ktorrent/groups/torrentdrag.cpp
+++ b/apps/ktorrent/groups/torrentdrag.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "torrentdrag.h"
 
 namespace kt
diff --git a/apps/ktorrent/groups/uploadgroup.cpp b/apps/ktorrent/groups/uploadgroup.cpp
index 9baca6d..ee65293 100644
--- a/apps/ktorrent/groups/uploadgroup.cpp
+++ b/apps/ktorrent/groups/uploadgroup.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 #include "uploadgroup.h"
 
diff --git a/apps/ktorrent/groups/userdownloadsgroup.cpp b/apps/ktorrent/groups/userdownloadsgroup.cpp
index 6a4960b..ff1b13b 100644
--- a/apps/ktorrent/groups/userdownloadsgroup.cpp
+++ b/apps/ktorrent/groups/userdownloadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "userdownloadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/groups/useruploadsgroup.cpp b/apps/ktorrent/groups/useruploadsgroup.cpp
index d0e78bd..f8c9d96 100644
--- a/apps/ktorrent/groups/useruploadsgroup.cpp
+++ b/apps/ktorrent/groups/useruploadsgroup.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "useruploadsgroup.h"
 		
-#include <klocale.h>
+#include <tdelocale.h>
 #include <interfaces/torrentinterface.h>
 
 namespace kt
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
index 5ddf3bc..22c77f7 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/apps/ktorrent/ipfilterwidget.cpp
@@ -33,8 +33,8 @@
 #include <klineedit.h>
 #include <tdesocketaddress.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #define MAX_RANGES 500
 
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 738ec2c..02df83a 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -28,12 +28,12 @@
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <tdeaccel.h>
diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp
index bc4a4b6..38204fe 100644
--- a/apps/ktorrent/ktorrentapp.cpp
+++ b/apps/ktorrent/ktorrentapp.cpp
@@ -20,8 +20,8 @@
 
 #include "ktorrentapp.h"
 
-#include <kglobal.h>
-#include <kstartupinfo.h>
+#include <tdeglobal.h>
+#include <tdestartupinfo.h>
 #include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index d194919..c520d60 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -20,11 +20,11 @@
  ***************************************************************************/
 #include <unistd.h>
 #include <tqdir.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeio/job.h>
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index d55db7d..a22afcb 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -18,14 +18,14 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdefiledialog.h>
 
diff --git a/apps/ktorrent/ktorrentviewitem.cpp b/apps/ktorrent/ktorrentviewitem.cpp
index 81ccc99..4a60329 100644
--- a/apps/ktorrent/ktorrentviewitem.cpp
+++ b/apps/ktorrent/ktorrentviewitem.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <interfaces/torrentinterface.h>
 #include <tqdatetime.h>
 #include <tqpainter.h>
diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp
index b31c310..2f2d42f 100644
--- a/apps/ktorrent/ktorrentviewmenu.cpp
+++ b/apps/ktorrent/ktorrentviewmenu.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <interfaces/torrentinterface.h>
 #include <groups/group.h>
diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp
index 96018b5..f658d77 100644
--- a/apps/ktorrent/main.cpp
+++ b/apps/ktorrent/main.cpp
@@ -22,7 +22,7 @@
 #endif
 
 #include <signal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index f550018..4754cd0 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -31,7 +31,7 @@
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/apps/ktorrent/newui/buttonbar.cpp b/apps/ktorrent/newui/buttonbar.cpp
index 5bf3be2..640fb3e 100644
--- a/apps/ktorrent/newui/buttonbar.cpp
+++ b/apps/ktorrent/newui/buttonbar.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "button.h"
 
diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp
index 4c87ed0..7234038 100644
--- a/apps/ktorrent/newui/ddockwindow.cpp
+++ b/apps/ktorrent/newui/ddockwindow.cpp
@@ -28,10 +28,10 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/apps/ktorrent/pastedialog.cpp b/apps/ktorrent/pastedialog.cpp
index f96381b..82cf6df 100644
--- a/apps/ktorrent/pastedialog.cpp
+++ b/apps/ktorrent/pastedialog.cpp
@@ -26,8 +26,8 @@
 #include <tqapplication.h>
 #include <kurl.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name)
 		:PasteDlgBase(parent, name)
diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp
index 12b8e31..73f6a4f 100644
--- a/apps/ktorrent/pref.cpp
+++ b/apps/ktorrent/pref.cpp
@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kactivelabel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcombobox.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -29,12 +29,12 @@
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <tqlistview.h>
 #include <torrent/globals.h>
 #include <util/functions.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqdir.h>
 #include <tqslider.h>
diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp
index 212c920..e70c5d3 100644
--- a/apps/ktorrent/queuedialog.cpp
+++ b/apps/ktorrent/queuedialog.cpp
@@ -32,8 +32,8 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kiconloader.h>
 #include <ksqueezedtextlabel.h>
diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp
index 80fd681..5c9ef8a 100644
--- a/apps/ktorrent/scandialog.cpp
+++ b/apps/ktorrent/scandialog.cpp
@@ -18,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <util/error.h>
 #include <torrent/queuemanager.h>
 #include <torrent/torrentcontrol.h>
diff --git a/apps/ktorrent/speedlimitsdlg.cpp b/apps/ktorrent/speedlimitsdlg.cpp
index 69c6a48..70e2f1c 100644
--- a/apps/ktorrent/speedlimitsdlg.cpp
+++ b/apps/ktorrent/speedlimitsdlg.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
index 491acda..fb3af47 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/apps/ktorrent/torrentcreatordlg.cpp
@@ -12,8 +12,8 @@
 #include <tqcheckbox.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index 3ab560d..ab4f2b2 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include "ktorrent.h"
 #include "trayicon.h"
diff --git a/apps/ktorrent/viewmanager.cpp b/apps/ktorrent/viewmanager.cpp
index ea767f4..eef9d06 100644
--- a/apps/ktorrent/viewmanager.cpp
+++ b/apps/ktorrent/viewmanager.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 #include <interfaces/torrentinterface.h>
 #include <groups/group.h>
diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp
index 40bd783..ff1792b 100644
--- a/apps/ktupnptest/main.cpp
+++ b/apps/ktupnptest/main.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp
index 5725e8a..f38c419 100644
--- a/apps/ktupnptest/upnptestapp.cpp
+++ b/apps/ktupnptest/upnptestapp.cpp
@@ -18,9 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtextbrowser.h>
 #include <util/error.h>
 #include "upnptestapp.h"
-- 
cgit v1.2.1