Rename many classes and header files to avoid conflicts with KDE4

15 files changed, 33 insertions, 33 deletions

diff --git a/src/core.cpp b/src/core.cpp
index 0fc882f9..332e37b7 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -4,12 +4,12 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include "toplevel.h"
 #include "partcontroller.h"
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index a7b7a995..e3e28df4 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -18,10 +18,10 @@
 #include <tdetexteditor/view.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
-#include <kmainwindow.h>
-#include <kactioncollection.h>
+#include <tdemainwindow.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include "toplevel.h"
 #include "partcontroller.h"
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index f56294a3..44859d6c 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -32,7 +32,7 @@
 #include <kiconloader.h>
 #include <kurlrequester.h>
 #include <kapplication.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
 
 #include <kdevplugin.h>
 #include <kdevmakefrontend.h>
diff --git a/src/main.cpp b/src/main.cpp
index 33c3b52c..5ba3f13d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <dcopclient.h>
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index d12e7d24..13e4ea9b 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -4,7 +4,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <dcopclient.h>
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index a81d7b39..51241534 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kaboutdata.h>
 #include <kstdaction.h>
 #include <kapplication.h>
@@ -37,7 +37,7 @@
 #include <kedittoolbar.h>
 #include <kbugreport.h>
 #include <kurlrequester.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <tdetexteditor/document.h>
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 403eee1a..5010a8ae 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 
 #include <tdeparts/factory.h>
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 3ccefc94..9b9c8337 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index db615763..c3f366ab 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -24,16 +24,16 @@
 #include <tdeparts/partmanager.h>
 #include <tdeparts/browserextension.h>
 #include <tdefiledialog.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #include <tdehtml_part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeio/netaccess.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kcompletion.h>
 #include <kdirwatch.h>
 #include <tdeversion.h>
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index d490e097..20acba3d 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -9,7 +9,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <assert.h>
 #include <kdebug.h>
@@ -27,7 +27,7 @@
 #include <kdevsourceformatter.h>
 #include <kdevcreatefile.h>
 #include <kdevplugininfo.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <profileengine.h>
 
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index c10aca8c..bb887f39 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui
index fc6b99f2..aa5ad8ee 100644
--- a/src/profileengine/editor/profileeditorbase.ui
+++ b/src/profileengine/editor/profileeditorbase.ui
@@ -664,21 +664,21 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index dbaa49c5..70fff792 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -16,9 +16,9 @@ class TQDomDocument;
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdefiledialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kprocess.h>
diff --git a/src/settingswidget.ui b/src/settingswidget.ui
index 5d139860..bd7b4a91 100644
--- a/src/settingswidget.ui
+++ b/src/settingswidget.ui
@@ -522,7 +522,7 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>kfontrequester.h</includehint>
+    <includehint>tdefontrequester.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index edb61145..380dc52c 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -21,10 +21,10 @@
 
 #include <tqtextedit.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <klocale.h>