Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 14 insertions, 14 deletions

diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 72c69e8c0..8aae214fb 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -79,7 +79,7 @@
 #include <klocale.h>
 #include <knotifyclient.h>
 #include <kglobalsettings.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kurldrag.h>
 #include <tdeio/netaccess.h>
 #include <tqlabel.h>
diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h
index 1ca744644..1e2c36d87 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -29,7 +29,7 @@
 #include <tqscrollbar.h>
 #include <tqdragobject.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "TECommon.h"
 
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 189ebb3a9..d78908cd1 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -97,7 +97,7 @@ Time to start a requirement list.
 #include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kkeydialog.h>
 #include <kstandarddirs.h>
 #include <tqpainter.h>
@@ -114,13 +114,13 @@ Time to start a requirement list.
 #include <knotifydialog.h>
 #undef B0
 #include <kprinter.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kurifilter.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kshell.h>
 #include <tqlabel.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index c5c77d0c8..468764e2f 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -26,7 +26,7 @@
 #define KONSOLE_H
 
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdialogbase.h>
 #include <ksimpleconfig.h>
 #include <keditcl.h>
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index ac0b65bf9..930c951f0 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -30,7 +30,7 @@
 #include <kaboutdata.h>
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
@@ -44,10 +44,10 @@
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krootpixmap.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 // We can't use the ARGB32 visual when embedded in another application
 bool argb_visual = false;
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 4f2dca845..13af12ca5 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -18,7 +18,7 @@
 
 // Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
 #include <tdeio/job.h>
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0aae87d7a..0afe6a693 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -16,9 +16,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "konsole.h"
 #include "konsolebookmarkmenu.h"
diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h
index d3bc9b8f4..e375ec58d 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -22,7 +22,7 @@
 #define SESSION_H
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqstrlist.h>
 
 #include "TEPty.h"