Rename additional header files to avoid conflicts with KDE4

19 files changed, 28 insertions, 28 deletions

diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index be4af6ba8..8e254d909 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -2,7 +2,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 
 #include "htmlsearch.h"
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index e9f5e3789..1f0cc8f68 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <tdefontcombo.h>
 #include <tdehtmldefaults.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <tqgroupbox.h>
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index a59fc5345..7188ec214 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -20,8 +20,8 @@
 
 #include "formatter.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index d4e171b04..0d25dbf79 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 70ba4960a..5fd0f4640 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index b4dc93801..680f9f4ab 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -1,7 +1,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 #include "htmlsearch.h"
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index a011a2bc2..3db9c9895 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlayout.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <tdeapplication.h>
 #include <tqcheckbox.h>
diff --git a/khelpcenter/htmlsearch/progressdialog.cpp b/khelpcenter/htmlsearch/progressdialog.cpp
index e7eafedb1..33a783127 100644
--- a/khelpcenter/htmlsearch/progressdialog.cpp
+++ b/khelpcenter/htmlsearch/progressdialog.cpp
@@ -2,7 +2,7 @@
 #include <tqlabel.h>
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 85ce883b0..a9eef3b41 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index ebde13429..c0c5a9d9e 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 10c94dc43..df8f1b36e 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -28,17 +28,17 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <tqlayout.h>
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 3eb04a631..9c605687b 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -24,7 +24,7 @@
 #include "version.h"
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kuniqueapplication.h>
 #include <kdebug.h>
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 743a7d201..e05671ef2 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -41,11 +41,11 @@
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kprocio.h>
 #include <kcharsets.h>
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 377e6691e..87a6861e4 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -26,8 +26,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 
 #include <tqdom.h>
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 76061edc1..56b6e635c 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -6,8 +6,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "docmetainfo.h"
 #include "formatter.h"
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 06ca584f9..54a0a9a38 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -27,8 +27,8 @@
 #include <kdesktopfile.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <stdlib.h>
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index c8f706b59..5040a7d81 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -30,7 +30,7 @@
 
 #include <ksimpleconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index d70e2d165..2f77ff766 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "docmetainfo.h"
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index a3554e25b..3c29e039e 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -11,7 +11,7 @@
 #include <kdebug.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>