summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:50:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:50:28 -0600
commit6592a47e5dd48c7b5c506c3bde0dce57fe858298 (patch)
tree7f6eaf648b3ca743de3f6220c7f2b29d40480144 /plugins
parent409b87cbe23e2f18e7a73a81ce958aa0fdd148e4 (diff)
downloadktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.tar.gz
ktorrent-6592a47e5dd48c7b5c506c3bde0dce57fe858298.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infowidget/availabilitychunkbar.cpp2
-rw-r--r--plugins/infowidget/chunkbar.cpp2
-rw-r--r--plugins/infowidget/chunkdownloadview.cpp2
-rw-r--r--plugins/infowidget/fileview.cpp6
-rw-r--r--plugins/infowidget/floatspinbox.cpp4
-rw-r--r--plugins/infowidget/infowidgetplugin.cpp4
-rw-r--r--plugins/infowidget/infowidgetprefpage.cpp4
-rw-r--r--plugins/infowidget/iwfiletreediritem.cpp6
-rw-r--r--plugins/infowidget/iwfiletreeitem.cpp6
-rw-r--r--plugins/infowidget/localefloatvalidator.cpp4
-rw-r--r--plugins/infowidget/peerview.cpp6
-rw-r--r--plugins/infowidget/statustab.cpp4
-rw-r--r--plugins/infowidget/trackerview.cpp6
-rw-r--r--plugins/ipfilter/antip2p.cpp2
-rw-r--r--plugins/ipfilter/convertdialog.cpp6
-rw-r--r--plugins/ipfilter/ipblockingprefpage.cpp6
-rw-r--r--plugins/logviewer/logprefpage.cpp4
-rw-r--r--plugins/logviewer/logprefwidget.cpp4
-rw-r--r--plugins/logviewer/logviewer.cpp2
-rw-r--r--plugins/logviewer/logviewerplugin.cpp4
-rw-r--r--plugins/partfileimport/importdialog.cpp4
-rw-r--r--plugins/partfileimport/partfileimportplugin.cpp4
-rw-r--r--plugins/rssfeed/rssfeed.cpp2
-rw-r--r--plugins/rssfeed/rssfeedmanager.cpp4
-rw-r--r--plugins/rssfeed/rssfeedplugin.cpp6
-rw-r--r--plugins/rssfeed/rsslinkdownloader.cpp4
-rw-r--r--plugins/rssfeed/rsslinkdownloader.h2
-rw-r--r--plugins/scanfolder/scanfolder.cpp2
-rw-r--r--plugins/scanfolder/scanfolderplugin.cpp6
-rw-r--r--plugins/scanfolder/scanfolderprefpage.cpp4
-rw-r--r--plugins/scanfolder/scanfolderprefpagewidget.cpp6
-rw-r--r--plugins/scheduler/bwscheduler.cpp2
-rw-r--r--plugins/scheduler/bwsprefpagewidget.cpp6
-rw-r--r--plugins/scheduler/bwswidget.cpp4
-rw-r--r--plugins/scheduler/schedulerplugin.cpp6
-rw-r--r--plugins/scheduler/schedulerprefpage.cpp4
-rw-r--r--plugins/search/htmlpart.cpp4
-rw-r--r--plugins/search/searchplugin.cpp4
-rw-r--r--plugins/search/searchprefpage.cpp6
-rw-r--r--plugins/search/searchtab.cpp4
-rw-r--r--plugins/search/searchwidget.cpp6
-rw-r--r--plugins/stats/ChartDrawer.h2
-rw-r--r--plugins/stats/StatsPluginPrefs.h4
-rw-r--r--plugins/upnp/upnpplugin.cpp4
-rw-r--r--plugins/upnp/upnpprefpage.cpp4
-rw-r--r--plugins/upnp/upnpprefwidget.cpp2
-rw-r--r--plugins/upnp/upnprouter.cpp4
-rw-r--r--plugins/webinterface/httpserver.cpp4
-rw-r--r--plugins/webinterface/php_interface.cpp4
-rw-r--r--plugins/webinterface/webinterfaceplugin.cpp2
-rw-r--r--plugins/webinterface/webinterfaceprefpage.h4
-rw-r--r--plugins/webinterface/webinterfaceprefwidget.cpp4
52 files changed, 106 insertions, 106 deletions
diff --git a/plugins/infowidget/availabilitychunkbar.cpp b/plugins/infowidget/availabilitychunkbar.cpp
index 7f26efa..4b50f27 100644
--- a/plugins/infowidget/availabilitychunkbar.cpp
+++ b/plugins/infowidget/availabilitychunkbar.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <util/bitset.h>
#include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/chunkbar.cpp b/plugins/infowidget/chunkbar.cpp
index 06fed4a..1cd45eb 100644
--- a/plugins/infowidget/chunkbar.cpp
+++ b/plugins/infowidget/chunkbar.cpp
@@ -25,7 +25,7 @@
#include <tqpixmap.h>
#include <math.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqmime.h>
#include <tqimage.h>
#include <util/log.h>
diff --git a/plugins/infowidget/chunkdownloadview.cpp b/plugins/infowidget/chunkdownloadview.cpp
index 0a93f14..e67da32 100644
--- a/plugins/infowidget/chunkdownloadview.cpp
+++ b/plugins/infowidget/chunkdownloadview.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 <tqlabel.h>
#include <interfaces/chunkdownloadinterface.h>
#include <interfaces/functions.h>
diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp
index 1e4b87b..c0e9d72 100644
--- a/plugins/infowidget/fileview.cpp
+++ b/plugins/infowidget/fileview.cpp
@@ -17,12 +17,12 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdepopupmenu.h>
#include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <util/bitset.h>
#include <util/functions.h>
diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp
index 641be87..111070b 100644
--- a/plugins/infowidget/floatspinbox.cpp
+++ b/plugins/infowidget/floatspinbox.cpp
@@ -20,8 +20,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include "floatspinbox.h"
#include "localefloatvalidator.h"
diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp
index 2a1ddff..c872b58 100644
--- a/plugins/infowidget/infowidgetplugin.cpp
+++ b/plugins/infowidget/infowidgetplugin.cpp
@@ -19,8 +19,8 @@
***************************************************************************/
#include <tqscrollview.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <interfaces/coreinterface.h>
#include <interfaces/guiinterface.h>
#include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/infowidgetprefpage.cpp b/plugins/infowidget/infowidgetprefpage.cpp
index 4ddd0dd..63e2987 100644
--- a/plugins/infowidget/infowidgetprefpage.cpp
+++ b/plugins/infowidget/infowidgetprefpage.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include "infowidgetplugin.h"
#include "infowidgetprefpage.h"
diff --git a/plugins/infowidget/iwfiletreediritem.cpp b/plugins/infowidget/iwfiletreediritem.cpp
index bb6b821..7bfe462 100644
--- a/plugins/infowidget/iwfiletreediritem.cpp
+++ b/plugins/infowidget/iwfiletreediritem.cpp
@@ -17,10 +17,10 @@
* 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 <kmessagebox.h>
+#include <tdemessagebox.h>
#include <util/functions.h>
#include <interfaces/torrentfileinterface.h>
#include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp
index d4837dd..effe20a 100644
--- a/plugins/infowidget/iwfiletreeitem.cpp
+++ b/plugins/infowidget/iwfiletreeitem.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
#include <interfaces/functions.h>
#include <interfaces/torrentinterface.h>
#include <interfaces/torrentfileinterface.h>
diff --git a/plugins/infowidget/localefloatvalidator.cpp b/plugins/infowidget/localefloatvalidator.cpp
index 5990ebf..48aa75c 100644
--- a/plugins/infowidget/localefloatvalidator.cpp
+++ b/plugins/infowidget/localefloatvalidator.cpp
@@ -19,8 +19,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 "localefloatvalidator.h"
kt::LocaleFloatValidator::LocaleFloatValidator( TQObject * parent, const char * name )
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index 4fccbc4..f3b346f 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -21,11 +21,11 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdesocketaddress.h>
#include <tqpoint.h>
#include <tqlistview.h>
diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp
index 5c851b9..a4eab2c 100644
--- a/plugins/infowidget/statustab.cpp
+++ b/plugins/infowidget/statustab.cpp
@@ -21,8 +21,8 @@
#include <float.h>
#include <tqdatetime.h>
#include <tqcheckbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <interfaces/functions.h>
#include <interfaces/torrentinterface.h>
diff --git a/plugins/infowidget/trackerview.cpp b/plugins/infowidget/trackerview.cpp
index c689f26..d3f01ba 100644
--- a/plugins/infowidget/trackerview.cpp
+++ b/plugins/infowidget/trackerview.cpp
@@ -29,12 +29,12 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <ksqueezedtextlabel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdelistview.h>
diff --git a/plugins/ipfilter/antip2p.cpp b/plugins/ipfilter/antip2p.cpp
index d448bd5..802c37c 100644
--- a/plugins/ipfilter/antip2p.cpp
+++ b/plugins/ipfilter/antip2p.cpp
@@ -25,7 +25,7 @@
#include <util/constants.h>
#include <util/mmapfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tqstring.h>
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index 1ee2604..2334297 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -20,11 +20,11 @@
#include "convertdialog.h"
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kprogress.h>
#include <kmimetype.h>
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index d68651a..ae44ab2 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -25,13 +25,13 @@
#include "convertdialog.h"
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kurlrequester.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kprogress.h>
#include <kmimetype.h>
diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp
index 4a2ca9b..34a2c3f 100644
--- a/plugins/logviewer/logprefpage.cpp
+++ b/plugins/logviewer/logprefpage.cpp
@@ -20,8 +20,8 @@
#include "logprefpage.h"
#include "logprefwidget.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
namespace kt
diff --git a/plugins/logviewer/logprefwidget.cpp b/plugins/logviewer/logprefwidget.cpp
index 46ea88d..66a6cdb 100644
--- a/plugins/logviewer/logprefwidget.cpp
+++ b/plugins/logviewer/logprefwidget.cpp
@@ -21,8 +21,8 @@
#include "logviewerpluginsettings.h"
#include "logflags.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqwidget.h>
#include <tqstring.h>
diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp
index 343080f..8b1be8a 100644
--- a/plugins/logviewer/logviewer.cpp
+++ b/plugins/logviewer/logviewer.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tqapplication.h>
#include "logviewer.h"
diff --git a/plugins/logviewer/logviewerplugin.cpp b/plugins/logviewer/logviewerplugin.cpp
index 4c11680..b586aad 100644
--- a/plugins/logviewer/logviewerplugin.cpp
+++ b/plugins/logviewer/logviewerplugin.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <util/log.h>
#include <torrent/globals.h>
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index 6c227f7..6f517be 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -18,11 +18,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
#include <kurlrequester.h>
#include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <util/log.h>
diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/plugins/partfileimport/partfileimportplugin.cpp
index e74ae13..148cf4f 100644
--- a/plugins/partfileimport/partfileimportplugin.cpp
+++ b/plugins/partfileimport/partfileimportplugin.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kstdaction.h>
#include <tdepopupmenu.h>
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index 22289f1..5b45a4c 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "rssfeed.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <krfcdate.h>
#include <tdeio/netaccess.h>
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 97c5b9c..8addd09 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -21,12 +21,12 @@
#include <kdirlister.h>
#include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <keditlistbox.h>
// #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqstring.h>
#include <tqobject.h>
diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp
index 051c8e2..4a60921 100644
--- a/plugins/rssfeed/rssfeedplugin.cpp
+++ b/plugins/rssfeed/rssfeedplugin.cpp
@@ -29,9 +29,9 @@
#include <tqstring.h>
#include <tqfile.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "rssfeedmanager.h"
#include "rssfeedplugin.h"
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index b17bec8..561ca27 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -19,9 +19,9 @@
***************************************************************************/
#include "rsslinkdownloader.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index 6badd61..a496af7 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -21,7 +21,7 @@
#define RSSLINKDOWNLOADER_H
#include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <interfaces/coreinterface.h>
#include <torrent/globals.h>
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index 1180f4b..dfceba0 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -21,7 +21,7 @@
#include <kdirlister.h>
#include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <tqstring.h>
diff --git a/plugins/scanfolder/scanfolderplugin.cpp b/plugins/scanfolder/scanfolderplugin.cpp
index 2d9c069..710d1d0 100644
--- a/plugins/scanfolder/scanfolderplugin.cpp
+++ b/plugins/scanfolder/scanfolderplugin.cpp
@@ -28,9 +28,9 @@
#include <tqstring.h>
#include <tqfile.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "scanfolder.h"
#include "scanfolderplugin.h"
diff --git a/plugins/scanfolder/scanfolderprefpage.cpp b/plugins/scanfolder/scanfolderprefpage.cpp
index b8dd406..9fc466e 100644
--- a/plugins/scanfolder/scanfolderprefpage.cpp
+++ b/plugins/scanfolder/scanfolderprefpage.cpp
@@ -20,8 +20,8 @@
#include "scanfolderplugin.h"
#include "scanfolderprefpage.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/plugins/scanfolder/scanfolderprefpagewidget.cpp b/plugins/scanfolder/scanfolderprefpagewidget.cpp
index 5a96afd..14b89ff 100644
--- a/plugins/scanfolder/scanfolderprefpagewidget.cpp
+++ b/plugins/scanfolder/scanfolderprefpagewidget.cpp
@@ -25,9 +25,9 @@
#include <tqcheckbox.h>
#include <tqfile.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurlrequester.h>
namespace kt
diff --git a/plugins/scheduler/bwscheduler.cpp b/plugins/scheduler/bwscheduler.cpp
index 5f2502a..77d6b1c 100644
--- a/plugins/scheduler/bwscheduler.cpp
+++ b/plugins/scheduler/bwscheduler.cpp
@@ -35,7 +35,7 @@
#include <tqfile.h>
#include <tqptrlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
using namespace bt;
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
index 48d00e9..38ab296 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/plugins/scheduler/bwsprefpagewidget.cpp
@@ -24,11 +24,11 @@
#include "schedulerpluginsettings.h"
#include <knuminput.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/plugins/scheduler/bwswidget.cpp b/plugins/scheduler/bwswidget.cpp
index dd9728f..b3358a7 100644
--- a/plugins/scheduler/bwswidget.cpp
+++ b/plugins/scheduler/bwswidget.cpp
@@ -20,7 +20,7 @@
#include "bwswidget.h"
#include "schedulerpluginsettings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
#include <tqpixmap.h>
#include <tqtable.h>
@@ -29,7 +29,7 @@
#include <tqfont.h>
#include <tqcolor.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
namespace kt
diff --git a/plugins/scheduler/schedulerplugin.cpp b/plugins/scheduler/schedulerplugin.cpp
index 0f1c6fa..d0b8f68 100644
--- a/plugins/scheduler/schedulerplugin.cpp
+++ b/plugins/scheduler/schedulerplugin.cpp
@@ -28,11 +28,11 @@
#include <tqtimer.h>
#include <tqdatetime.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "schedulerplugin.h"
#include "schedulerpluginsettings.h"
diff --git a/plugins/scheduler/schedulerprefpage.cpp b/plugins/scheduler/schedulerprefpage.cpp
index f6219a8..3977a14 100644
--- a/plugins/scheduler/schedulerprefpage.cpp
+++ b/plugins/scheduler/schedulerprefpage.cpp
@@ -23,8 +23,8 @@
#include "schedulerplugin.h"
#include "schedulerpluginsettings.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
index 3179650..a0c02fe 100644
--- a/plugins/search/htmlpart.cpp
+++ b/plugins/search/htmlpart.cpp
@@ -17,14 +17,14 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
//#include <tqfile.h>
#include <tqclipboard.h>
#include <tqapplication.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tdeparts/browserextension.h>
#include <util/constants.h>
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index 94f77da..e1126f5 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kstdaction.h>
#include <tdepopupmenu.h>
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index ba79b00..fdfb941 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -21,15 +21,15 @@
#include <kurl.h>
#include <tqtooltip.h>
#include <tqfile.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kactivelabel.h>
#include <kpushbutton.h>
#include <tdelistview.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <klineedit.h>
diff --git a/plugins/search/searchtab.cpp b/plugins/search/searchtab.cpp
index 1d64eb0..c752bc5 100644
--- a/plugins/search/searchtab.cpp
+++ b/plugins/search/searchtab.cpp
@@ -22,13 +22,13 @@
#include <tqapplication.h>
#include <tqlistbox.h>
#include <tqcheckbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kpushbutton.h>
#include <kiconloader.h>
#include <kcombobox.h>
#include <kcompletion.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "searchtab.h"
#include "searchenginelist.h"
#include "searchpluginsettings.h"
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index d6b4154..128ceeb 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -28,15 +28,15 @@
#include <tqstringlist.h>
#include <klineedit.h>
#include <kpushbutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kcombobox.h>
#include <tdepopupmenu.h>
#include <tdeparts/partmanager.h>
#include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <kprogress.h>
#include <util/log.h>
diff --git a/plugins/stats/ChartDrawer.h b/plugins/stats/ChartDrawer.h
index 3dc2f48..d7211b0 100644
--- a/plugins/stats/ChartDrawer.h
+++ b/plugins/stats/ChartDrawer.h
@@ -32,7 +32,7 @@
#include <tqmime.h>
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <vector>
#include <cmath>
diff --git a/plugins/stats/StatsPluginPrefs.h b/plugins/stats/StatsPluginPrefs.h
index 271caf2..43c524d 100644
--- a/plugins/stats/StatsPluginPrefs.h
+++ b/plugins/stats/StatsPluginPrefs.h
@@ -25,8 +25,8 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <interfaces/prefpageinterface.h>
diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp
index aa5773a..a370966 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/plugins/upnp/upnpplugin.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp
index e360b3c..1d3a6da 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/plugins/upnp/upnpprefpage.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 <kiconloader.h>
#include "upnpprefpage.h"
#include "upnpprefwidget.h"
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index b44c43d..7d0bbb5 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <torrent/udptrackersocket.h>
#include <torrent/globals.h>
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index d88995a..0e18e92 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <stdlib.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tqstringlist.h>
#include <tdeio/netaccess.h>
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index 97aafae..24e847f 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -22,10 +22,10 @@
#include <tqdatetime.h>
#include <tdeapplication.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kmdcodec.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfileinfo.h>
#include <tqsocket.h>
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index a4f5f6a..eb42684 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -19,8 +19,8 @@
***************************************************************************/
#include <tdeio/global.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <net/socketmonitor.h>
#include <torrent/choker.h>
diff --git a/plugins/webinterface/webinterfaceplugin.cpp b/plugins/webinterface/webinterfaceplugin.cpp
index 32cc164..fb47d03 100644
--- a/plugins/webinterface/webinterfaceplugin.cpp
+++ b/plugins/webinterface/webinterfaceplugin.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <util/log.h>
#include <interfaces/coreinterface.h>
diff --git a/plugins/webinterface/webinterfaceprefpage.h b/plugins/webinterface/webinterfaceprefpage.h
index 9bf606e..f05c723 100644
--- a/plugins/webinterface/webinterfaceprefpage.h
+++ b/plugins/webinterface/webinterfaceprefpage.h
@@ -23,8 +23,8 @@
#include <interfaces/prefpageinterface.h>
#include "webinterfaceprefwidget.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
namespace kt
{
diff --git a/plugins/webinterface/webinterfaceprefwidget.cpp b/plugins/webinterface/webinterfaceprefwidget.cpp
index 1e30a08..c1e19f4 100644
--- a/plugins/webinterface/webinterfaceprefwidget.cpp
+++ b/plugins/webinterface/webinterfaceprefwidget.cpp
@@ -21,8 +21,8 @@
#include "webinterfaceprefwidget.h"
#include "webinterfacepluginsettings.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kstandarddirs.h>