Rename additional header files to avoid conflicts with KDE4

13 files changed, 25 insertions, 25 deletions

diff --git a/konsole/konsole/TEHistory.h b/konsole/konsole/TEHistory.h
index dd5ba7a67..ff16433b7 100644
--- a/konsole/konsole/TEHistory.h
+++ b/konsole/konsole/TEHistory.h
@@ -25,7 +25,7 @@
 #include <tqptrvector.h>
 #include <tqbitarray.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "TECommon.h"
 
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index 53aca2270..1efcd214d 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -81,7 +81,7 @@
 #include <termios.h>
                      
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpty.h>
 
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 8aae214fb..42695052e 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -76,9 +76,9 @@
 #include <krun.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeshortcut.h>
 #include <kurldrag.h>
 #include <tdeio/netaccess.h>
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index 76772ab7f..907e19b34 100644
--- a/konsole/konsole/TEmuVt102.cpp
+++ b/konsole/konsole/TEmuVt102.cpp
@@ -32,8 +32,8 @@
 #undef HAVE_XKB
 #endif
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "TEmuVt102.h"
 #include "TEWidget.h"
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 3a4168e89..3712bb0da 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -31,7 +31,7 @@
 #include <tqintdict.h>
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 3e3fde7ff..25d9d65be 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -101,8 +101,8 @@ Time to start a requirement list.
 #include <kkeydialog.h>
 #include <kstandarddirs.h>
 #include <tqpainter.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <krootpixmap.h>
 #include <krun.h>
 #include <kstdaction.h>
@@ -110,7 +110,7 @@ Time to start a requirement list.
 #include <kdebug.h>
 #include <kipc.h>
 #include <dcopclient.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knotifydialog.h>
 #undef B0
 #include <kprinter.h>
@@ -121,7 +121,7 @@ Time to start a requirement list.
 #include <kshell.h>
 #include <tqlabel.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <signal.h>
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 64fe3a7be..5263418b4 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -31,11 +31,11 @@
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <tdefontdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kstdaction.h>
 #include <tqlabel.h>
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index df771670d..9eef57954 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -37,13 +37,13 @@
 // KDE 
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kcrash.h>
 #include <kpty.h>
 #include <kuser.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // kwrited
 #include "kwrited.h"
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index a0fdd6f3c..a44196601 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -32,15 +32,15 @@
 
 #include <dcopclient.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <config.h>
 
diff --git a/konsole/konsole/printsettings.cpp b/konsole/konsole/printsettings.cpp
index 8daa6c40e..93b5279e8 100644
--- a/konsole/konsole/printsettings.cpp
+++ b/konsole/konsole/printsettings.cpp
@@ -20,7 +20,7 @@
 
 #include "printsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp
index 7e1084b6a..8778a1ee9 100644
--- a/konsole/konsole/schema.cpp
+++ b/konsole/konsole/schema.cpp
@@ -56,7 +56,7 @@
 #include <tqdir.h>
 #include <tqdatetime.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index 3637dcf02..17692f51c 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -23,9 +23,9 @@
 
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <krun.h>
 #include <kshell.h>
diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp
index 421501c40..b4f16dd49 100644
--- a/konsole/konsole/zmodem_dialog.cpp
+++ b/konsole/konsole/zmodem_dialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tqtextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption)
  : KDialogBase(parent, "zmodem_progress", modal, caption,