Rename many classes and header files to avoid conflicts with KDE4

29 files changed, 36 insertions, 36 deletions

diff --git a/kontact/Thoughts b/kontact/Thoughts
index 2fd493fcd..f34164844 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -155,7 +155,7 @@ Don: available (and parts too like the todo list)
 Don:
 Don: But are you sure Kparts is limited in this way? KOrganizer can load
 Don: multiple plugins simultaneously. And all of these plugins are tdeparts
-Don: (eg. birthday import), and kactions for all loaded plugins are
+Don: (eg. birthday import), and tdeactions for all loaded plugins are
 Don: created and made available simultaneously.
 Don:
 Don: Yeah, I'm quite positive you can load multiple parts simultaneously.
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 81740c7b7..b977cfd34 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -27,7 +27,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 929bd1b83..0e9f43451 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tqdragobject.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index dfea5944d..7ebac4fb2 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 3ca4c9036..ba05ddd09 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -27,12 +27,12 @@
 #include <dcopref.h>
 
 #include <kaboutdata.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include "kcmkmailsummary.h"
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 051d69b95..6db41f4cb 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index eded07cbd..bbe5d9551 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -30,7 +30,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kgenericfactory.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index d73bd1fbe..9cdb854e9 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -24,7 +24,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 
 #include <libtdepim/infoextension.h>
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 648c94c2d..8e11e4f15 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -35,15 +35,15 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <kiconview.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <klineedit.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
 #include <kdialogbase.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index adf704b1d..d6414cbc1 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include <dcopref.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index d75bfe76d..0c0af4a3c 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index acc95d0f2..ab574346d 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -29,7 +29,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 00ed1e532..7f04a0c7f 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -29,7 +29,7 @@
 
 #include <kapplication.h>
 #include <kabc/vcardconverter.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <dcopref.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 416b0a5ad..02e3eb106 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
 #include <libkcal/event.h>
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 5c6ce7e9d..7fbc2a9c3 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -28,7 +28,7 @@
 
 #include <kapplication.h>
 #include <kabc/vcardconverter.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 996ea070f..3089c9876 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
 #include <libkcal/resourcecalendar.h>
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index ce433d053..72132b997 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -33,11 +33,11 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index e88911bad..08131e57b 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -31,7 +31,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 32aab8d0a..e55f19359 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -38,7 +38,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdeparts/part.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
 #include <libkcal/event.h>
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 75cd79821..3f1cdd69e 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -26,7 +26,7 @@
 #define KCMKONTACTSUMMARY_H
 
 #include <tdecmodule.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KPluginInfo;
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 335651cbd..41ef1eec8 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdcopservicestarter.h>
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 21c3a24c5..23e2ff8a2 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -25,7 +25,7 @@
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqpopupmenu.h>
 
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 846717ee8..c360ba523 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -32,7 +32,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index b5ca0462f..db375d278 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kstatusbar.h>
 
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index de16ee72d..6c490880c 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -36,7 +36,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index f7887b83e..4cfbd5556 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -23,7 +23,7 @@
 
 #include <tqtooltip.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include "sidepanebase.h"
 #include "prefs.h"
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 2d9daffd9..d2f9d0a23 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <ktrader.h>
 
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index c7976bd42..8c82fa5f9 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -43,15 +43,15 @@
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ksettings/dialog.h>
 #include <ksettings/dispatcher.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
@@ -67,7 +67,7 @@
 #include <krun.h>
 #include <kaboutdata.h>
 #include <kmenubar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kcmultidialog.h>
 #include <kipc.h>
 
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 6d1372deb..328848401 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -26,7 +26,7 @@
 #include "profilemanager.h"
 
 #include <tdefiledialog.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>