Rename a number of libraries and executables to avoid conflicts with KDE4

25 files changed, 44 insertions, 44 deletions

diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt
index ba68d5c17..84f57a93f 100644
--- a/libtdepim/CMakeLists.txt
+++ b/libtdepim/CMakeLists.txt
@@ -19,7 +19,7 @@ tde_import( ktnef )
 
 add_subdirectory( icons )
 add_subdirectory( pics )
-add_subdirectory( kpartsdesignerplugin )
+add_subdirectory( tdepartsdesignerplugin )
 add_subdirectory( about )
 
 include_directories(
@@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC
     csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp
     sendsmsdialog.cpp kmailcompletion.cpp
   VERSION 1.0.0
-  LINK kcal-shared kimproxy-shared kparts-shared ${TQUI_LIBRARIES}
+  LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQUI_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am
index d8da6066b..24942c728 100644
--- a/libtdepim/Makefile.am
+++ b/libtdepim/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cfgc interfaces tests icons pics kpartsdesignerplugin about
+SUBDIRS = cfgc interfaces tests icons pics tdepartsdesignerplugin about
 
 INCLUDES = -I$(top_srcdir) $(all_includes)
 
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h
index 782f4416e..25b97487a 100644
--- a/libtdepim/addresseeview.h
+++ b/libtdepim/addresseeview.h
@@ -26,7 +26,7 @@
 
 #include <kabc/addressee.h>
 #include <ktextbrowser.h>
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 #include <tdepimmacros.h>
 
 namespace TDEIO {
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 4e46705b0..d86995404 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -32,7 +32,7 @@
 
 #ifdef TDEPIM_NEW_DISTRLISTS
 #include "distributionlist.h"
-#include <kresources/selectdialog.h>
+#include <tderesources/selectdialog.h>
 #include <kabc/resource.h>
 #else
 #include <kabc/distributionlist.h>
diff --git a/libtdepim/cfgc/Makefile.am b/libtdepim/cfgc/Makefile.am
index c5a394828..f0bcd7ceb 100644
--- a/libtdepim/cfgc/Makefile.am
+++ b/libtdepim/cfgc/Makefile.am
@@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes)
 check_PROGRAMS = example
 #autoexample
 
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 example_LDADD = ../libtdepim.la $(LIB_TDECORE)
 example_SOURCES = example.cpp exampleprefs_base.kcfgc
 
-#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 #autoexample_LDADD = ../libtdepim.la $(LIB_TDECORE)
 #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp
 
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 2e455fe10..1796933f8 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -59,7 +59,7 @@ The default completion weights are as follow:
   LDAP: 50, 49, 48 etc.          (see ldapclient.cpp)
   KABC non-imap resources: 60    (see addresseelineedit.cpp and SimpleCompletionItem here)
   Distribution lists: 60         (see addresseelineedit.cpp and SimpleCompletionItem here)
-  KABC imap resources: 80        (see kresources/imap/kabc/resourceimap.cpp)
+  KABC imap resources: 80        (see tderesources/imap/kabc/resourceimap.cpp)
 
 This dialog allows to change those weights, by showing one item per:
  - LDAP server
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index 20de40de5..3c0ba38d0 100644
--- a/libtdepim/csshelper.cpp
+++ b/libtdepim/csshelper.cpp
@@ -591,7 +591,7 @@ namespace KPIM {
       "}\n\n"
 
       "div.fancy.header table {\n"
-      "  padding: 2px ! important;\n" // ### khtml bug: this is ignored
+      "  padding: 2px ! important;\n" // ### tdehtml bug: this is ignored
       "  text-align: left ! important\n"
       "}\n\n"
 
diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp
index 7a459530c..b8567d774 100644
--- a/libtdepim/embeddedurlpage.cpp
+++ b/libtdepim/embeddedurlpage.cpp
@@ -2,7 +2,7 @@
     This file is part of libtdepim.
 
     Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
-    Part of loadContents() copied from the kpartsdesignerplugin:
+    Part of loadContents() copied from the tdepartsdesignerplugin:
     Copyright (C) 2005, David Faure <faure@kde.org>
 
     This library is free software; you can redistribute it and/or
@@ -22,9 +22,9 @@
 */
 
 #include "embeddedurlpage.h"
-#include <kparts/componentfactory.h>
-#include <kparts/browserextension.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/part.h>
 #include <kmimetype.h>
 #include <klocale.h>
 #include <tqlayout.h>
diff --git a/libtdepim/infoextension.cpp b/libtdepim/infoextension.cpp
index 25f7e8ba7..80f53010d 100644
--- a/libtdepim/infoextension.cpp
+++ b/libtdepim/infoextension.cpp
@@ -22,7 +22,7 @@
  #include "infoextension.h"
 
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 using namespace KParts;
 
diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp
index 510ef2f83..df8ecbcad 100644
--- a/libtdepim/kabcresourcecached.cpp
+++ b/libtdepim/kabcresourcecached.cpp
@@ -342,7 +342,7 @@ KABC::Addressee::List ResourceCached::deletedAddressees() const
 
 TQString ResourceCached::cacheFile() const
 {
-  return locateLocal( "cache", "kabc/kresources/" + identifier() );
+  return locateLocal( "cache", "kabc/tderesources/" + identifier() );
 }
 
 TQString ResourceCached::changesCacheFile( const TQString &type ) const
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 44e1488bd..72fa4f3d0 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -22,7 +22,7 @@
 #include <kabc/stdaddressbook.h>
 #include <kabc/vcardconverter.h>
 #include <kabc/errorhandler.h>
-#include <kresources/selectdialog.h>
+#include <tderesources/selectdialog.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 
diff --git a/libtdepim/komposer/core/Makefile.am b/libtdepim/komposer/core/Makefile.am
index 2898c0774..764ec052b 100644
--- a/libtdepim/komposer/core/Makefile.am
+++ b/libtdepim/komposer/core/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkomposer.la
 libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \
 	settings.kcfgc pluginmanager.cpp komposerIface.skel
 libkomposer_la_LDFLAGS = -no-undefined $(KDE_RPATH) -version-info 1:0:0 $(all_libraries)
-libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -lkutils
+libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -ltdeutils
 
 #kde_module_LTLIBRARIES = kcm_komposer.la
 
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index b19ead449..f2778178a 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -32,7 +32,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>
 #include <ksettings/dispatcher.h>
 #include <ksimpleconfig.h>
diff --git a/libtdepim/komposer/core/tests/Makefile.am b/libtdepim/komposer/core/tests/Makefile.am
index 4958c55ed..829fb3097 100644
--- a/libtdepim/komposer/core/tests/Makefile.am
+++ b/libtdepim/komposer/core/tests/Makefile.am
@@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer
 METASOURCES = AUTO
 
 testfactory_SOURCES = main.cpp managertest.cpp
-testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testfactory_LDADD = ../libkomposer.la
 
 testmanager_SOURCES = testmanager.cpp
-testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testmanager_LDADD = ../libkomposer.la
 
 testkomposer_SOURCES = testkomposer.cpp
-testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testkomposer_LDADD = ../libkomposer.la
 
 check: testfactory
diff --git a/libtdepim/komposer/test/Makefile.am b/libtdepim/komposer/test/Makefile.am
index 7006ec178..6bdebcf2e 100644
--- a/libtdepim/komposer/test/Makefile.am
+++ b/libtdepim/komposer/test/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes)
 LDADD = $(LIB_KPARTS) ../core/libkomposer.la
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 check_PROGRAMS = test
 
diff --git a/libtdepim/kpartsdesignerplugin/Makefile.am b/libtdepim/kpartsdesignerplugin/Makefile.am
deleted file mode 100644
index ebbfbfba2..000000000
--- a/libtdepim/kpartsdesignerplugin/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AM_CXXFLAGS = -DQT_PLUGIN
-METASOURCES = AUTO
-INCLUDES = $(all_includes)
-
-kde_widget_LTLIBRARIES = kpartsdesignerplugin.la
-kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio
-kpartsdesignerplugin_la_LIBADD = $(LIB_KPARTS)
-kpartsdesignerplugin_la_SOURCES = kpartsdesignerplugin.cpp
diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp
index 95c82035a..37c9abc5b 100644
--- a/libtdepim/kscoringeditor.cpp
+++ b/libtdepim/kscoringeditor.cpp
@@ -27,7 +27,7 @@
 #include <kiconloader.h>
 #include <kregexpeditorinterface.h>
 #include <ktrader.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 
 #include <tqlabel.h>
diff --git a/libtdepim/sidebarextension.cpp b/libtdepim/sidebarextension.cpp
index db49dc71f..862792813 100644
--- a/libtdepim/sidebarextension.cpp
+++ b/libtdepim/sidebarextension.cpp
@@ -22,7 +22,7 @@
 #include "sidebarextension.h"
 
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 using namespace KParts;
 
diff --git a/libtdepim/kpartsdesignerplugin/CMakeLists.txt b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt
index 55c75251c..01bba1d8c 100644
--- a/libtdepim/kpartsdesignerplugin/CMakeLists.txt
+++ b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt
@@ -23,10 +23,10 @@ link_directories(
 )
 
 
-##### kpartsdesignerplugin (module) #############
+##### tdepartsdesignerplugin (module) #############
 
-tde_add_kpart( kpartsdesignerplugin AUTOMOC
-  SOURCES kpartsdesignerplugin.cpp
-  LINK kparts-shared kio-shared
+tde_add_kpart( tdepartsdesignerplugin AUTOMOC
+  SOURCES tdepartsdesignerplugin.cpp
+  LINK tdeparts-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
 )
diff --git a/libtdepim/tdepartsdesignerplugin/Makefile.am b/libtdepim/tdepartsdesignerplugin/Makefile.am
new file mode 100644
index 000000000..24d32ca7d
--- /dev/null
+++ b/libtdepim/tdepartsdesignerplugin/Makefile.am
@@ -0,0 +1,8 @@
+AM_CXXFLAGS = -DQT_PLUGIN
+METASOURCES = AUTO
+INCLUDES = $(all_includes)
+
+kde_widget_LTLIBRARIES = tdepartsdesignerplugin.la
+tdepartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio
+tdepartsdesignerplugin_la_LIBADD = $(LIB_KPARTS)
+tdepartsdesignerplugin_la_SOURCES = tdepartsdesignerplugin.cpp
diff --git a/libtdepim/kpartsdesignerplugin/README b/libtdepim/tdepartsdesignerplugin/README
index 0dbcb2ecf..da5c58f28 100644
--- a/libtdepim/kpartsdesignerplugin/README
+++ b/libtdepim/tdepartsdesignerplugin/README
@@ -1,2 +1,2 @@
-When moving this to tdelibs: the KPartsGenericPart class should move to libkparts so
+When moving this to tdelibs: the KPartsGenericPart class should move to libtdeparts so
 that it's possible to add an accessor for m_part there.
diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index f25ec3cd3..97dec07ef 100644
--- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -17,10 +17,10 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kpartsdesignerplugin.h"
+#include "tdepartsdesignerplugin.h"
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 #include <kmimetype.h>
 #include <tqlayout.h>
 #include <kapplication.h>
@@ -113,5 +113,5 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const {
 
 KDE_TQ_EXPORT_PLUGIN( KPartsWidgetPlugin )
 
-#include "kpartsdesignerplugin.moc"
+#include "tdepartsdesignerplugin.moc"
 
diff --git a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h
index 91c96d2f3..91c96d2f3 100644
--- a/libtdepim/kpartsdesignerplugin/kpartsdesignerplugin.h
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.h
diff --git a/libtdepim/tests/Makefile.am b/libtdepim/tests/Makefile.am
index 34ecb179f..328f068d7 100644
--- a/libtdepim/tests/Makefile.am
+++ b/libtdepim/tests/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 LDADD = ../libtdepim.la $(LIB_TDECORE)
 
 check_PROGRAMS = testwizard testaddresseelineedit \
@@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
 
 METASOURCES = AUTO
 
-#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 #example_LDADD = ../libtdepim.la $(LIB_TDECORE)
 #example_SOURCES = example.cpp exampleprefs_base.kcfgc
 
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index b6962d511..895dc5371 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -42,7 +42,7 @@ using KPIM::DistributionList;
 int main(int argc, char *argv[])
 {
     // Use another directory than the real one, just to keep things clean
-    // TDEHOME needs to be writable though, for a ksycoca database
+    // TDEHOME needs to be writable though, for a tdesycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-testdistrlist" ), true );
     setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup