Rename additional header files to avoid conflicts with KDE4

16 files changed, 22 insertions, 22 deletions

diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 6ec2a171..2236b0a6 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <ksqueezedtextlabel.h>
 #include <kstatusbar.h>
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index d02644d7..daa3a511 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -18,7 +18,7 @@
 ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <tdelistview.h>
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 8443a37a..7cc62ef8 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -29,11 +29,11 @@
 #include <kdebug.h>
 #include <tdefiletreeview.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeparts/genericfactory.h>
 //#include <ktempdir.h>
 
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 77158e9f..31b946bd 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -25,8 +25,8 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include "diffmodel.h"
 #include "diffhunk.h"
diff --git a/kompare/komparepart/kompareprefdlg.cpp b/kompare/komparepart/kompareprefdlg.cpp
index f920d03d..399f7e3f 100644
--- a/kompare/komparepart/kompareprefdlg.cpp
+++ b/kompare/komparepart/kompareprefdlg.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "diffpage.h"
 #include "viewpage.h"
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 0f4e1a7b..09e670b2 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "diffmodel.h"
 #include "difference.h"
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index 5c541c7c..363179ee 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -20,7 +20,7 @@
 #include <tqvbox.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include "diffpage.h"
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index b5f4f2df..5111346e 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -30,7 +30,7 @@
 #include <kdialog.h>
 #include <keditlistbox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kurlcombobox.h>
 #include <kurlrequester.h>
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 041cff46..b855a52f 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcombobox.h>
 #include <kurlrequester.h>
 
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index cf8ef75f..b09f6b3d 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -28,7 +28,7 @@
 #include <kcolorbutton.h>
 #include <kdialog.h>
 #include <tdefontcombo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "viewpage.h"
 #include "viewsettings.h"
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 902f4091..02d158cb 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -20,7 +20,7 @@
 #include <tqfont.h>
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "viewsettings.h"
 
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 1b3822b0..82c3625d 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -21,7 +21,7 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "difference.h"
 #include "diffhunk.h"
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 8bb6cf83..2a701b24 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -30,9 +30,9 @@
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "difference.h"
 #include "diffhunk.h"
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp
index f66b4e0d..08913d7c 100644
--- a/kompare/libdiff2/kompareprocess.cpp
+++ b/kompare/libdiff2/kompareprocess.cpp
@@ -25,7 +25,7 @@
 
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "diffsettings.h"
 #include "kompareprocess.h"
diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp
index 7e4ddbbe..2a78e719 100644
--- a/kompare/libdiff2/levenshteintable.cpp
+++ b/kompare/libdiff2/levenshteintable.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "levenshteintable.h"
 
diff --git a/kompare/main.cpp b/kompare/main.cpp
index a866fd3b..7c93e16c 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -22,8 +22,8 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdefile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kompare_part.h"
 #include "kompare_shell.h"