summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
commitb363d2579af0a11b77e698aed2e1021c2233b644 (patch)
treef4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /kontact
parent61bddfe3a7226b18c68a76124b727c736f431688 (diff)
downloadtdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz
tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kontact')
-rw-r--r--kontact/Makefile.am2
-rw-r--r--kontact/Thoughts6
-rw-r--r--kontact/interfaces/core.cpp4
-rw-r--r--kontact/interfaces/core.h4
-rw-r--r--kontact/interfaces/plugin.cpp2
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp2
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h4
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.h2
-rw-r--r--kontact/plugins/karm/karm_plugin.cpp2
-rw-r--r--kontact/plugins/karm/karm_plugin.h2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.h2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.h2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.h2
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp2
-rw-r--r--kontact/plugins/knode/knode_plugin.h2
-rw-r--r--kontact/plugins/knotes/Makefile.am2
-rw-r--r--kontact/plugins/knotes/knotes_part.h2
-rw-r--r--kontact/plugins/korganizer/journalplugin.h2
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.h2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/todoplugin.h2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp2
-rw-r--r--kontact/plugins/kpilot/kpilot_plugin.cpp2
-rw-r--r--kontact/plugins/newsticker/newsticker_plugin.cpp2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp2
-rw-r--r--kontact/plugins/summary/CMakeLists.txt4
-rw-r--r--kontact/plugins/summary/Makefile.am2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp4
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.h2
-rw-r--r--kontact/plugins/test/test_part.h2
-rw-r--r--kontact/plugins/weather/weather_plugin.cpp2
-rw-r--r--kontact/src/CMakeLists.txt2
-rw-r--r--kontact/src/Makefile.am2
-rw-r--r--kontact/src/mainwindow.cpp6
-rw-r--r--kontact/src/mainwindow.h6
42 files changed, 53 insertions, 53 deletions
diff --git a/kontact/Makefile.am b/kontact/Makefile.am
index a9ebbdc64..8493e611b 100644
--- a/kontact/Makefile.am
+++ b/kontact/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = interfaces plugins src pics profiles
-DOXYGEN_REFERENCES = tdeui kparts libkcal
+DOXYGEN_REFERENCES = tdeui tdeparts libkcal
include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kontact/Thoughts b/kontact/Thoughts
index 16aa9c4a7..1fb22c9c7 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -154,7 +154,7 @@ Don: I agree that it is desireable to have common actions always
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 kparts
+Don: multiple plugins simultaneously. And all of these plugins are tdeparts
Don: (eg. birthday import), and kactions for all loaded plugins are
Don: created and made available simultaneously.
Don:
@@ -210,7 +210,7 @@ d We need a more sophisticated handling (progressbar, etc)
Don: Definitely.
-# We now have tdelibs/kparts/statusbarextension. This is intended to solve these
+# We now have tdelibs/tdeparts/statusbarextension. This is intended to solve these
# problems, right?
d: Right. Simply add it as childobject in your part and use it's API. Works even
@@ -348,7 +348,7 @@ h: see Opies OPimRecord for a bit too huge base class
Security
--------
-d If we use the kparts (ktrader) approach to find a parts by looking
+d If we use the tdeparts (ktrader) approach to find a parts by looking
d for an application with the correct mime type this might raise security
d problems. (Martin's concern)
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 92e0f624d..772ecc814 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -23,8 +23,8 @@
#include "core.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <tqtimer.h>
#include <klocale.h>
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index 2c8a5a4db..c92aca5d1 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -25,8 +25,8 @@
#include <tqdatetime.h>
#include <tdepimmacros.h>
-#include <kparts/mainwindow.h>
-#include <kparts/part.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/part.h>
class KAction;
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 82f2bbbec..9d9445e99 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -25,7 +25,7 @@
#include <dcopclient.h>
#include <kaboutdata.h>
#include <kglobal.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <kinstance.h>
#include <krun.h>
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index f59423099..bf4e2b17c 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 657cbc4d7..82ae6ea18 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 eec792750..159962e7a 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 3295dc146..f9a7fff3b 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 5e5ecbb67..93d894933 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 9eb867d2e..1b4c80bd4 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 677972d30..dfea5944d 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 dcd867aeb..e14ee9a0e 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 30026936f..e6a1fae21 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 59b66add1..d2c5f4a31 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 0c4e765cf..89e572bf8 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 28bb63abc..3813ee03d 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 8046288f8..9713d853f 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 c6ed79b4e..1062ff628 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 84e219b7c..2b2dc9ed0 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 a3c7c790e..b83c677f3 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 8387df651..e8cb60518 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 e5a322951..3dd21fb3f 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 d12081d6c..451d8df57 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 4775fbeb9..8fd453912 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 26ce828eb..818eac7c4 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 fa3bc1827..43ffb6294 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 671ed5a23..79e03770d 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 4ab89a323..4857f1035 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 f9d850acc..97b4d8100 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 9c5228fcf..d7fad7afc 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 0886be496..32fcdfc9a 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 b1da7d0fc..de5902b06 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 5b57d45cd..9de42432e 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 8f4b7065d..a7bb89960 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 450980dc1..336f43dbd 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 c70b98952..af7da8f84 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 af4f9f5c7..6c1f57d97 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"
diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt
index 38076fe44..39ea8df98 100644
--- a/kontact/src/CMakeLists.txt
+++ b/kontact/src/CMakeLists.txt
@@ -50,7 +50,7 @@ tde_add_executable( kontact AUTOMOC
main.cpp mainwindow.cpp sidepanebase.cpp iconsidepane.cpp
aboutdialog.cpp profilemanager.cpp profiledialog.cpp
kontactiface.skel
- LINK kontact-shared kpinterfaces-shared kutils-shared khtml-shared
+ LINK kontact-shared kpinterfaces-shared tdeutils-shared tdehtml-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am
index 082f9f243..daec1fa3a 100644
--- a/kontact/src/Makefile.am
+++ b/kontact/src/Makefile.am
@@ -10,7 +10,7 @@ libkontact_la_SOURCES = prefs.kcfgc
bin_PROGRAMS = kontact
kontact_METASOURCES = AUTO
-kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 8a6a7f354..d3642b6a5 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -46,7 +46,7 @@
#include <klistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
#include <kpopupmenu.h>
#include <ksettings/dialog.h>
@@ -60,8 +60,8 @@
#include <ksettings/componentsdialog.h>
#include <kstringhandler.h>
#include <krsqueezedtextlabel.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
#include <libtdepim/kfileio.h>
#include <kcursor.h>
#include <krun.h>
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 42b55420b..de23b19a8 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -28,9 +28,9 @@
#include <tqptrlist.h>
#include <tqwidgetstack.h>
-#include <kparts/mainwindow.h>
-#include <kparts/part.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/part.h>
+#include <tdeparts/partmanager.h>
#include <kdcopservicestarter.h>
#include "core.h"