Rename additional header files to avoid conflicts with KDE4

12 files changed, 24 insertions, 24 deletions

diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp
index 630e4cb5a..85bfa4a94 100644
--- a/tdeparts/browserextension.cpp
+++ b/tdeparts/browserextension.cpp
@@ -29,8 +29,8 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <kurifilter.h>
 #include <assert.h>
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index 34f4c21c9..3abd01524 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -17,15 +17,15 @@
  */
 
 #include "browserrun.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
 #include <kuserprofile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <assert.h>
diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp
index a3985fd05..485bd9a36 100644
--- a/tdeparts/factory.cpp
+++ b/tdeparts/factory.cpp
@@ -23,8 +23,8 @@
 
 #include <tqwidget.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <assert.h>
 
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index 9372adc08..954fc83d5 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -33,9 +33,9 @@
 #include <tqfileinfo.h>
 
 #include <kinstance.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp
index 1af0f1ee3..0f6f59561 100644
--- a/tdeparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -22,7 +22,7 @@
 #include "partmanager.h"
 #include <tdeparts/event.h>
 #include <tdeparts/part.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqapplication.h>
diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp
index e1469ad1c..378db4a27 100644
--- a/tdeparts/plugin.cpp
+++ b/tdeparts/plugin.cpp
@@ -34,7 +34,7 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kxmlguifactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index 403fda062..c8fb77b29 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -10,9 +10,9 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Shell::Shell()
 {
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 72b165e65..d83ec8f41 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -2,9 +2,9 @@
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <klibloader.h>
 
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index 664d6c7ec..92e46254e 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -10,11 +10,11 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 Shell::Shell()
 {
diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index 81ff2c1f2..ad81b91b3 100644
--- a/tdeparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -12,7 +12,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kstandarddirs.h>
 
diff --git a/tdeparts/tests/parts.cpp b/tdeparts/tests/parts.cpp
index 408e73280..ebfd9c9f1 100644
--- a/tdeparts/tests/parts.cpp
+++ b/tdeparts/tests/parts.cpp
@@ -14,9 +14,9 @@
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Part1::Part1( TQObject *parent, TQWidget * parentWidget )
  : KParts::ReadOnlyPart( parent, "Part1" )
diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index 73d5b7986..d7cf06eac 100644
--- a/tdeparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
@@ -3,8 +3,8 @@
 #include "plugin_spellcheck.h"
 #include <tdeaction.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name,