Rename additional header files to avoid conflicts with KDE4

20 files changed, 36 insertions, 36 deletions

diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index d4a7c473..4522201e 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -42,7 +42,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharselect.h>
 
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index e003ff57..0ca858d3 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -45,7 +45,7 @@
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 0eba0506..de5263a9 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -40,7 +40,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resources.h"
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h
index 99819cde..ab2bbc31 100644
--- a/kbabel/kbabel/editorpreferences.ui.h
+++ b/kbabel/kbabel/editorpreferences.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "toolselectionwidget.h"
 
 void EditorPreferences::ledWarning( bool show )
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 044b1078..cd1cc6c6 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -40,7 +40,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resources.h"
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp
index a6fca91e..ff5d1df5 100644
--- a/kbabel/kbabel/gotodialog.cpp
+++ b/kbabel/kbabel/gotodialog.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include "gotodialog.h"
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 38b11920..4a7624cb 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -33,11 +33,11 @@
 
 **************************************************************************** */
 #include <kcursor.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 #include <kurl.h>
 
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index a3dcb3c3..11bf219c 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -37,7 +37,7 @@
 #include <tqtabwidget.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 9be4ec13..2f6cd4e9 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -64,9 +64,9 @@
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kedittoolbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kled.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdetoolbar.h>
 #include <tdefiledialog.h>
@@ -75,7 +75,7 @@
 #include <kdialogbase.h>
 #include <kprogress.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp
index a3841c81..a3f3abb7 100644
--- a/kbabel/kbabel/kbabelpref.cpp
+++ b/kbabel/kbabel/kbabelpref.cpp
@@ -44,7 +44,7 @@
 #include "toolselectionwidget.h"
 #include "tqcombobox.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 using namespace KBabel;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index e415f06a..001b1489 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -61,9 +61,9 @@
 #include <kcmenumngr.h>
 #include <tdeconfigdialog.h>
 #include <kdatatool.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -72,12 +72,12 @@
 #include <tdelistbox.h>
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdespell.h>
 #include <twin.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "resources.h"
 
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index 02462e19..5089f563 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -37,8 +37,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index 9b7d7538..40822862 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -26,11 +26,11 @@
 #include "kbabel.h"
 #include "editcmd.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqcolor.h>
 #include <tqlayout.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 using namespace KBabel;
 
diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp
index 0f50f630..70977aaa 100644
--- a/kbabel/kbabel/kbcharselect.cpp
+++ b/kbabel/kbabel/kbcharselect.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kcharselect.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqspinbox.h>
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index d75de27f..3f9df538 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -41,8 +41,8 @@
 
 #include "tdeapplication.h"
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kbabelsettings.h>
 #include <tdespell.h>
 
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 15dd9320..a6282e83 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -44,8 +44,8 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kuniqueapplication.h>
 #include <twin.h>
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 1e75f78b..ea46b9ac 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -53,9 +53,9 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <tdestdaccel.h>
 
 #include "kbhighlighting.h"
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index d60bf351..58013eac 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -38,7 +38,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resources.h"
 #include "kbcatalog.h"
diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp
index 7bb43851..62a88c8c 100644
--- a/kbabel/kbabel/spelldlg.cpp
+++ b/kbabel/kbabel/spelldlg.cpp
@@ -37,8 +37,8 @@
 #include <tqradiobutton.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name)
 		: KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling")
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index d1adb648..3233ab57 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -38,7 +38,7 @@
 
 #include <kcursor.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kbcatalog.h"