diff options
Diffstat (limited to 'kresources')
93 files changed, 106 insertions, 106 deletions
diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt index 79e285e5..83673371 100644 --- a/kresources/CMakeLists.txt +++ b/kresources/CMakeLists.txt @@ -14,7 +14,7 @@ project( kresources ) tde_import( libkmime ) tde_import( ktnef ) tde_import( libkcal ) -tde_import( libkdepim ) +tde_import( libtdepim ) tde_import( knotes ) add_subdirectory( lib ) diff --git a/kresources/birthdays/CMakeLists.txt b/kresources/birthdays/CMakeLists.txt index 92b7f7af..4836da70 100644 --- a/kresources/birthdays/CMakeLists.txt +++ b/kresources/birthdays/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_BINARY_DIR}/kaddressbook/common ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/kaddressbook/common - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h index 1dce9cf0..6c69a01a 100644 --- a/kresources/birthdays/resourcekabc.h +++ b/kresources/birthdays/resourcekabc.h @@ -33,7 +33,7 @@ #include "libkcal/resourcecalendar.h" -#include "libkdepim/kdepimmacros.h" +#include "libtdepim/kdepimmacros.h" namespace KIO { class FileCopyJob; diff --git a/kresources/blogging/Makefile.am b/kresources/blogging/Makefile.am index b1572436..508b0e75 100644 --- a/kresources/blogging/Makefile.am +++ b/kresources/blogging/Makefile.am @@ -11,7 +11,7 @@ libkcal_blogging_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_blogging_la_LIBADD = \ ../lib/libkgroupwarebase.la \ - $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la kcal_blogging_la_SOURCES = kcal_resourceblogging_plugin.cpp diff --git a/kresources/caldav/CMakeLists.txt b/kresources/caldav/CMakeLists.txt index ad744614..da220c13 100644 --- a/kresources/caldav/CMakeLists.txt +++ b/kresources/caldav/CMakeLists.txt @@ -14,7 +14,7 @@ include( ConfigureChecks.cmake ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${CALDAV_INCLUDE_DIRS} diff --git a/kresources/caldav/Makefile.am b/kresources/caldav/Makefile.am index 45c0f2c7..1bfe28dc 100644 --- a/kresources/caldav/Makefile.am +++ b/kresources/caldav/Makefile.am @@ -14,7 +14,7 @@ libkcal_caldav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_caldav_la_LIBADD = \ $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ -lcaldav libkcal_caldav_la_COMPILE_FIRST = prefsskel.h diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h index 66eb21d0..41776766 100644 --- a/kresources/caldav/resource.h +++ b/kresources/caldav/resource.h @@ -22,7 +22,7 @@ #include <tqptrqueue.h> #include <libkcal/resourcecached.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <kabc/locknull.h> diff --git a/kresources/carddav/CMakeLists.txt b/kresources/carddav/CMakeLists.txt index d68e3824..e1c63794 100644 --- a/kresources/carddav/CMakeLists.txt +++ b/kresources/carddav/CMakeLists.txt @@ -14,7 +14,7 @@ include( ConfigureChecks.cmake ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${CARDDAV_INCLUDE_DIRS} diff --git a/kresources/carddav/Makefile.am b/kresources/carddav/Makefile.am index a71870f0..a9097ff8 100644 --- a/kresources/carddav/Makefile.am +++ b/kresources/carddav/Makefile.am @@ -13,7 +13,7 @@ libkabc_carddav_la_SOURCES = resource.cpp \ libkabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkabc_carddav_la_LIBADD = \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la \ -lkabc \ -lcarddav diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h index fca215aa..608d09cb 100644 --- a/kresources/carddav/resource.h +++ b/kresources/carddav/resource.h @@ -21,7 +21,7 @@ #include <tqptrqueue.h> #include <kabcresourcecached.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <kabc/locknull.h> diff --git a/kresources/egroupware/CMakeLists.txt b/kresources/egroupware/CMakeLists.txt index aa61c9b9..065e9a9c 100644 --- a/kresources/egroupware/CMakeLists.txt +++ b/kresources/egroupware/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_BINARY_DIR}/kaddressbook/common ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/kaddressbook/common - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/egroupware/Makefile.am b/kresources/egroupware/Makefile.am index 8325ed01..23e5232e 100644 --- a/kresources/egroupware/Makefile.am +++ b/kresources/egroupware/Makefile.am @@ -20,7 +20,7 @@ lib_LTLIBRARIES = libkabc_xmlrpc.la libkcal_xmlrpc.la libknotes_xmlrpc.la libkabc_xmlrpc_la_SOURCES = kabc_resourcexmlrpc.cpp kabc_resourcexmlrpcconfig.cpp \ kabc_egroupwareprefs.kcfgc libkabc_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined -libkabc_xmlrpc_la_LIBADD = $(LIB_KIO) -lkabc $(top_builddir)/libkdepim/libkdepim.la \ +libkabc_xmlrpc_la_LIBADD = $(LIB_KIO) -lkabc $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ libegwcommon.la @@ -28,7 +28,7 @@ libkcal_xmlrpc_la_SOURCES = kcal_resourcexmlrpc.cpp kcal_resourcexmlrpcconfig.cp todostatemapper.cpp kcal_egroupwareprefs.kcfgc libkcal_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined libkcal_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ libegwcommon.la libknotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpc.cpp knotes_resourcexmlrpcconfig.cpp \ @@ -36,7 +36,7 @@ libknotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpc.cpp knotes_resourcexmlrpccon libknotes_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -lkdeprint \ $(top_builddir)/knotes/libknotesresources.la \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ libegwcommon.la kabcincludedir = $(includedir)/kabc diff --git a/kresources/egroupware/kabc_egroupwareprefs.kcfgc b/kresources/egroupware/kabc_egroupwareprefs.kcfgc index 0009334a..959ab20b 100644 --- a/kresources/egroupware/kabc_egroupwareprefs.kcfgc +++ b/kresources/egroupware/kabc_egroupwareprefs.kcfgc @@ -5,7 +5,7 @@ NameSpace=KABC Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index a02f568a..35d38ea7 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kstringhandler.h> #include <libkcal/freebusyurlstore.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include "kabc_egroupwareprefs.h" #include "kabc_resourcexmlrpc.h" diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h index e7ae1c53..74929616 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.h +++ b/kresources/egroupware/kabc_resourcexmlrpc.h @@ -24,7 +24,7 @@ #include <tqmap.h> #include <kdepimmacros.h> -#include "libkdepim/kabcresourcecached.h" +#include "libtdepim/kabcresourcecached.h" class KConfig; class Synchronizer; diff --git a/kresources/egroupware/kcal_egroupwareprefs.kcfgc b/kresources/egroupware/kcal_egroupwareprefs.kcfgc index 6a278752..0ede5926 100644 --- a/kresources/egroupware/kcal_egroupwareprefs.kcfgc +++ b/kresources/egroupware/kcal_egroupwareprefs.kcfgc @@ -5,7 +5,7 @@ NameSpace=KCal Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index 3360d18c..8b68b4cb 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -35,7 +35,7 @@ #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include "libkcal/vcaldrag.h" #include "libkcal/vcalformat.h" diff --git a/kresources/egroupware/knotes_egroupwareprefs.kcfgc b/kresources/egroupware/knotes_egroupwareprefs.kcfgc index 782dd567..1aaf0265 100644 --- a/kresources/egroupware/knotes_egroupwareprefs.kcfgc +++ b/kresources/egroupware/knotes_egroupwareprefs.kcfgc @@ -5,7 +5,7 @@ NameSpace=KNotes Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/exchange/CMakeLists.txt b/kresources/exchange/CMakeLists.txt index 10b15aa2..98633d6b 100644 --- a/kresources/exchange/CMakeLists.txt +++ b/kresources/exchange/CMakeLists.txt @@ -14,7 +14,7 @@ tde_import( libkpimexchange ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${CMAKE_SOURCE_DIR}/libkpimexchange/core ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} diff --git a/kresources/featureplan/CMakeLists.txt b/kresources/featureplan/CMakeLists.txt index 5af26e08..c365c8cb 100644 --- a/kresources/featureplan/CMakeLists.txt +++ b/kresources/featureplan/CMakeLists.txt @@ -24,7 +24,7 @@ endif( ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/featureplan/Makefile.am b/kresources/featureplan/Makefile.am index 3e3d01a8..70bddac3 100644 --- a/kresources/featureplan/Makefile.am +++ b/kresources/featureplan/Makefile.am @@ -12,7 +12,7 @@ libkcal_resourcefeatureplan_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_resourcefeatureplan_la_LIBADD = libfeatureplancommon.la \ $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkcal_resourcefeatureplan_la_COMPILE_FIRST = kde-features.h prefs.h diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp index cce88495..2b54b026 100644 --- a/kresources/featureplan/kcal_resourcefeatureplan.cpp +++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp @@ -39,7 +39,7 @@ #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> using namespace KCal; diff --git a/kresources/groupdav/CMakeLists.txt b/kresources/groupdav/CMakeLists.txt index b662437c..1ab46c46 100644 --- a/kresources/groupdav/CMakeLists.txt +++ b/kresources/groupdav/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../lib ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/groupdav/Makefile.am b/kresources/groupdav/Makefile.am index 2966d625..8006e635 100644 --- a/kresources/groupdav/Makefile.am +++ b/kresources/groupdav/Makefile.am @@ -11,14 +11,14 @@ libkcal_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_groupdav_la_LIBADD = \ libkgroupdav.la ../lib/libkgroupwaredav.la \ - $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la libkabc_groupdav_la_SOURCES = kabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp libkabc_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkabc_groupdav_la_LIBADD = \ libkgroupdav.la ../lib/libkgroupwaredav.la \ - $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \ -lkabc kde_module_LTLIBRARIES = kcal_groupdav.la kabc_groupdav.la diff --git a/kresources/groupware/Makefile.am b/kresources/groupware/Makefile.am index dfb12eec..741c1052 100644 --- a/kresources/groupware/Makefile.am +++ b/kresources/groupware/Makefile.am @@ -9,7 +9,7 @@ libkcal_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_groupware_la_LIBADD = \ $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkabc_groupware_la_SOURCES = kabc_resourcegroupware.cpp \ kabc_resourcegroupwareconfig.cpp \ @@ -17,7 +17,7 @@ libkabc_groupware_la_SOURCES = kabc_resourcegroupware.cpp \ libkabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ -lkabc kde_module_LTLIBRARIES = kcal_groupware.la kabc_groupware.la diff --git a/kresources/groupware/kabc_groupwareprefs.kcfgc b/kresources/groupware/kabc_groupwareprefs.kcfgc index 36ee168a..d19f1ae7 100644 --- a/kresources/groupware/kabc_groupwareprefs.kcfgc +++ b/kresources/groupware/kabc_groupwareprefs.kcfgc @@ -1,7 +1,7 @@ ClassName=GroupwarePrefs File=kresources_kabc_groupware.kcfg GlobalEnums=true -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs Mutators=true NameSpace=KABC diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp index f82b0c75..251b9a53 100644 --- a/kresources/groupware/kabc_resourcegroupware.cpp +++ b/kresources/groupware/kabc_resourcegroupware.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <klocale.h> -#include <libkdepim/groupwarejob.h> +#include <libtdepim/groupwarejob.h> #include "kabc_groupwareprefs.h" diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h index 564a3b1f..db87254a 100644 --- a/kresources/groupware/kabc_resourcegroupware.h +++ b/kresources/groupware/kabc_resourcegroupware.h @@ -22,7 +22,7 @@ #include <kabcresourcecached.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <kio/job.h> diff --git a/kresources/groupware/kcal_groupwareprefsbase.kcfgc b/kresources/groupware/kcal_groupwareprefsbase.kcfgc index d784aa57..15bd1e28 100644 --- a/kresources/groupware/kcal_groupwareprefsbase.kcfgc +++ b/kresources/groupware/kcal_groupwareprefsbase.kcfgc @@ -5,7 +5,7 @@ NameSpace=KCal Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp index 1dc1bf7c..9bf03b19 100644 --- a/kresources/groupware/kcal_resourcegroupware.cpp +++ b/kresources/groupware/kcal_resourcegroupware.cpp @@ -41,8 +41,8 @@ #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> -#include <libkdepim/kpimprefs.h> -#include <libkdepim/groupwarejob.h> +#include <libtdepim/kpimprefs.h> +#include <libtdepim/groupwarejob.h> using namespace KCal; diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h index 030d9499..81cd7118 100644 --- a/kresources/groupware/kcal_resourcegroupware.h +++ b/kresources/groupware/kcal_resourcegroupware.h @@ -21,7 +21,7 @@ #ifndef KCAL_RESOURCEGROUPWARE_H #define KCAL_RESOURCEGROUPWARE_H -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <libkcal/resourcecached.h> diff --git a/kresources/groupwise/CMakeLists.txt b/kresources/groupwise/CMakeLists.txt index 2b661be9..e2d2f424 100644 --- a/kresources/groupwise/CMakeLists.txt +++ b/kresources/groupwise/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/groupwise/Makefile.am b/kresources/groupwise/Makefile.am index 76a67d5e..5056a35d 100644 --- a/kresources/groupwise/Makefile.am +++ b/kresources/groupwise/Makefile.am @@ -11,7 +11,7 @@ libkcal_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_groupwise_la_LIBADD = soap/libgwsoap.la \ $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkabc_groupwise_la_SOURCES = kabc_resourcegroupwise.cpp \ kabc_resourcegroupwiseconfig.cpp \ @@ -20,7 +20,7 @@ libkabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkabc_groupwise_la_LIBADD = soap/libgwsoap.la \ $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libtdepim/libtdepim.la \ -lkabc diff --git a/kresources/groupwise/kabc_groupwiseprefs.kcfgc b/kresources/groupwise/kabc_groupwiseprefs.kcfgc index 58781070..98493547 100644 --- a/kresources/groupwise/kabc_groupwiseprefs.kcfgc +++ b/kresources/groupwise/kabc_groupwiseprefs.kcfgc @@ -1,7 +1,7 @@ ClassName=GroupwisePrefs File=kresources_kabc_groupwise.kcfg GlobalEnums=true -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs Mutators=true NameSpace=KABC diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h index 4cdfe551..b300336c 100644 --- a/kresources/groupwise/kabc_resourcegroupwise.h +++ b/kresources/groupwise/kabc_resourcegroupwise.h @@ -25,7 +25,7 @@ #include <kabcresourcecached.h> #include <kdepimmacros.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <kio/job.h> diff --git a/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc b/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc index 988d4344..7eac7daa 100644 --- a/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc +++ b/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc @@ -5,7 +5,7 @@ NameSpace=KCal Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp index dadf5b31..ae56576e 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.cpp +++ b/kresources/groupwise/kcal_resourcegroupwise.cpp @@ -43,7 +43,7 @@ #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurl.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> using namespace KCal; diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h index 66011aa9..e99a0402 100644 --- a/kresources/groupwise/kcal_resourcegroupwise.h +++ b/kresources/groupwise/kcal_resourcegroupwise.h @@ -23,7 +23,7 @@ #include <libemailfunctions/idmapper.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <libkcal/resourcecached.h> diff --git a/kresources/groupwise/kioslave/CMakeLists.txt b/kresources/groupwise/kioslave/CMakeLists.txt index 36182337..23476fe0 100644 --- a/kresources/groupwise/kioslave/CMakeLists.txt +++ b/kresources/groupwise/kioslave/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../soap ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/groupwise/kioslave/Makefile.am b/kresources/groupwise/kioslave/Makefile.am index c944b3e5..0e3ed61a 100644 --- a/kresources/groupwise/kioslave/Makefile.am +++ b/kresources/groupwise/kioslave/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/groupwise/soap \ - -I$(top_builddir)/libkdepim $(all_includes) + -I$(top_builddir)/libtdepim $(all_includes) noinst_HEADERS = groupwise.h @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kio_groupwise.la kio_groupwise_la_SOURCES = groupwise.cpp kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - ../soap/libgwsoap.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) + ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index 6ea0c8ed..5e182283 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -23,7 +23,7 @@ #include <tqregexp.h> -#include <libkdepim/kabcresourcecached.h> +#include <libtdepim/kabcresourcecached.h> #include <libkcal/freebusy.h> #include <libkcal/icalformat.h> diff --git a/kresources/groupwise/soap/CMakeLists.txt b/kresources/groupwise/soap/CMakeLists.txt index e6aaec2b..64509638 100644 --- a/kresources/groupwise/soap/CMakeLists.txt +++ b/kresources/groupwise/soap/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/groupwise/soap/Makefile.am b/kresources/groupwise/soap/Makefile.am index 638b0ba4..8ea5074e 100644 --- a/kresources/groupwise/soap/Makefile.am +++ b/kresources/groupwise/soap/Makefile.am @@ -8,7 +8,7 @@ check_PROGRAMS = soapdebug soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor soapdebug_LDADD = libgwsoap.la -lkdecore \ $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la soapdebug_SOURCES = soapdebug.cpp lib_LTLIBRARIES = libgwsoap.la @@ -17,7 +17,7 @@ libgwsoap_la_SOURCES = contactconverter.cpp gwconverter.cpp incidenceconverter.c groupwiseserver.cpp gwjobs.cpp ksslsocket.cpp \ soapC.cpp soapClient.cpp stdsoap2.cpp libgwsoap_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined -libgwsoap_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la +libgwsoap_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la # the following rule does: # make a header file from the wsdl diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 7703fdc6..d13e5cd8 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -25,7 +25,7 @@ #include <libkcal/calendar.h> #include <libkcal/incidence.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <kabc/addressee.h> #include <kabc/addresseelist.h> diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp index 3cd61f60..4e848b7e 100644 --- a/kresources/groupwise/soap/gwconverter.cpp +++ b/kresources/groupwise/soap/gwconverter.cpp @@ -20,7 +20,7 @@ #include "gwconverter.h" -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <kdebug.h> diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp index 7888ff50..85143da3 100644 --- a/kresources/groupwise/soap/incidenceconverter.cpp +++ b/kresources/groupwise/soap/incidenceconverter.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kmdcodec.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <libkcal/event.h> #include <libkcal/journal.h> #include <libkcal/recurrence.h> diff --git a/kresources/kolab/kabc/CMakeLists.txt b/kresources/kolab/kabc/CMakeLists.txt index f79d31f6..e1d3bd40 100644 --- a/kresources/kolab/kabc/CMakeLists.txt +++ b/kresources/kolab/kabc/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../shared ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp index b75355f5..7a26f62f 100644 --- a/kresources/kolab/kabc/contact.cpp +++ b/kresources/kolab/kabc/contact.cpp @@ -36,7 +36,7 @@ #include <kabc/addressee.h> #include <kabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> -#include <libkdepim/distributionlist.h> +#include <libtdepim/distributionlist.h> #include <kio/netaccess.h> #include <kdebug.h> #include <tqfile.h> diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h index a3c8a9c3..c6a27b6b 100644 --- a/kresources/kolab/kabc/resourcekolab.h +++ b/kresources/kolab/kabc/resourcekolab.h @@ -33,7 +33,7 @@ #ifndef KABC_RESOURCEKOLAB_H #define KABC_RESOURCEKOLAB_H -#include <libkdepim/resourceabc.h> +#include <libtdepim/resourceabc.h> #include <dcopobject.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" diff --git a/kresources/kolab/kcal/CMakeLists.txt b/kresources/kolab/kcal/CMakeLists.txt index aab6d324..70750ed1 100644 --- a/kresources/kolab/kcal/CMakeLists.txt +++ b/kresources/kolab/kcal/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../shared ${CMAKE_CURRENT_SOURCE_DIR}/../kcal ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/kolab/kcal/Makefile.am b/kresources/kolab/kcal/Makefile.am index bc0af8dd..4b0193ba 100644 --- a/kresources/kolab/kcal/Makefile.am +++ b/kresources/kolab/kcal/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \ - -I$(top_builddir)/libkdepim $(all_includes) + -I$(top_builddir)/libtdepim $(all_includes) # The kolab wizard links to this library too lib_LTLIBRARIES = libkcalkolab.la diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp index 04db68a6..e0ea6d16 100644 --- a/kresources/kolab/kcal/resourcekolab.cpp +++ b/kresources/kolab/kcal/resourcekolab.cpp @@ -41,7 +41,7 @@ #include <kio/uiserver_stub.h> #include <kapplication.h> #include <dcopclient.h> -#include <libkdepim/kincidencechooser.h> +#include <libtdepim/kincidencechooser.h> #include <kabc/locknull.h> #include <kmainwindow.h> #include <klocale.h> diff --git a/kresources/kolab/knotes/CMakeLists.txt b/kresources/kolab/knotes/CMakeLists.txt index 2f33b214..273dc0cc 100644 --- a/kresources/kolab/knotes/CMakeLists.txt +++ b/kresources/kolab/knotes/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../shared ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/knotes - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/kolab/knotes/Makefile.am b/kresources/kolab/knotes/Makefile.am index de4ff1dd..0315f336 100644 --- a/kresources/kolab/knotes/Makefile.am +++ b/kresources/kolab/knotes/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/kresources/kolab/shared \ - -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libkdepim $(all_includes) + -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes) # The kolab wizard links to this library too lib_LTLIBRARIES = libknoteskolab.la diff --git a/kresources/kolab/shared/CMakeLists.txt b/kresources/kolab/shared/CMakeLists.txt index 6389f4db..e714eec5 100644 --- a/kresources/kolab/shared/CMakeLists.txt +++ b/kresources/kolab/shared/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/kresources/lib - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/kolab/shared/Makefile.am b/kresources/kolab/shared/Makefile.am index f75af881..7ecc333a 100644 --- a/kresources/kolab/shared/Makefile.am +++ b/kresources/kolab/shared/Makefile.am @@ -9,7 +9,7 @@ libresourcekolabshared_la_SOURCES = \ subresource.cpp \ kmailconnection.skel kmailicalIface.stub libresourcekolabshared_la_METASOURCES = AUTO -libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwarebase.la +libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la ../../lib/libkgroupwarebase.la libresourcekolabshared_la_LDFLAGS = -no-undefined kmailicalIface_DCOPIDLNG = true diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp index 3341ee35..09ec2cd6 100644 --- a/kresources/kolab/shared/kolabbase.cpp +++ b/kresources/kolab/shared/kolabbase.cpp @@ -35,7 +35,7 @@ #include <kabc/addressee.h> #include <libkcal/journal.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <libemailfunctions/email.h> #include <kdebug.h> #include <tqfile.h> diff --git a/kresources/lib/CMakeLists.txt b/kresources/lib/CMakeLists.txt index 56b1177b..3d1753b2 100644 --- a/kresources/lib/CMakeLists.txt +++ b/kresources/lib/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am index 0a4d3e37..0fb1dd85 100644 --- a/kresources/lib/Makefile.am +++ b/kresources/lib/Makefile.am @@ -11,13 +11,13 @@ libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview. kcal_cachesettingsdlg.cpp libkgroupwarebase_la_LDFLAGS = $(all_libraries) -no-undefined libkgroupwarebase_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkgroupwaredav_la_SOURCES = davcalendaradaptor.cpp davaddressbookadaptor.cpp webdavhandler.cpp \ davgroupwareglobals.cpp libkgroupwaredav_la_LDFLAGS = $(all_libraries) -no-undefined libkgroupwaredav_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la libkgroupwarebase.la + $(top_builddir)/libtdepim/libtdepim.la libkgroupwarebase.la METASOURCES = AUTO diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp index 80da3942..626867c7 100644 --- a/kresources/lib/addressbookadaptor.cpp +++ b/kresources/lib/addressbookadaptor.cpp @@ -25,7 +25,7 @@ #include <kabc/addressee.h> #include <kabc/vcardconverter.h> -#include <libkdepim/kabcresourcecached.h> +#include <libtdepim/kabcresourcecached.h> #include <kio/job.h> diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp index f363dbc2..e3756ebb 100644 --- a/kresources/lib/groupwaredownloadjob.cpp +++ b/kresources/lib/groupwaredownloadjob.cpp @@ -31,7 +31,7 @@ #include <kurl.h> #include <kio/job.h> #include <libemailfunctions/idmapper.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> using namespace KPIM; diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp index cde428d0..4714a7f9 100644 --- a/kresources/lib/groupwareuploadjob.cpp +++ b/kresources/lib/groupwareuploadjob.cpp @@ -27,7 +27,7 @@ #include "groupwaredataadaptor.h" #include <libemailfunctions/idmapper.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <kdebug.h> #include <kurl.h> diff --git a/kresources/lib/kresources_groupwareprefs.kcfgc b/kresources/lib/kresources_groupwareprefs.kcfgc index d67149d5..178dc9ac 100644 --- a/kresources/lib/kresources_groupwareprefs.kcfgc +++ b/kresources/lib/kresources_groupwareprefs.kcfgc @@ -1,7 +1,7 @@ ClassName=GroupwarePrefsBase File=kresources_groupwareprefs.kcfg GlobalEnums=false -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h Inherits=KResourcePrefs Mutators=true NameSpace=KPIM diff --git a/kresources/newexchange/CMakeLists.txt b/kresources/newexchange/CMakeLists.txt index 325daa72..23e1f958 100644 --- a/kresources/newexchange/CMakeLists.txt +++ b/kresources/newexchange/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../lib ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/newexchange/Makefile.am b/kresources/newexchange/Makefile.am index 317e9863..b4d4a9b4 100644 --- a/kresources/newexchange/Makefile.am +++ b/kresources/newexchange/Makefile.am @@ -11,7 +11,7 @@ libkcal_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_newexchange_la_LIBADD = \ libknewexchange.la ../lib/libkgroupwaredav.la \ - $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \ -lkabc libkabc_newexchange_la_SOURCES = kabc_resourceexchange.cpp exchangeaddressbookadaptor.cpp @@ -19,7 +19,7 @@ libkabc_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkabc_newexchange_la_LIBADD = \ libknewexchange.la ../lib/libkgroupwaredav.la \ - $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la \ + $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \ -lkabc kde_module_LTLIBRARIES = kcal_newexchange.la kabc_newexchange.la diff --git a/kresources/remote/CMakeLists.txt b/kresources/remote/CMakeLists.txt index f1c4d874..19dfcb7b 100644 --- a/kresources/remote/CMakeLists.txt +++ b/kresources/remote/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/remote/Makefile.am b/kresources/remote/Makefile.am index 52a45e8b..a2dfe4f6 100644 --- a/kresources/remote/Makefile.am +++ b/kresources/remote/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkcal_resourceremote.la libkcal_resourceremote_la_LDFLAGS = $(all_libraries) -no-undefined \ -version-info 1:0:0 libkcal_resourceremote_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkcal_resourceremote_la_SOURCES = resourceremote.cpp resourceremoteconfig.cpp kde_module_LTLIBRARIES = kcal_remote.la @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kcal_remote.la kcal_remote_la_SOURCES = resourceremote_plugin.cpp kcal_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_remote_la_LIBADD = libkcal_resourceremote.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkcalincludedir = $(includedir)/libkcal libkcalinclude_HEADERS = resourceremoteconfig.h resourceremote.h diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h index 096a07de..255fa687 100644 --- a/kresources/remote/resourceremote.h +++ b/kresources/remote/resourceremote.h @@ -30,7 +30,7 @@ #include <kdirwatch.h> #include <kdepimmacros.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <libkcal/incidence.h> #include <libkcal/calendarlocal.h> diff --git a/kresources/scalix/kabc/CMakeLists.txt b/kresources/scalix/kabc/CMakeLists.txt index 3663fc04..c900f92b 100644 --- a/kresources/scalix/kabc/CMakeLists.txt +++ b/kresources/scalix/kabc/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp index f9a02d44..762d4b9f 100644 --- a/kresources/scalix/kabc/contact.cpp +++ b/kresources/scalix/kabc/contact.cpp @@ -20,7 +20,7 @@ #include <tqdom.h> -#include <libkdepim/distributionlist.h> +#include <libtdepim/distributionlist.h> #include <kstaticdeleter.h> #include "contact.h" diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index b7dd6d5e..9693b525 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -34,7 +34,7 @@ #ifndef KABC_RESOURCESCALIX_H #define KABC_RESOURCESCALIX_H -#include <libkdepim/resourceabc.h> +#include <libtdepim/resourceabc.h> #include <dcopobject.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" diff --git a/kresources/scalix/kcal/CMakeLists.txt b/kresources/scalix/kcal/CMakeLists.txt index 26b0d79b..40d56921 100644 --- a/kresources/scalix/kcal/CMakeLists.txt +++ b/kresources/scalix/kcal/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/scalix/kcal/Makefile.am b/kresources/scalix/kcal/Makefile.am index 060c5c00..c124e48d 100644 --- a/kresources/scalix/kcal/Makefile.am +++ b/kresources/scalix/kcal/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/kresources/scalix/shared -I$(top_srcdir) \ - -I$(top_builddir)/libkdepim $(all_includes) + -I$(top_builddir)/libtdepim $(all_includes) # The scalix wizard links to this library too lib_LTLIBRARIES = libkcalscalix.la diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index 2848a353..645c5b88 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <dcopclient.h> #include <libkcal/icalformat.h> -#include <libkdepim/kincidencechooser.h> +#include <libtdepim/kincidencechooser.h> #include <kabc/locknull.h> #include <kmainwindow.h> #include <klocale.h> diff --git a/kresources/scalix/kioslave/CMakeLists.txt b/kresources/scalix/kioslave/CMakeLists.txt index 43011df7..f210891f 100644 --- a/kresources/scalix/kioslave/CMakeLists.txt +++ b/kresources/scalix/kioslave/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/scalix/kioslave/Makefile.am b/kresources/scalix/kioslave/Makefile.am index 8396c498..5607fb9d 100644 --- a/kresources/scalix/kioslave/Makefile.am +++ b/kresources/scalix/kioslave/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libkdepim $(all_includes) +INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libtdepim $(all_includes) noinst_HEADERS = scalix.h @@ -10,7 +10,7 @@ kdelnk_DATA = scalix.protocol scalixs.protocol kde_module_LTLIBRARIES = kio_scalix.la kio_scalix_la_SOURCES = scalix.cpp -kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) +kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp diff --git a/kresources/scalix/knotes/CMakeLists.txt b/kresources/scalix/knotes/CMakeLists.txt index a363b738..516690e0 100644 --- a/kresources/scalix/knotes/CMakeLists.txt +++ b/kresources/scalix/knotes/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/knotes - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/scalix/knotes/Makefile.am b/kresources/scalix/knotes/Makefile.am index 42a1c230..f04c0394 100644 --- a/kresources/scalix/knotes/Makefile.am +++ b/kresources/scalix/knotes/Makefile.am @@ -1,7 +1,7 @@ METASOURCES = AUTO INCLUDES = -I$(top_srcdir)/kresources/scalix/shared \ - -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libkdepim $(all_includes) + -I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes) # The scalix wizard links to this library too lib_LTLIBRARIES = libknotesscalix.la diff --git a/kresources/scalix/shared/CMakeLists.txt b/kresources/scalix/shared/CMakeLists.txt index 6f116d2f..28ede16e 100644 --- a/kresources/scalix/shared/CMakeLists.txt +++ b/kresources/scalix/shared/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../lib ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/scalix/shared/Makefile.am b/kresources/scalix/shared/Makefile.am index 4aaa9304..18bcbc0d 100644 --- a/kresources/scalix/shared/Makefile.am +++ b/kresources/scalix/shared/Makefile.am @@ -9,7 +9,7 @@ libresourcescalixshared_la_SOURCES = \ subresource.cpp \ kmailconnection.skel kmailicalIface.stub libresourcescalixshared_la_METASOURCES = AUTO -libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwaredav.la +libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la ../../lib/libkgroupwaredav.la libresourcescalixshared_la_LDFLAGS = -no-undefined kmailicalIface_DCOPIDLNG = true diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp index 33789903..5a23623b 100644 --- a/kresources/scalix/shared/scalixbase.cpp +++ b/kresources/scalix/shared/scalixbase.cpp @@ -34,7 +34,7 @@ #include <kabc/addressee.h> #include <libkcal/journal.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <kdebug.h> #include <tqfile.h> diff --git a/kresources/slox/CMakeLists.txt b/kresources/slox/CMakeLists.txt index c1f0b6e4..045e5fa9 100644 --- a/kresources/slox/CMakeLists.txt +++ b/kresources/slox/CMakeLists.txt @@ -13,7 +13,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/libkdepim + ${CMAKE_SOURCE_DIR}/libtdepim ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/kresources/slox/Makefile.am b/kresources/slox/Makefile.am index 584a2f33..97da1340 100644 --- a/kresources/slox/Makefile.am +++ b/kresources/slox/Makefile.am @@ -8,7 +8,7 @@ libkslox_la_SOURCES = sloxaccounts.cpp webdavhandler.cpp \ sloxfolderdialog.cpp sloxbase.cpp libkslox_la_LDFLAGS = $(all_libraries) libkslox_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la libkcal_slox_la_SOURCES = kcalresourceslox.cpp kcalresourcesloxconfig.cpp \ kcalsloxprefs.kcfgc diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp index 36b6cc99..d45ead3e 100644 --- a/kresources/slox/kabcresourceslox.cpp +++ b/kresources/slox/kabcresourceslox.cpp @@ -28,8 +28,8 @@ #include <kmdcodec.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <libkdepim/kpimprefs.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/kpimprefs.h> +#include <libtdepim/progressmanager.h> #include <kio/davjob.h> #include "webdavhandler.h" diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h index 98be4bd5..605c8dea 100644 --- a/kresources/slox/kabcresourceslox.h +++ b/kresources/slox/kabcresourceslox.h @@ -23,7 +23,7 @@ #include "sloxbase.h" #include "webdavhandler.h" -#include <libkdepim/kabcresourcecached.h> +#include <libtdepim/kabcresourcecached.h> #include <kdepimmacros.h> #include <kabc/addressee.h> diff --git a/kresources/slox/kabcsloxprefs.kcfgc b/kresources/slox/kabcsloxprefs.kcfgc index 50c7cbbb..5e5d8969 100644 --- a/kresources/slox/kabcsloxprefs.kcfgc +++ b/kresources/slox/kabcsloxprefs.kcfgc @@ -5,7 +5,7 @@ NameSpace=KABC Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp index b2c24b8a..d3a87c16 100644 --- a/kresources/slox/kcalresourceslox.cpp +++ b/kresources/slox/kcalresourceslox.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <libkcal/vcaldrag.h> #include <libkcal/vcalformat.h> diff --git a/kresources/slox/kcalsloxprefs.kcfgc b/kresources/slox/kcalsloxprefs.kcfgc index 0c1bff26..11bbd60a 100644 --- a/kresources/slox/kcalsloxprefs.kcfgc +++ b/kresources/slox/kcalsloxprefs.kcfgc @@ -5,7 +5,7 @@ NameSpace=KCal Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true #ItemAccessors=true #SetUserTexts=true diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp index 4bd588c4..1758c09e 100644 --- a/kresources/slox/webdavhandler.cpp +++ b/kresources/slox/webdavhandler.cpp @@ -34,7 +34,7 @@ #include <libkcal/incidence.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <kdebug.h> #include <kconfig.h> diff --git a/kresources/tvanytime/Makefile.am b/kresources/tvanytime/Makefile.am index 20792640..49bda135 100644 --- a/kresources/tvanytime/Makefile.am +++ b/kresources/tvanytime/Makefile.am @@ -8,7 +8,7 @@ libkcal_tvanytime_la_SOURCES = kcal_resourcetvanytime.cpp \ libkcal_tvanytime_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined libkcal_tvanytime_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ - $(top_builddir)/libkdepim/libkdepim.la + $(top_builddir)/libtdepim/libtdepim.la kde_module_LTLIBRARIES = kcal_tvanytime.la diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp index 6ee6dd1c..81461d64 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.cpp +++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp @@ -28,7 +28,7 @@ #include <libkcal/calendarlocal.h> #include <libkcal/confirmsavedialog.h> -#include <libkdepim/kpimprefs.h> +#include <libtdepim/kpimprefs.h> #include <tqapplication.h> #include <tqdom.h> diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h index a43e759c..ea165082 100644 --- a/kresources/tvanytime/kcal_resourcetvanytime.h +++ b/kresources/tvanytime/kcal_resourcetvanytime.h @@ -23,7 +23,7 @@ #include <tqtimer.h> -#include <libkdepim/progressmanager.h> +#include <libtdepim/progressmanager.h> #include <libkcal/resourcecached.h> diff --git a/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc b/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc index 7210fb57..b2d850ff 100644 --- a/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc +++ b/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc @@ -5,7 +5,7 @@ NameSpace=KCal Singleton=false Mutators=true Inherits=KResourcePrefs -IncludeFiles=libkdepim/kresourceprefs.h +IncludeFiles=libtdepim/kresourceprefs.h GlobalEnums=true ItemAccessors=true SetUserTexts=true |