Additional kde to tde renaming

32 files changed, 36 insertions, 36 deletions

diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index 4f7d1185b..76f7f714c 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -66,10 +66,10 @@ Don't forget to
 ===============
 * Define the service type, using a "Type=ServiceType" .desktop file,
 with "X-KDE-ServiceType=DCOP/Foo".
-See e.g. kdepim/kaddressbook/dcopaddressbook.desktop
+See e.g. tdepim/kaddressbook/dcopaddressbook.desktop
 
 * Add DCOP/Foo to the application's ServiceTypes list, in its .desktop file
-See e.g. kdepim/kaddressbook/kaddressbook.desktop
+See e.g. tdepim/kaddressbook/kaddressbook.desktop
 * Make sure that X-DCOP-ServiceType and X-DCOP-ServiceName are specified too.
 
 Designing DCOP interfaces
diff --git a/kontact/Makefile.am b/kontact/Makefile.am
index eede263a0..a9ebbdc64 100644
--- a/kontact/Makefile.am
+++ b/kontact/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = interfaces plugins src pics profiles
 
-DOXYGEN_REFERENCES = kdeui kparts libkcal
+DOXYGEN_REFERENCES = tdeui kparts libkcal
 include $(top_srcdir)/admin/Doxyfile.am
 
 
diff --git a/kontact/Thoughts b/kontact/Thoughts
index 32a627584..f228e1f86 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -188,8 +188,8 @@ Don: If kontact is not running and is not the users preferred application
 Don: then a standalone version of X should be started, and an iface for
 Don: that standalone app returned.
 Don:
-Don: I think this library should be in libtdepim ad all the kdepim apps
-Don: should be moved into kdepim, so their iface files all be in one
+Don: I think this library should be in libtdepim ad all the tdepim apps
+Don: should be moved into tdepim, so their iface files all be in one
 Don: package. Or alternatively a new kdeinterfaces package be created
 Don: and used as a general repository for interface files.
 Don:
diff --git a/kontact/interfaces/CMakeLists.txt b/kontact/interfaces/CMakeLists.txt
index 74b590d8b..7cda8c197 100644
--- a/kontact/interfaces/CMakeLists.txt
+++ b/kontact/interfaces/CMakeLists.txt
@@ -42,6 +42,6 @@ tde_add_library( kpinterfaces SHARED AUTOMOC
   SOURCES
     core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp
   VERSION 1.0.0
-  LINK kdepim-shared
+  LINK tdepim-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index d43e78f5d..343132d03 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -24,7 +24,7 @@
 #define KONTACT_CORE_H
 
 #include <tqdatetime.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 #include <kparts/mainwindow.h>
 #include <kparts/part.h>
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index c532f86f1..aaa400786 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -26,7 +26,7 @@
 
 #include <tqobject.h>
 #include <kxmlguiclient.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 #include <tqptrlist.h>
 
 class TQStringList;
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index f6efa3087..f50507ce7 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -23,7 +23,7 @@
 
 #include <tqwidget.h>
 #include <tqpixmap.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 class KStatusBar;
 
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index b93b59657..3de543f03 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 #include <plugin.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 namespace Kontact
 {
diff --git a/kontact/plugins/CMakeLists.txt b/kontact/plugins/CMakeLists.txt
index 54b60cd82..9f54acbc0 100644
--- a/kontact/plugins/CMakeLists.txt
+++ b/kontact/plugins/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-# NOTE kpilot was moved from kdepim
+# NOTE kpilot was moved from tdepim
 
 add_subdirectory( kaddressbook )
 add_subdirectory( kmail )
diff --git a/kontact/plugins/kmail/CMakeLists.txt b/kontact/plugins/kmail/CMakeLists.txt
index 75f6ad2f5..f84e7a572 100644
--- a/kontact/plugins/kmail/CMakeLists.txt
+++ b/kontact/plugins/kmail/CMakeLists.txt
@@ -87,6 +87,6 @@ tde_add_kpart( libkontact_kmailplugin AUTOMOC
 
 tde_add_kpart( kcm_kmailsummary AUTOMOC
   SOURCES kcmkmailsummary.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 989ab6198..16146f2c7 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -37,7 +37,7 @@
 
 #include "kcmkmailsummary.h"
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am
index 095be66de..84e219b7c 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 -lkdeprint \
+                                    $(top_builddir)/libkcal/libkcal.la -lkresources -ltdeprint \
                                     $(top_builddir)/knotes/libknotesresources.la \
                                     $(top_builddir)/knotes/libknoteseditor.la \
                                     $(top_builddir)/knotes/libknotesprinting.la
diff --git a/kontact/plugins/korganizer/CMakeLists.txt b/kontact/plugins/korganizer/CMakeLists.txt
index 82a83ba38..fb270e854 100644
--- a/kontact/plugins/korganizer/CMakeLists.txt
+++ b/kontact/plugins/korganizer/CMakeLists.txt
@@ -78,7 +78,7 @@ tde_add_kpart( libkontact_journalplugin AUTOMOC
 
 tde_add_kpart( kcm_korgsummary AUTOMOC
   SOURCES kcmkorgsummary.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 87347f189..0bdb167f8 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -47,7 +47,7 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringL
     mIface( 0 )
 {
   setInstance( JournalPluginFactory::instance() );
-  instance()->iconLoader()->addAppDir("kdepim");
+  instance()->iconLoader()->addAppDir("tdepim");
 
   insertNewAction( new KAction( i18n( "New Journal..." ), "newjournal",
                    CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(),
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 7aa684f45..4466c5c6d 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -37,7 +37,7 @@
 
 #include "kcmkorgsummary.h"
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 7e67e5f54..7c2140b36 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -62,7 +62,7 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS
 {
 
   setInstance( KOrganizerPluginFactory::instance() );
-  instance()->iconLoader()->addAppDir("kdepim");
+  instance()->iconLoader()->addAppDir("tdepim");
 
   insertNewAction( new KAction( i18n( "New Event..." ), "newappointment",
                    CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(),
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index ed17e3177..7c3a1bed9 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -83,7 +83,7 @@ void SummaryWidget::updateView()
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
-  KIconLoader loader( "kdepim" );
+  KIconLoader loader( "tdepim" );
 
   KConfig config( "kcmkorgsummaryrc" );
 
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 4994c5151..caaaaf91d 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -59,7 +59,7 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
     mIface( 0 )
 {
   setInstance( TodoPluginFactory::instance() );
-  instance()->iconLoader()->addAppDir("kdepim");
+  instance()->iconLoader()->addAppDir("tdepim");
 
   insertNewAction( new KAction( i18n( "New To-do..." ), "newtodo",
                    CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(),
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 15731dd47..0849dde74 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -89,7 +89,7 @@ void TodoSummaryWidget::updateView()
   config.setGroup( "Todo" );
   bool showAllTodos = config.readBoolEntry( "ShowAllTodos", false );
 
-  KIconLoader loader( "kdepim" );
+  KIconLoader loader( "tdepim" );
 
   TQLabel *label = 0;
   int counter = 0;
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 0d63bafd0..46ec7fdfe 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -222,7 +222,7 @@ void SummaryWidget::startKPilot()
 {
   TQString error;
   TQCString appID;
-  if ( !KApplication::kdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) {
+  if ( !KApplication::tdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) {
     kdDebug(5602) << "No service available..." << endl;
     mStartedDaemon = true;
   }
diff --git a/kontact/plugins/newsticker/CMakeLists.txt b/kontact/plugins/newsticker/CMakeLists.txt
index 1415a3545..cea04661d 100644
--- a/kontact/plugins/newsticker/CMakeLists.txt
+++ b/kontact/plugins/newsticker/CMakeLists.txt
@@ -42,6 +42,6 @@ tde_add_kpart( libkontact_newstickerplugin AUTOMOC
 
 tde_add_kpart( kcm_kontactknt AUTOMOC
   SOURCES kcmkontactknt.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 6795ffb5b..fe2a20c63 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -45,7 +45,7 @@
 
 #include "newsfeeds.h"
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/specialdates/CMakeLists.txt b/kontact/plugins/specialdates/CMakeLists.txt
index 34b6bb9f8..d760fd121 100644
--- a/kontact/plugins/specialdates/CMakeLists.txt
+++ b/kontact/plugins/specialdates/CMakeLists.txt
@@ -45,6 +45,6 @@ tde_add_kpart( libkontact_specialdatesplugin AUTOMOC
 
 tde_add_kpart( kcm_sdsummary AUTOMOC
   SOURCES kcmsdsummary.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index b659cdb45..a59406590 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -39,7 +39,7 @@
 
 #include "kcmsdsummary.h"
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C"
 {
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 4df2d664a..3fbac9d2e 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -219,7 +219,7 @@ void SDSummaryWidget::updateView()
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
-  KIconLoader loader( "kdepim" );
+  KIconLoader loader( "tdepim" );
 
   KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
   TQValueList<SDEntry> dates;
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 9dc5e9828..c71b9e722 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -42,7 +42,7 @@ SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, c
     mAboutData( 0 )
 {
   setInstance( SpecialdatesPluginFactory::instance() );
-  instance()->iconLoader()->addAppDir( "kdepim" );
+  instance()->iconLoader()->addAppDir( "tdepim" );
 }
 
 SpecialdatesPlugin::~SpecialdatesPlugin()
diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt
index 4d7f2b730..9c5228fcf 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 kdepim-shared kpimidentities-shared kutils-shared
+  LINK kpinterfaces-shared tdepim-shared kpimidentities-shared kutils-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 kdeui-shared kutils-shared
+  LINK tdeui-shared kutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 156014ca0..47c9bca64 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -39,7 +39,7 @@
 
 #include "kcmkontactsummary.h"
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C"
 {
diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt
index 3a0dadeb0..38076fe44 100644
--- a/kontact/src/CMakeLists.txt
+++ b/kontact/src/CMakeLists.txt
@@ -38,7 +38,7 @@ install( FILES kontactui.rc kontact.setdlg DESTINATION ${DATA_INSTALL_DIR}/konta
 
 tde_add_kpart( kcm_kontact AUTOMOC
   SOURCES kcmkontact.cpp
-  LINK kontact-shared kdepim-shared
+  LINK kontact-shared tdepim-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -60,6 +60,6 @@ tde_add_executable( kontact AUTOMOC
 tde_add_library( kontact SHARED
   SOURCES prefs.kcfgc
   VERSION 1.0.0
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am
index f4bf13c50..3eb9de10d 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_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 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/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 03c59d65c..7bfed9cd4 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -38,7 +38,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C"
 {
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 8d2f3623f..a2ebad5e8 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -53,7 +53,7 @@ class KontactApp : public KUniqueApplication {
   public:
     KontactApp() : mMainWindow( 0 ), mSessionRestored( false )
     {
-      KGlobal::iconLoader()->addAppDir( "kdepim" );
+      KGlobal::iconLoader()->addAppDir( "tdepim" );
     }
     ~KontactApp() {}