Rename additional header files to avoid conflicts with KDE4

42 files changed, 72 insertions, 72 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index e6dca1ccd..1af971b3b 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -35,13 +35,13 @@
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <libemailfunctions/email.h>
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 1952f8136..06210b2a5 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -17,7 +17,7 @@
 #include <tqstylesheet.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdepopupmenu.h>
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index ddc66afd3..7eac9000d 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdewallet.h>
 
diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp
index fe475b1b3..24ffe7205 100644
--- a/knode/knarticle.cpp
+++ b/knode/knarticle.cpp
@@ -15,7 +15,7 @@
 */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <kmimemagic.h>
 
diff --git a/knode/knarticlecollection.cpp b/knode/knarticlecollection.cpp
index d39d4d83a..e0a0af85c 100644
--- a/knode/knarticlecollection.cpp
+++ b/knode/knarticlecollection.cpp
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "knglobals.h"
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 6a20c4dd5..9e801a6ec 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -16,8 +16,8 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 #include <tdeapplication.h>
 
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 65acb7c0b..8a708e29f 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -14,7 +14,7 @@
 
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kngroup.h"
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index f5a59c574..e70f6243e 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -12,13 +12,13 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuserprofile.h>
 #include <kopenwith.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "articlewidget.h"
 #include "knmainwidget.h"
diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp
index f2078d71b..33714840c 100644
--- a/knode/kncleanup.cpp
+++ b/knode/kncleanup.cpp
@@ -19,8 +19,8 @@
 #include <tqlayout.h>
 #include <tqprogressbar.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index a8e9088ce..8a02fed2e 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -16,7 +16,7 @@
 
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include "knglobals.h"
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index afebca1af..678b38eb5 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -24,8 +24,8 @@ using KPIM::AddressesDialog;
 using TDERecentAddress::RecentAddresses;
 #include <tdeaccel.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
-#include <kabc/addresseedialog.h>
+#include <tdemessagebox.h>
+#include <tdeabc/addresseedialog.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
@@ -36,7 +36,7 @@ using TDERecentAddress::RecentAddresses;
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tdespell.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kpgp.h>
 #include <kpgpblock.h>
 #include <kprocess.h>
@@ -57,7 +57,7 @@ using TDERecentAddress::RecentAddresses;
 #include "knnntpaccount.h"
 #include "knarticlefactory.h"
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpopupmenu.h>
 #include <spellingfilter.h>
 #include <kstdguiitem.h>
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index d12a05139..27cdade41 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -26,7 +26,7 @@
 #include <tdeversion.h>
 #include <keditcl.h>
 
-#include <kabc/addresslineedit.h>
+#include <tdeabc/addresslineedit.h>
 #include <knodecomposeriface.h>
 
 class TQGroupBox;
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index b2bfb8bf7..8a218eb29 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -19,10 +19,10 @@
 #include <tqtextcodec.h>
 
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp
index 95e342d5b..a07a9c5e0 100644
--- a/knode/knconfigmanager.cpp
+++ b/knode/knconfigmanager.cpp
@@ -18,7 +18,7 @@
 
 #include <kcmultidialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 #include <tqhbox.h>
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index 9fa153949..237ff41b7 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -15,7 +15,7 @@
 
 #include <tdecmodule.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "knglobals.h"
 #include "knconfig.h"
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 2ae1e1f01..3d4948a40 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -18,9 +18,9 @@
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcolordialog.h>
 #include <tdefontdialog.h>
 #include <tdefiledialog.h>
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 19e2c56ae..20a63ffa0 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -17,10 +17,10 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <kprocess.h>
diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp
index 65b165222..ffca72cf2 100644
--- a/knode/kndisplayedheader.cpp
+++ b/knode/kndisplayedheader.cpp
@@ -12,7 +12,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kndisplayedheader.h"
 
diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp
index 3c7daee1e..4ba0f45f9 100644
--- a/knode/knfilterconfigwidget.cpp
+++ b/knode/knfilterconfigwidget.cpp
@@ -17,7 +17,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "knstringfilter.h"
 #include "knstatusfilter.h"
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index e9ebf66e1..6a0e972a4 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -18,8 +18,8 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include "knglobals.h"
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index 9efc23dce..2264dd293 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -14,8 +14,8 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 5be7535c2..ee4449faa 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -17,7 +17,7 @@
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kqcstringsplitter.h>
 
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index 661e1b6cf..2b6d1cc1b 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -14,8 +14,8 @@
 
 #include <tqdir.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index 087eb7379..95de1a5b6 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -14,7 +14,7 @@
 
 
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <kqcstringsplitter.h>
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index be91593a7..f2379f51c 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -21,7 +21,7 @@
 
 #include <kseparator.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 4498898f9..8c9a17467 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -21,10 +21,10 @@
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdatepicker.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include "utilities.h"
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 92ed16668..706e9d9b9 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <tqdir.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kcharsets.h>
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index 3ad2fee7a..a6a905786 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -17,7 +17,7 @@
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include "knglobals.h"
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index 6767d3f64..3d137b8a1 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -19,8 +19,8 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "utilities.h"
 #include "kngroupselectdialog.h"
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index 0d626983b..7d4ac9123 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -14,7 +14,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 #include <libtdepim/progressmanager.h>
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 7a1f407c0..bfb895d0f 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -21,14 +21,14 @@
 #include <tdeaccel.h>
 #include <kxmlguiclient.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kedittoolbar.h>
 #include <kstdaction.h>
 #include <kdebug.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "broadcaststatus.h"
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 299a1200a..747f6d4cf 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -17,8 +17,8 @@
 
 #include <tqsocketnotifier.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/passdlg.h>
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index 8cedae08e..2ba465be3 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -15,7 +15,7 @@
 */
 
 #include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 #include <tqmutex.h>
 
diff --git a/knode/knode.cpp b/knode/knode.cpp
index a29cb7db5..175d1845f 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -21,10 +21,10 @@
 #include <kedittoolbar.h>
 #include <kstdaction.h>
 #include <kdebug.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "broadcaststatus.h"
diff --git a/knode/knode_options.h b/knode/knode_options.h
index f8329e380..c7c446910 100644
--- a/knode/knode_options.h
+++ b/knode/knode_options.h
@@ -18,7 +18,7 @@
 #define KNODE_OPTIONS_H
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TDECmdLineOptions knode_options[] =
 {
diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp
index 8289d02ee..9a10ca778 100644
--- a/knode/knprotocolclient.cpp
+++ b/knode/knprotocolclient.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kextsock.h>
 #include <ksocks.h>
 
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index 45c59cb47..737bece29 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -17,7 +17,7 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index 6af554ceb..3d4e4ded3 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -13,9 +13,9 @@
 */
 
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdewallet.h>
 using namespace KWallet;
diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp
index a1379a265..ec098d9cc 100644
--- a/knode/knstatusfilter.cpp
+++ b/knode/knstatusfilter.cpp
@@ -16,7 +16,7 @@
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 
 #include "knarticle.h"
diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp
index 4f69f7eaf..ba594a9fb 100644
--- a/knode/knstringfilter.cpp
+++ b/knode/knstringfilter.cpp
@@ -16,7 +16,7 @@
 #include <tqlayout.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <klineedit.h>
 
diff --git a/knode/main.cpp b/knode/main.cpp
index f7f1a835c..ab833dd79 100644
--- a/knode/main.cpp
+++ b/knode/main.cpp
@@ -16,7 +16,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "knapplication.h"
 #include "resource.h"
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 2274d2eff..054838137 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -17,12 +17,12 @@
 #include <tqapplication.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdefiledialog.h>
 
 #include "knwidgets.h"