summaryrefslogtreecommitdiffstats
path: root/kontact/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /kontact/plugins
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins')
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp4
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h6
-rw-r--r--kontact/plugins/knotes/knotes_plugin.cpp2
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp2
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp4
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.h2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp2
-rw-r--r--kontact/plugins/test/test_part.cpp2
-rw-r--r--kontact/plugins/test/test_plugin.cpp2
23 files changed, 27 insertions, 27 deletions
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 81740c7b..b977cfd3 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 929bd1b8..0e9f4345 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 dfea5944..7ebac4fb 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 3ca4c903..ba05ddd0 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 051d69b9..6db41f4c 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 eded07cb..bbe5d955 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 d73bd1fb..9cdb854e 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 648c94c2..8e11e4f1 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 adf704b1..d6414cbc 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 d75bfe76..0c0af4a3 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 acc95d0f..ab574346 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 00ed1e53..7f04a0c7 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 416b0a5a..02e3eb10 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 5c6ce7e9..7fbc2a9c 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 996ea070..3089c987 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 ce433d05..72132b99 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 e88911ba..08131e57 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 32aab8d0..e55f1935 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 75cd7982..3f1cdd69 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 335651cb..41ef1eec 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 21c3a24c..23e2ff8a 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 846717ee..c360ba52 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 b5ca0462..db375d27 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>