Rename many classes and header files to avoid conflicts with KDE4

14 files changed, 22 insertions, 22 deletions

diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp
index 68e79b2b2..ebcd0800c 100644
--- a/libtdepim/addresseelineedit.cpp
+++ b/libtdepim/addresseelineedit.cpp
@@ -46,7 +46,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kurldrag.h>
 #include <klocale.h>
 
diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp
index 4549d3768..a5221c647 100644
--- a/libtdepim/addresseeselector.cpp
+++ b/libtdepim/addresseeselector.cpp
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include "addresseeselector.h"
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index dfe955403..20c06c94d 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -28,7 +28,7 @@
 #include <kabc/addressee.h>
 #include <kabc/phonenumber.h>
 #include <kabc/resource.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h
index 44b4f50e2..ba9eaf1f5 100644
--- a/libtdepim/addressesdialog.h
+++ b/libtdepim/addressesdialog.h
@@ -27,7 +27,7 @@
 
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqptrdict.h>
diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui
index 75d70011d..e03932b76 100644
--- a/libtdepim/addresspicker.ui
+++ b/libtdepim/addresspicker.ui
@@ -317,11 +317,11 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 4a1ee29ca..6c31a31e2 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 #include <tqhbox.h>
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 00b2f0bb3..f3e8597de 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h
index d8c6841ca..bec5e030c 100644
--- a/libtdepim/kfoldertree.h
+++ b/libtdepim/kfoldertree.h
@@ -26,7 +26,7 @@
 #include <tqbitarray.h>
 #include <tqdragobject.h>
 #include <tqcolor.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdepimmacros.h>
 
 class KFolderTree;
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 87da5c00e..79485f89c 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -33,18 +33,18 @@
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kstdaction.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kguiitem.h>
-#include <kpopupmenu.h>
-#include <kshortcut.h>
+#include <tdepopupmenu.h>
+#include <tdeshortcut.h>
 #include <kcmultidialog.h>
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <kdebug.h>
 
 #include <tqwidgetstack.h>
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 5259710ae..92235a18f 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -24,7 +24,7 @@
 
 #include "komposerIface.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqptrlist.h>
 
 namespace KSettings {
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 88c4fb1ea..accd10505 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -23,11 +23,11 @@
 
 #include <kgenericfactory.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp
index d733eab28..311d1d007 100644
--- a/libtdepim/kpimurlrequesterdlg.cpp
+++ b/libtdepim/kpimurlrequesterdlg.cpp
@@ -19,7 +19,7 @@
 
 
 #include <kpimurlrequesterdlg.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kurlrequesterdlg.h>
 #include <klocale.h>
 
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index 21a1fc6f2..e82168826 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -33,8 +33,8 @@
 #include <kimageeffect.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <stdlib.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index fbfa21a6d..b4aea5589 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -38,7 +38,7 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kmessagebox.h>
 #include <tdeconfigskeleton.h>
 #include <kurlrequester.h>