Rename additional header files to avoid conflicts with KDE4

13 files changed, 21 insertions, 21 deletions

diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp
index 3087741..69ff288 100644
--- a/krusader/Dialogs/checksumdlg.cpp
+++ b/krusader/Dialogs/checksumdlg.cpp
@@ -1,6 +1,6 @@
 #include "checksumdlg.h"
 #include "../krusader.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -8,7 +8,7 @@
 #include <tdelistview.h>
 #include <tqpixmap.h>
 #include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
@@ -20,7 +20,7 @@
 #include "../krservices.h"
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 
 class CS_Tool; // forward
diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp
index a9dd0f5..88a41d4 100644
--- a/krusader/Dialogs/krdialogs.cpp
+++ b/krusader/Dialogs/krdialogs.cpp
@@ -38,7 +38,7 @@
 #include <tqfontmetrics.h>
 #include <tqtooltip.h>
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp
index 6e9a480..4989a2b 100644
--- a/krusader/Dialogs/krkeydialog.cpp
+++ b/krusader/Dialogs/krkeydialog.cpp
@@ -13,11 +13,11 @@
 
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeactionshortcutlist.h>
diff --git a/krusader/Dialogs/krmaskchoice.cpp b/krusader/Dialogs/krmaskchoice.cpp
index a817d1f..4f2a9a3 100644
--- a/krusader/Dialogs/krmaskchoice.cpp
+++ b/krusader/Dialogs/krmaskchoice.cpp
@@ -39,7 +39,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 
 /*
diff --git a/krusader/Dialogs/krpleasewait.cpp b/krusader/Dialogs/krpleasewait.cpp
index 1b062b4..e6df81b 100644
--- a/krusader/Dialogs/krpleasewait.cpp
+++ b/krusader/Dialogs/krpleasewait.cpp
@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 #include <unistd.h>
 #include "../krusader.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include <kcursor.h>
 
 KRPleaseWait::KRPleaseWait( TQString msg, int count, bool cancel ):
diff --git a/krusader/Dialogs/krprogress.cpp b/krusader/Dialogs/krprogress.cpp
index 6ef8b87..ddbdf25 100644
--- a/krusader/Dialogs/krprogress.cpp
+++ b/krusader/Dialogs/krprogress.cpp
@@ -24,8 +24,8 @@
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/krusader/Dialogs/krspecialwidgets.cpp b/krusader/Dialogs/krspecialwidgets.cpp
index 09eb3ff..ecc5e28 100644
--- a/krusader/Dialogs/krspecialwidgets.cpp
+++ b/krusader/Dialogs/krspecialwidgets.cpp
@@ -37,7 +37,7 @@ A
 #include "../MountMan/kmountman.h"
 #include <math.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdebug.h>
 
diff --git a/krusader/Dialogs/krspwidgets.cpp b/krusader/Dialogs/krspwidgets.cpp
index 5641ffc..b0fcf5d 100644
--- a/krusader/Dialogs/krspwidgets.cpp
+++ b/krusader/Dialogs/krspwidgets.cpp
@@ -40,7 +40,7 @@
 #include <tqcheckbox.h>
 #include <tqlistbox.h>
 #include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <kcursor.h>
diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp
index aa74ece..432f91d 100644
--- a/krusader/Dialogs/kurllistrequester.cpp
+++ b/krusader/Dialogs/kurllistrequester.cpp
@@ -36,8 +36,8 @@
 #include <tdefiledialog.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #define DELETE_ITEM_ID    100
 
diff --git a/krusader/Dialogs/newftpgui.cpp b/krusader/Dialogs/newftpgui.cpp
index 79ef77c..2186adc 100644
--- a/krusader/Dialogs/newftpgui.cpp
+++ b/krusader/Dialogs/newftpgui.cpp
@@ -20,7 +20,7 @@
 #include <tqwhatsthis.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp
index 3ed263f..699b987 100644
--- a/krusader/Dialogs/packguibase.cpp
+++ b/krusader/Dialogs/packguibase.cpp
@@ -46,9 +46,9 @@
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include "../krusader.h"
 
diff --git a/krusader/Dialogs/packguibase.h b/krusader/Dialogs/packguibase.h
index bf32c99..82c4966 100644
--- a/krusader/Dialogs/packguibase.h
+++ b/krusader/Dialogs/packguibase.h
@@ -30,7 +30,7 @@
 #ifndef PACKGUIBASE_H
 #define PACKGUIBASE_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdialog.h>
 #include <tqmap.h>
 
diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp
index 77fe00e..e991a06 100644
--- a/krusader/Dialogs/popularurls.cpp
+++ b/krusader/Dialogs/popularurls.cpp
@@ -1,5 +1,5 @@
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tdelistview.h>
 #include <kiconloader.h>