diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kontact/plugins | |
parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins')
33 files changed, 36 insertions, 36 deletions
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index f5942309..bf4e2b17 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -34,7 +34,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <core.h> #include <plugin.h> diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h index 657cbc4d..82ae6ea1 100644 --- a/kontact/plugins/akregator/akregator_plugin.h +++ b/kontact/plugins/akregator/akregator_plugin.h @@ -26,9 +26,9 @@ #define AKREGATOR_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <plugin.h> #include "akregator_partiface_stub.h" #include <uniqueapphandler.h> diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index eec79275..159962e7 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -31,7 +31,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kaddrbook.h> #include <kabc/addressbook.h> diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h index 3295dc14..f9a7fff3 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h @@ -26,7 +26,7 @@ #define KADDRESSBOOK_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kaddressbookiface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index 5e5ecbb6..93d89493 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -24,7 +24,7 @@ */ #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "plugin.h" diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h index 9eb867d2..1b4c80bd 100644 --- a/kontact/plugins/karm/karm_plugin.h +++ b/kontact/plugins/karm/karm_plugin.h @@ -27,7 +27,7 @@ #define KARM_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "karmdcopiface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp index 677972d3..dfea5944 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp +++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp @@ -31,7 +31,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "plugin.h" diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h index dcd867ae..e14ee9a0 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.h +++ b/kontact/plugins/kitchensync/kitchensync_plugin.h @@ -26,7 +26,7 @@ #define KITCHENSYNC_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "plugin.h" diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 30026936..e6a1fae2 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kiconloader.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kstandarddirs.h> #include <dcopclient.h> #include <ktempfile.h> diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index 59b66add..d2c5f4a3 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -25,7 +25,7 @@ #define KMAIL_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kmailIface_stub.h" #include <plugin.h> diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 0c4e765c..89e572bf 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -33,7 +33,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "core.h" #include "summary.h" diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index 28bb63ab..3813ee03 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -30,7 +30,7 @@ #include <dcopobject.h> #include <kurllabel.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "plugin.h" #include "summary.h" diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index 8046288f..9713d853 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -27,7 +27,7 @@ #include "core.h" #include <kapplication.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kgenericfactory.h> #include <kapplication.h> #include <kaction.h> diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h index c6ed79b4..1062ff62 100644 --- a/kontact/plugins/knode/knode_plugin.h +++ b/kontact/plugins/knode/knode_plugin.h @@ -26,7 +26,7 @@ #define KNODE_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "knodeiface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am index 84e219b7..2b2dc9ed 100644 --- a/kontact/plugins/knotes/Makefile.am +++ b/kontact/plugins/knotes/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkontact_knotesplugin.la libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \ $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \ - $(top_builddir)/libkcal/libkcal.la -lkresources -ltdeprint \ + $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \ $(top_builddir)/knotes/libknotesresources.la \ $(top_builddir)/knotes/libknoteseditor.la \ $(top_builddir)/knotes/libknotesprinting.la diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index a3c7c790..b83c677f 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <libkcal/journal.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "knotes/KNotesIface.h" diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h index 8387df65..e8cb6051 100644 --- a/kontact/plugins/korganizer/journalplugin.h +++ b/kontact/plugins/korganizer/journalplugin.h @@ -25,7 +25,7 @@ #define KONTACT_JOURNALPLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kcalendariface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h index e5a32295..3dd21fb3 100644 --- a/kontact/plugins/korganizer/korganizerplugin.h +++ b/kontact/plugins/korganizer/korganizerplugin.h @@ -26,7 +26,7 @@ #define KORGANIZER_PLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kcalendariface_stub.h" #include "korganizeriface_stub.h" diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index d12081d6..451d8df5 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -30,7 +30,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h index 4775fbeb..8fd45391 100644 --- a/kontact/plugins/korganizer/todoplugin.h +++ b/kontact/plugins/korganizer/todoplugin.h @@ -25,7 +25,7 @@ #define KONTACT_TODOPLUGIN_H #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "kcalendariface_stub.h" #include "plugin.h" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 26ce828e..818eac7c 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -30,7 +30,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index fa3bc182..43ffb629 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -23,7 +23,7 @@ #include <kaboutdata.h> #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "summarywidget.h" diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 671ed5a2..79e03770 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -20,7 +20,7 @@ #include <kgenericfactory.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "summarywidget.h" diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 4ab89a32..4857f103 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -37,7 +37,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kurllabel.h> diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index f9d850ac..97b4d810 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -26,7 +26,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <klocale.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "sdsummarywidget.h" diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt index 9c5228fc..d7fad7af 100644 --- a/kontact/plugins/summary/CMakeLists.txt +++ b/kontact/plugins/summary/CMakeLists.txt @@ -36,7 +36,7 @@ install( FILES kontactsummary_part.rc DESTINATION ${DATA_INSTALL_DIR}/kontactsum tde_add_kpart( libkontact_summaryplugin AUTOMOC SOURCES summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp - LINK kpinterfaces-shared tdepim-shared kpimidentities-shared kutils-shared + LINK kpinterfaces-shared tdepim-shared kpimidentities-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -45,6 +45,6 @@ tde_add_kpart( libkontact_summaryplugin AUTOMOC tde_add_kpart( kcm_kontactsummary AUTOMOC SOURCES kcmkontactsummary.cpp - LINK tdeui-shared kutils-shared + LINK tdeui-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am index 0886be49..32fcdfc9 100644 --- a/kontact/plugins/summary/Makefile.am +++ b/kontact/plugins/summary/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \ kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkontact_summaryplugin_la_LIBADD = -lkutils \ +libkontact_summaryplugin_la_LIBADD = -ltdeutils \ $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \ $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index b1da7d0f..de5902b0 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -43,8 +43,8 @@ #include <klocale.h> #include <kcmultidialog.h> -#include <kparts/componentfactory.h> -#include <kparts/event.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/event.h> #include <libkpimidentities/identity.h> #include <libkpimidentities/identitymanager.h> diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 5b57d45c..9de42432 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -27,7 +27,7 @@ #include <tqdatetime.h> #include <tqmap.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include "core.h" #include "dropwidget.h" diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 8f4b7065..a7bb8996 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -23,7 +23,7 @@ #include <dcopref.h> #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kaboutdata.h> #include <kaction.h> diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index 450980dc..336f43db 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -24,7 +24,7 @@ #include "plugin.h" #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <tqmap.h> diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h index c70b9895..af7da8f8 100644 --- a/kontact/plugins/test/test_part.h +++ b/kontact/plugins/test/test_part.h @@ -26,7 +26,7 @@ -#include <kparts/part.h> +#include <tdeparts/part.h> class TQTextEdit; class KAddressBookIface_stub; diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index af4f9f5c..6c1f57d9 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -20,7 +20,7 @@ #include <kaboutdata.h> #include <kgenericfactory.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include "core.h" #include "summarywidget.h" |