Rename additional header files to avoid conflicts with KDE4

27 files changed, 53 insertions, 53 deletions

diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index efa73850..a2107452 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -26,11 +26,11 @@
 #include <KoQueryTrader.h>
 #include <KoDocument.h>
 #include <KoMainWindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <stdlib.h>
 
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc
index 188a76d1..e8995ad6 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cc
@@ -20,8 +20,8 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "KoApplication.h"
 #include "KoApplicationIface.h"
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 9762f292..5611e873 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -31,7 +31,7 @@
 #include <tqsplitter.h>
 
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 292e16e9..e1422800 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -42,8 +42,8 @@
 #include <kiconloader.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeparts/partmanager.h>
 #include <kprinter.h>
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 882ccadf..00d6038b 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -31,8 +31,8 @@
 #include <tdeparts/partmanager.h>
 
 #include <kmimetype.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqapplication.h>
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index 7bdc34e3..d50c256d 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -29,8 +29,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqobjectlist.h>
 #include <tqdatetime.h>
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 61bbe0d4..44a79b14 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -40,14 +40,14 @@
 #include <tqvbox.h>
 #include <tqdatetime.h>
 
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
 #include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmimetype.h>
 #include <tqlayout.h>
 #include <tdelistview.h>
@@ -58,7 +58,7 @@
 #include <ktextedit.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KoDocumentInfoDlg::KoDocumentInfoDlgPrivate
 {
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 1b1c98a8..84c5bde8 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -21,8 +21,8 @@
 #include "KoFileDialog.h"
 #include "KoDocument.h"
 #include <tdefilefiltercombo.h>
-#include <klocale.h>
-#include <kdiroperator.h>
+#include <tdelocale.h>
+#include <tdediroperator.h>
 #include <kdebug.h>
 
 KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter,
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index 1e5beb47..68953b40 100644
--- a/lib/kofficecore/KoFilter.cpp
+++ b/lib/kofficecore/KoFilter.cpp
@@ -23,7 +23,7 @@
 
 #include <kurl.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <KoFilterManager.h>
 
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index 2000a549..91123fd3 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tqmetaobject.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmimetype.h>
 #include <KoFilterChain.h>
 #include <KoQueryTrader.h>
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 2a894a0e..06c7cf10 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -29,8 +29,8 @@
 #include <tqptrlist.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <KoDocument.h>
 #include <klibloader.h>
 #include <tdelistbox.h>
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 78c39540..94e7e7d9 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tqfont.h>
 #include <tqfontinfo.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 97905af4..18916b57 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -37,7 +37,7 @@
 #include <tdeversion.h>
 #include <kstdaction.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
@@ -45,14 +45,14 @@
 #include <kprogress.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tderecentdocument.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/plugin.h>
 #include <tdeparts/event.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksharedptr.h>
 
 #include <tqobjectlist.h>
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index fa1642e7..62b6b0b1 100644
--- a/lib/kofficecore/KoOasisStore.cpp
+++ b/lib/kofficecore/KoOasisStore.cpp
@@ -25,9 +25,9 @@
 #include <KoStoreDevice.h>
 #include <KoXmlWriter.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqxml.h>
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index 0f173658..9560a559 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -24,8 +24,8 @@
 #include "KoXmlNS.h"
 #include "KoGenStyles.h"
 #include <tqbuffer.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqbrush.h>
 #include <KoStyleStack.h>
 
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 16608406..ed3086ab 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqpen.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
 #include <kpushbutton.h>
diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp
index 62d81b32..f21167cf 100644
--- a/lib/kofficecore/KoPageLayout.cpp
+++ b/lib/kofficecore/KoPageLayout.cpp
@@ -20,10 +20,10 @@
 */
 #include "KoPageLayout.h"
 #include <KoUnit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <KoDom.h>
 #include <KoXmlNS.h>
 #include <tqdom.h>
diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp
index ff30802e..101c946c 100644
--- a/lib/kofficecore/KoPictureBase.cpp
+++ b/lib/kofficecore/KoPictureBase.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <kmdcodec.h>
 #include <tqpainter.h>
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index b6a05c8a..5f0718e1 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -32,13 +32,13 @@
 #include <tqapplication.h>
 #include <tqdragobject.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #if ! KDE_IS_VERSION( 3,1,90 )
 #include <kdebugclasses.h>
 #endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 #include "KoPictureKey.h"
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 0ed86896..6bd950da 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -44,8 +44,8 @@
 
 // KDE includes.
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <ktrader.h>
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index dd8410e3..2d0ba529 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <stdlib.h>
 
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp
index 9068fc94..51d1cb2f 100644
--- a/lib/kofficecore/KoUnit.cpp
+++ b/lib/kofficecore/KoUnit.cpp
@@ -22,8 +22,8 @@
 #include "KoUnit.h"
 #include <KoXmlWriter.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqregexp.h>
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 2964bcaf..1c8b88a4 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -24,8 +24,8 @@
 #include <KoViewIface.h>
 #include <KoDocumentChild.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/event.h>
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index 57cd09e2..8759ef66 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -28,8 +28,8 @@
 #include <kiconloader.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index b5baad99..0e216098 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -29,8 +29,8 @@
 #include <tqtooltip.h>
 
 // KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
diff --git a/lib/kofficecore/tests/kopointtest.cpp b/lib/kofficecore/tests/kopointtest.cpp
index bf2ff843..c956466a 100644
--- a/lib/kofficecore/tests/kopointtest.cpp
+++ b/lib/kofficecore/tests/kopointtest.cpp
@@ -1,6 +1,6 @@
 #include <KoPoint.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp
index 8a2455bf..f9008b67 100644
--- a/lib/kofficecore/tests/korecttest.cpp
+++ b/lib/kofficecore/tests/korecttest.cpp
@@ -3,7 +3,7 @@
 #include <tdeapplication.h>
 #include <stdlib.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 bool check(TQString txt, bool res, bool expected)
 {