diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 02:31:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-17 02:31:40 -0600 |
| commit | 513d0163e99d4447deb274b9f0799bb390f26cfc (patch) | |
| tree | 7686847bc46ef657e8d278a4a342e21d0a1edb80 | |
| parent | 10251f9a2a51f37c2a42833c1d05cd5a8fdf6bb5 (diff) | |
| download | tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.tar.gz tdepim-513d0163e99d4447deb274b9f0799bb390f26cfc.zip | |
Fix FTBFS
56 files changed, 223 insertions, 223 deletions
diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt index fad0df465..430d3694a 100644 --- a/kaddressbook/CMakeLists.txt +++ b/kaddressbook/CMakeLists.txt @@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC LINK kabcommon-static kabim-static printer-static kabinterfaces-shared - tdepim-shared kabc_file-shared tdeprint-shared tdeutils-shared + tdepim-shared tdeabc_file-shared tdeprint-shared tdeutils-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index 51d92dd25..2a8850eeb 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -45,7 +45,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la \ - -lkabc_file $(LIB_KABC) $(LIB_TDEHTML) \ + -ltdeabc_file $(LIB_KABC) $(LIB_TDEHTML) \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ $(top_builddir)/kaddressbook/editors/libkabim.la \ -ltdeprint diff --git a/tderesources/carddav/CMakeLists.txt b/tderesources/carddav/CMakeLists.txt index 491ea2ae9..11e139a2e 100644 --- a/tderesources/carddav/CMakeLists.txt +++ b/tderesources/carddav/CMakeLists.txt @@ -29,22 +29,22 @@ link_directories( ##### other data ################################ install( - FILES kabc_carddav.desktop + FILES tdeabc_carddav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_carddav (module) ##################### +##### tdeabc_carddav (module) ##################### -tde_add_kpart( kabc_carddav AUTOMOC +tde_add_kpart( tdeabc_carddav AUTOMOC SOURCES plugin.cpp - LINK kabc_carddav-shared + LINK tdeabc_carddav-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kabc_carddav (shared) ##################### +##### tdeabc_carddav (shared) ##################### -tde_add_library( kabc_carddav SHARED AUTOMOC +tde_add_library( tdeabc_carddav SHARED AUTOMOC SOURCES resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp reader.cpp writer.cpp prefsskel.kcfgc diff --git a/tderesources/carddav/Makefile.am b/tderesources/carddav/Makefile.am index 3b47f2abb..ff63306dc 100644 --- a/tderesources/carddav/Makefile.am +++ b/tderesources/carddav/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = libkabc_carddav.la +lib_LTLIBRARIES = libtdeabc_carddav.la -libkabc_carddav_la_SOURCES = resource.cpp \ +libtdeabc_carddav_la_SOURCES = resource.cpp \ config.cpp \ configwidgets.cpp \ preferences.cpp \ @@ -10,24 +10,24 @@ libkabc_carddav_la_SOURCES = resource.cpp \ reader.cpp \ writer.cpp \ prefsskel.kcfgc -libkabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ +libtdeabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkabc_carddav_la_LIBADD = \ +libtdeabc_carddav_la_LIBADD = \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la \ -lkabc \ -lcarddav -libkabc_carddav_la_COMPILE_FIRST = prefsskel.h +libtdeabc_carddav_la_COMPILE_FIRST = prefsskel.h -kde_module_LTLIBRARIES = kabc_carddav.la +kde_module_LTLIBRARIES = tdeabc_carddav.la -kabc_carddav_la_SOURCES = plugin.cpp -kabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) -kabc_carddav_la_LIBADD = libkabc_carddav.la -kabc_carddav_la_COMPILE_FIRST = prefsskel.h +tdeabc_carddav_la_SOURCES = plugin.cpp +tdeabc_carddav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) +tdeabc_carddav_la_LIBADD = libtdeabc_carddav.la +tdeabc_carddav_la_COMPILE_FIRST = prefsskel.h -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_carddav.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_carddav.desktop METASOURCES = AUTO diff --git a/tderesources/carddav/tdeabc_carddav.desktop b/tderesources/carddav/tdeabc_carddav.desktop index 585d11b36..6be73bd00 100644 --- a/tderesources/carddav/tdeabc_carddav.desktop +++ b/tderesources/carddav/tdeabc_carddav.desktop @@ -45,7 +45,7 @@ Name[tr]=CardDAV Sunucusu (ör. Zimbra Contacts) Name[uk]=Сервер CardDAV (напр., Zimbra Contacts) Name[zh_CN]=CardDAV 服务器(如 Zimbra Contacts) Name[zh_TW]=CardDAV 伺服器 (如: Zimbra Contacts) -X-TDE-Library=kabc_carddav +X-TDE-Library=tdeabc_carddav Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/egroupware/CMakeLists.txt b/tderesources/egroupware/CMakeLists.txt index 294b10673..11fe32a80 100644 --- a/tderesources/egroupware/CMakeLists.txt +++ b/tderesources/egroupware/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### headers ################################### install( FILES - kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h + tdeabc_resourcexmlrpc.h kcal_resourcexmlrpc.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc ) ##### other data ################################ -install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +install( FILES tdeabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) @@ -46,12 +46,12 @@ tde_add_library( egwcommon STATIC_PIC AUTOMOC ) -##### kabc_xmlrpc (shared) ###################### +##### tdeabc_xmlrpc (shared) ###################### -tde_add_library( kabc_xmlrpc SHARED AUTOMOC +tde_add_library( tdeabc_xmlrpc SHARED AUTOMOC SOURCES - kabc_resourcexmlrpc.cpp kabc_resourcexmlrpcconfig.cpp - kabc_egroupwareprefs.kcfgc + tdeabc_resourcexmlrpc.cpp tdeabc_resourcexmlrpcconfig.cpp + tdeabc_egroupwareprefs.kcfgc VERSION 1.0.0 LINK egwcommon-static kabcommon-static tdepim-shared DESTINATION ${LIB_INSTALL_DIR} @@ -82,11 +82,11 @@ tde_add_library( knotes_xmlrpc SHARED AUTOMOC ) -##### kabc_xmlrpc (module) ###################### +##### tdeabc_xmlrpc (module) ###################### -tde_add_kpart( kabc_xmlrpc AUTOMOC - SOURCES kabc_resourcexmlrpcplugin.cpp - LINK kabc_xmlrpc-shared +tde_add_kpart( tdeabc_xmlrpc AUTOMOC + SOURCES tdeabc_resourcexmlrpcplugin.cpp + LINK tdeabc_xmlrpc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tderesources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am index b3b7206ca..c76442b79 100644 --- a/tderesources/egroupware/Makefile.am +++ b/tderesources/egroupware/Makefile.am @@ -10,17 +10,17 @@ INCLUDES = -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/tderesources/egroupware \ $(all_includes) -noinst_HEADERS = kabc_resourcexmlrpcconfig.h kcal_resourcexmlrpcconfig.h \ +noinst_HEADERS = tdeabc_resourcexmlrpcconfig.h kcal_resourcexmlrpcconfig.h \ knotes_resourcexmlrpcconfig.h noinst_LTLIBRARIES = libegwcommon.la libegwcommon_la_SOURCES = xmlrpciface.cpp synchronizer.cpp debugdialog.cpp -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)/libtdepim/libtdepim.la \ +lib_LTLIBRARIES = libtdeabc_xmlrpc.la libkcal_xmlrpc.la libknotes_xmlrpc.la +libtdeabc_xmlrpc_la_SOURCES = tdeabc_resourcexmlrpc.cpp tdeabc_resourcexmlrpcconfig.cpp \ + tdeabc_egroupwareprefs.kcfgc +libtdeabc_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined +libtdeabc_xmlrpc_la_LIBADD = $(LIB_KIO) -lkabc $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ libegwcommon.la @@ -40,13 +40,13 @@ libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \ libegwcommon.la kabcincludedir = $(includedir)/tdeabc -kabcinclude_HEADERS = kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h +kabcinclude_HEADERS = tdeabc_resourcexmlrpc.h kcal_resourcexmlrpc.h -kde_module_LTLIBRARIES = kabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la +kde_module_LTLIBRARIES = tdeabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la -kabc_xmlrpc_la_SOURCES = kabc_resourcexmlrpcplugin.cpp -kabc_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_xmlrpc_la_LIBADD = libkabc_xmlrpc.la +tdeabc_xmlrpc_la_SOURCES = tdeabc_resourcexmlrpcplugin.cpp +tdeabc_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_xmlrpc_la_LIBADD = libtdeabc_xmlrpc.la kcal_xmlrpc_la_SOURCES = kcal_resourcexmlrpcplugin.cpp kcal_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) @@ -56,8 +56,8 @@ knotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpcplugin.cpp knotes_xmlrpc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) knotes_xmlrpc_la_LIBADD = libknotes_xmlrpc.la -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_xmlrpc.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_xmlrpc.desktop kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_xmlrpc.desktop @@ -70,4 +70,4 @@ METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kres_xmlrpc.pot -kabc_resourcexmlrpc.lo: ../../kaddressbook/common/kabprefs_base.h +tdeabc_resourcexmlrpc.lo: ../../kaddressbook/common/kabprefs_base.h diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index 587ebc84d..7c5911d87 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -31,9 +31,9 @@ #include <libkcal/freebusyurlstore.h> #include <libtdepim/kpimprefs.h> -#include "kabc_egroupwareprefs.h" -#include "kabc_resourcexmlrpc.h" -#include "kabc_resourcexmlrpcconfig.h" +#include "tdeabc_egroupwareprefs.h" +#include "tdeabc_resourcexmlrpc.h" +#include "tdeabc_resourcexmlrpcconfig.h" #include "access.h" #include "synchronizer.h" @@ -771,4 +771,4 @@ void ResourceXMLRPC::loadCustomFieldsFinished( const TQValueList<TQVariant> &map mCustomFieldsMap.insert( it.key(), it.data().toString() ); } -#include "kabc_resourcexmlrpc.moc" +#include "tdeabc_resourcexmlrpc.moc" diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp index 03665e75d..60cbb83e9 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp @@ -27,9 +27,9 @@ #include <klineedit.h> #include <kurlrequester.h> -#include "kabc_egroupwareprefs.h" -#include "kabc_resourcexmlrpc.h" -#include "kabc_resourcexmlrpcconfig.h" +#include "tdeabc_egroupwareprefs.h" +#include "tdeabc_resourcexmlrpc.h" +#include "tdeabc_resourcexmlrpcconfig.h" using namespace KABC; @@ -94,4 +94,4 @@ void ResourceXMLRPCConfig::saveSettings( KRES::Resource *res ) resource->prefs()->setPassword( mPassword->text() ); } -#include "kabc_resourcexmlrpcconfig.moc" +#include "tdeabc_resourcexmlrpcconfig.moc" diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp index e1f25bdcb..004c6a403 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#include "kabc_resourcexmlrpc.h" -#include "kabc_resourcexmlrpcconfig.h" +#include "tdeabc_resourcexmlrpc.h" +#include "tdeabc_resourcexmlrpcconfig.h" #include <tdeglobal.h> #include <tdelocale.h> @@ -28,7 +28,7 @@ using namespace KABC; typedef KRES::PluginFactory< ResourceXMLRPC, ResourceXMLRPCConfig > XMLRPCFactory; -// FIXME: Use K_EXPORT_COMPONENT_FACTORY( kabc_xmlrpc, XMLRPCFactory ); here +// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_xmlrpc, XMLRPCFactory ); here // Problem: How to insert the catalogue! extern "C" { diff --git a/tderesources/egroupware/tdeabc_xmlrpc.desktop b/tderesources/egroupware/tdeabc_xmlrpc.desktop index 6eeb94f33..d1bd5c687 100644 --- a/tderesources/egroupware/tdeabc_xmlrpc.desktop +++ b/tderesources/egroupware/tdeabc_xmlrpc.desktop @@ -43,7 +43,7 @@ Name[tr]=eGroupware Sunucusu (XML-RPC ile) Name[uk]=Сервер eGroupware (через XML-RPC) Name[zh_CN]=eGroupware 服务器(通过 XML-RPC) Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC) -X-TDE-Library=kabc_xmlrpc +X-TDE-Library=tdeabc_xmlrpc Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/groupdav/CMakeLists.txt b/tderesources/groupdav/CMakeLists.txt index f85244b34..13e314b9b 100644 --- a/tderesources/groupdav/CMakeLists.txt +++ b/tderesources/groupdav/CMakeLists.txt @@ -28,8 +28,8 @@ link_directories( install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal RENAME kcal_opengroupware.desktop ) -install( FILES kabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME kabc_opengroupware.desktop) +install( FILES tdeabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME tdeabc_opengroupware.desktop) ##### kcal_groupdav (module) #################### @@ -41,11 +41,11 @@ tde_add_kpart( kcal_groupdav AUTOMOC ) -##### kabc_groupdav (module) #################### +##### tdeabc_groupdav (module) #################### -tde_add_kpart( kabc_groupdav AUTOMOC - SOURCES kabc_resourcegroupdav_plugin.cpp - LINK kabc_groupdav-shared +tde_add_kpart( tdeabc_groupdav AUTOMOC + SOURCES tdeabc_resourcegroupdav_plugin.cpp + LINK tdeabc_groupdav-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -67,10 +67,10 @@ tde_add_library( kcal_groupdav SHARED AUTOMOC ) -##### kabc_groupdav (shared) #################### +##### tdeabc_groupdav (shared) #################### -tde_add_library( kabc_groupdav SHARED AUTOMOC - SOURCES kabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp +tde_add_library( tdeabc_groupdav SHARED AUTOMOC + SOURCES tdeabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp VERSION 1.0.0 LINK kgroupdav-static kgroupwaredav-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am index 3b04b2fbd..1511e4f66 100644 --- a/tderesources/groupdav/Makefile.am +++ b/tderesources/groupdav/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib \ -I../lib $(all_includes) -lib_LTLIBRARIES = libkcal_groupdav.la libkabc_groupdav.la +lib_LTLIBRARIES = libkcal_groupdav.la libtdeabc_groupdav.la noinst_LTLIBRARIES = libkgroupdav.la libkgroupdav_la_SOURCES = groupdavglobals.cpp @@ -13,29 +13,29 @@ libkcal_groupdav_la_LIBADD = \ libkgroupdav.la ../lib/libkgroupwaredav.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) \ +libtdeabc_groupdav_la_SOURCES = tdeabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp +libtdeabc_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkabc_groupdav_la_LIBADD = \ +libtdeabc_groupdav_la_LIBADD = \ libkgroupdav.la ../lib/libkgroupwaredav.la \ $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \ -lkabc -kde_module_LTLIBRARIES = kcal_groupdav.la kabc_groupdav.la +kde_module_LTLIBRARIES = kcal_groupdav.la tdeabc_groupdav.la kcal_groupdav_la_SOURCES = kcal_resourcegroupdav_plugin.cpp kcal_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) kcal_groupdav_la_LIBADD = libkcal_groupdav.la -kabc_groupdav_la_SOURCES = kabc_resourcegroupdav_plugin.cpp -kabc_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) -kabc_groupdav_la_LIBADD = libkabc_groupdav.la +tdeabc_groupdav_la_SOURCES = tdeabc_resourcegroupdav_plugin.cpp +tdeabc_groupdav_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) +tdeabc_groupdav_la_LIBADD = libtdeabc_groupdav.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupdav.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_groupdav.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_groupdav.desktop METASOURCES = AUTO @@ -48,5 +48,5 @@ install-data-local: uninstall.desktop messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kres_groupdav.pot -kabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h +tdeabc_resourcegroupdav.lo: ../lib/tderesources_groupwareprefs.h diff --git a/tderesources/groupdav/tdeabc_groupdav.desktop b/tderesources/groupdav/tdeabc_groupdav.desktop index c10ea97c2..d08edf5ea 100644 --- a/tderesources/groupdav/tdeabc_groupdav.desktop +++ b/tderesources/groupdav/tdeabc_groupdav.desktop @@ -45,7 +45,7 @@ Name[tr]=GroupDAV Sunucusu (ör. OpenGroupware) Name[uk]=Сервер GroupDAV (напр., OpenGroupware) Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware) Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware) -X-TDE-Library=kabc_groupdav +X-TDE-Library=tdeabc_groupdav Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp index 1f50e04bb..e74b4d2c8 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.cpp +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp @@ -23,7 +23,7 @@ #include "groupdavaddressbookadaptor.h" #include "tderesources_groupwareprefs.h" -#include "kabc_resourcegroupdav.h" +#include "tdeabc_resourcegroupdav.h" using namespace KABC; @@ -44,4 +44,4 @@ void ResourceGroupDav::init() ResourceGroupwareBase::init(); } -#include "kabc_resourcegroupdav.moc" +#include "tdeabc_resourcegroupdav.moc" diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index ca7ed96d3..51f40856f 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -22,7 +22,7 @@ #ifndef KABC_RESOURCEGROUPDAV_H #define KABC_RESOURCEGROUPDAV_H -#include "kabc_resourcegroupwarebase.h" +#include "tdeabc_resourcegroupwarebase.h" #include <tdepimmacros.h> namespace KABC { diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp index 1ef588dfd..b877231d7 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp +++ b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupdav.h" -#include "kabc_resourcegroupwarebaseconfig.h" +#include "tdeabc_resourcegroupdav.h" +#include "tdeabc_resourcegroupwarebaseconfig.h" #include <tdeglobal.h> #include <tdelocale.h> @@ -29,7 +29,7 @@ using namespace KABC; typedef KRES::PluginFactory< ResourceGroupDav, ResourceGroupwareBaseConfig > GroupDavFactory; -// FIXME: Use K_EXPORT_COMPONENT_FACTORY( kabc_groupdav, GroupDavFactory ); here +// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_groupdav, GroupDavFactory ); here // Problem: How do I insert the catalogue??? extern "C" { diff --git a/tderesources/groupware/Makefile.am b/tderesources/groupware/Makefile.am index 35138a0db..38f5083dc 100644 --- a/tderesources/groupware/Makefile.am +++ b/tderesources/groupware/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = libkcal_groupware.la libkabc_groupware.la +lib_LTLIBRARIES = libkcal_groupware.la libtdeabc_groupware.la libkcal_groupware_la_SOURCES = kcal_resourcegroupware.cpp \ kcal_resourcegroupwareconfig.cpp \ @@ -11,30 +11,30 @@ libkcal_groupware_la_LIBADD = \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la -libkabc_groupware_la_SOURCES = kabc_resourcegroupware.cpp \ - kabc_resourcegroupwareconfig.cpp \ - kabc_groupwareprefs.kcfgc -libkabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ +libtdeabc_groupware_la_SOURCES = tdeabc_resourcegroupware.cpp \ + tdeabc_resourcegroupwareconfig.cpp \ + tdeabc_groupwareprefs.kcfgc +libtdeabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ +libtdeabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ -lkabc -kde_module_LTLIBRARIES = kcal_groupware.la kabc_groupware.la +kde_module_LTLIBRARIES = kcal_groupware.la tdeabc_groupware.la kcal_groupware_la_SOURCES = kcal_resourcegroupware_plugin.cpp kcal_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_groupware_la_LIBADD = libkcal_groupware.la -kabc_groupware_la_SOURCES = kabc_resourcegroupware_plugin.cpp -kabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_groupware_la_LIBADD = libkabc_groupware.la +tdeabc_groupware_la_SOURCES = tdeabc_resourcegroupware_plugin.cpp +tdeabc_groupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_groupware_la_LIBADD = libtdeabc_groupware.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupware.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_groupware.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_groupware.desktop METASOURCES = AUTO diff --git a/tderesources/groupware/tdeabc_groupware.desktop b/tderesources/groupware/tdeabc_groupware.desktop index dee5d9c24..2e81da8fb 100644 --- a/tderesources/groupware/tdeabc_groupware.desktop +++ b/tderesources/groupware/tdeabc_groupware.desktop @@ -42,7 +42,7 @@ Name[tr]=Grupyazılımı(Groupware) Sunucusu Name[uk]=Сервер Groupware Name[zh_CN]=群件服务器 Name[zh_TW]=群組伺服器 -X-TDE-Library=kabc_groupware +X-TDE-Library=tdeabc_groupware Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp index e2503b83d..c46c09371 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp @@ -28,9 +28,9 @@ #include <libtdepim/groupwarejob.h> -#include "kabc_groupwareprefs.h" +#include "tdeabc_groupwareprefs.h" -#include "kabc_resourcegroupware.h" +#include "tdeabc_resourcegroupware.h" using namespace KABC; @@ -362,4 +362,4 @@ void ResourceGroupware::cancelLoad() mProgress = 0; } -#include "kabc_resourcegroupware.moc" +#include "tdeabc_resourcegroupware.moc" diff --git a/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp index 08a415745..b857496dd 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupware.h" -#include "kabc_resourcegroupwareconfig.h" +#include "tdeabc_resourcegroupware.h" +#include "tdeabc_resourcegroupwareconfig.h" #include <tdeglobal.h> #include <tdelocale.h> diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp index 35ca8596f..feb24db71 100644 --- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp @@ -18,10 +18,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupwareconfig.h" +#include "tdeabc_resourcegroupwareconfig.h" -#include "kabc_resourcegroupware.h" -#include "kabc_groupwareprefs.h" +#include "tdeabc_resourcegroupware.h" +#include "tdeabc_groupwareprefs.h" #include <kcombobox.h> #include <kdebug.h> @@ -205,4 +205,4 @@ void ResourceGroupwareConfig::updateAddressBookView() #endif } -#include "kabc_resourcegroupwareconfig.moc" +#include "tdeabc_resourcegroupwareconfig.moc" diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt index f13a96f6f..5efc61539 100644 --- a/tderesources/groupwise/CMakeLists.txt +++ b/tderesources/groupwise/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( ##### other data ################################ install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +install( FILES tdeabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_groupwise (module) ################### @@ -41,11 +41,11 @@ tde_add_kpart( kcal_groupwise AUTOMOC ) -##### kabc_groupwise (module) ################### +##### tdeabc_groupwise (module) ################### -tde_add_kpart( kabc_groupwise AUTOMOC - SOURCES kabc_resourcegroupwise_plugin.cpp - LINK kabc_groupwise-shared +tde_add_kpart( tdeabc_groupwise AUTOMOC + SOURCES tdeabc_resourcegroupwise_plugin.cpp + LINK tdeabc_groupwise-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -63,12 +63,12 @@ tde_add_library( kcal_groupwise SHARED AUTOMOC ) -##### kabc_groupwise (shared) ################### +##### tdeabc_groupwise (shared) ################### -tde_add_library( kabc_groupwise SHARED AUTOMOC +tde_add_library( tdeabc_groupwise SHARED AUTOMOC SOURCES - kabc_resourcegroupwise.cpp kabc_resourcegroupwiseconfig.cpp - kabc_groupwiseprefs.kcfgc + tdeabc_resourcegroupwise.cpp tdeabc_resourcegroupwiseconfig.cpp + tdeabc_groupwiseprefs.kcfgc VERSION 1.0.0 LINK gwsoap-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am index 14c1320ce..c098935db 100644 --- a/tderesources/groupwise/Makefile.am +++ b/tderesources/groupwise/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = soap tdeioslave INCLUDES = -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = libkcal_groupwise.la libkabc_groupwise.la +lib_LTLIBRARIES = libkcal_groupwise.la libtdeabc_groupwise.la libkcal_groupwise_la_SOURCES = kcal_resourcegroupwise.cpp \ kcal_resourcegroupwiseconfig.cpp kcal_groupwiseprefsbase.kcfgc kcal_groupwiseprefs.cpp \ @@ -13,32 +13,32 @@ libkcal_groupwise_la_LIBADD = soap/libgwsoap.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la -libkabc_groupwise_la_SOURCES = kabc_resourcegroupwise.cpp \ - kabc_resourcegroupwiseconfig.cpp \ - kabc_groupwiseprefs.kcfgc -libkabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ +libtdeabc_groupwise_la_SOURCES = tdeabc_resourcegroupwise.cpp \ + tdeabc_resourcegroupwiseconfig.cpp \ + tdeabc_groupwiseprefs.kcfgc +libtdeabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkabc_groupwise_la_LIBADD = soap/libgwsoap.la \ +libtdeabc_groupwise_la_LIBADD = soap/libgwsoap.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ -lkabc -kde_module_LTLIBRARIES = kcal_groupwise.la kabc_groupwise.la +kde_module_LTLIBRARIES = kcal_groupwise.la tdeabc_groupwise.la kcal_groupwise_la_SOURCES = kcal_resourcegroupwise_plugin.cpp kcal_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_groupwise_la_LIBADD = libkcal_groupwise.la -kabc_groupwise_la_SOURCES = kabc_resourcegroupwise_plugin.cpp -kabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_groupwise_la_LIBADD = libkabc_groupwise.la +tdeabc_groupwise_la_SOURCES = tdeabc_resourcegroupwise_plugin.cpp +tdeabc_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_groupwise_la_LIBADD = libtdeabc_groupwise.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupwise.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_groupwise.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_groupwise.desktop METASOURCES = AUTO diff --git a/tderesources/groupwise/tdeabc_groupwise.desktop b/tderesources/groupwise/tdeabc_groupwise.desktop index 695ab445b..262bb53df 100644 --- a/tderesources/groupwise/tdeabc_groupwise.desktop +++ b/tderesources/groupwise/tdeabc_groupwise.desktop @@ -43,7 +43,7 @@ Name[tr]=Novell GroupWise Sunucusu Name[uk]=Сервер Novell GroupWise Name[zh_CN]=Novell GroupWise 服务器 Name[zh_TW]=Novell 群組伺服器 -X-TDE-Library=kabc_groupwise +X-TDE-Library=tdeabc_groupwise Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp index 8499aa9ff..1c29fc65b 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <tdelocale.h> -#include "kabc_groupwiseprefs.h" +#include "tdeabc_groupwiseprefs.h" -#include "kabc_resourcegroupwise.h" +#include "tdeabc_resourcegroupwise.h" using namespace KABC; @@ -740,4 +740,4 @@ bool ResourceGroupwise::appIsWhiteListedForSAB() return true; } -#include "kabc_resourcegroupwise.moc" +#include "tdeabc_resourcegroupwise.moc" diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp index b3a94a901..29d94d4f5 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupwise.h" -#include "kabc_resourcegroupwiseconfig.h" +#include "tdeabc_resourcegroupwise.h" +#include "tdeabc_resourcegroupwiseconfig.h" #include <tdeglobal.h> #include <tdelocale.h> @@ -27,7 +27,7 @@ using namespace KABC; typedef KRES::PluginFactory<ResourceGroupwise, ResourceGroupwiseConfig> GroupwiseFactory; -// FIXME: Use K_EXPORT_COMPONENT_FACTORY( kabc_groupwise, GroupwiseFactory ); here +// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_groupwise, GroupwiseFactory ); here // Problem: How do I insert the catalogue??? extern "C" { diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp index 1212a6bc5..fdb219b77 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp @@ -18,10 +18,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupwiseconfig.h" +#include "tdeabc_resourcegroupwiseconfig.h" -#include "kabc_resourcegroupwise.h" -#include "kabc_groupwiseprefs.h" +#include "tdeabc_resourcegroupwise.h" +#include "tdeabc_groupwiseprefs.h" #include <kcombobox.h> #include <kdebug.h> @@ -206,4 +206,4 @@ void ResourceGroupwiseConfig::updateAddressBookView() mAddressBookBox->setCurrentItem( index ); } -#include "kabc_resourcegroupwiseconfig.moc" +#include "tdeabc_resourcegroupwiseconfig.moc" diff --git a/tderesources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/kabc/CMakeLists.txt index cd1371256..f3a5596e6 100644 --- a/tderesources/kolab/kabc/CMakeLists.txt +++ b/tderesources/kolab/kabc/CMakeLists.txt @@ -35,9 +35,9 @@ install( RENAME imap.desktop ) -##### kabc_kolab (module) ####################### +##### tdeabc_kolab (module) ####################### -tde_add_kpart( kabc_kolab AUTOMOC +tde_add_kpart( tdeabc_kolab AUTOMOC SOURCES resourcekolab_plugin.cpp LINK kabckolab-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/tderesources/kolab/kabc/Makefile.am b/tderesources/kolab/kabc/Makefile.am index 483cff5ed..7b552e903 100644 --- a/tderesources/kolab/kabc/Makefile.am +++ b/tderesources/kolab/kabc/Makefile.am @@ -11,13 +11,13 @@ libkabckolab_la_LIBADD = \ $(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \ -ltderesources -lkabc -kde_module_LTLIBRARIES = kabc_kolab.la +kde_module_LTLIBRARIES = tdeabc_kolab.la noinst_HEADERS = resourcekolab.h contact.h -kabc_kolab_la_SOURCES = resourcekolab_plugin.cpp -kabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -kabc_kolab_la_LIBADD = libkabckolab.la +tdeabc_kolab_la_SOURCES = resourcekolab_plugin.cpp +tdeabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined +tdeabc_kolab_la_LIBADD = libkabckolab.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = kolab.desktop diff --git a/tderesources/kolab/kabc/kolab.desktop b/tderesources/kolab/kabc/kolab.desktop index e0a478c0a..6250176f4 100644 --- a/tderesources/kolab/kabc/kolab.desktop +++ b/tderesources/kolab/kabc/kolab.desktop @@ -45,7 +45,7 @@ Name[tr]=KMail Aracılığı ile IMAP Sunucusunda Adres Defteri Name[uk]=Адресна книга на сервері IMAP через KMail Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的地址簿 Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的通訊錄 -X-TDE-Library=kabc_kolab +X-TDE-Library=tdeabc_kolab Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index 246c0eec2..226d7da89 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -69,7 +69,7 @@ class KolabFactory : public KRES::PluginFactoryBase } }; -K_EXPORT_COMPONENT_FACTORY(kabc_kolab,KolabFactory) +K_EXPORT_COMPONENT_FACTORY(tdeabc_kolab,KolabFactory) static const char* s_kmailContentsType = "Contact"; static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contact"; diff --git a/tderesources/kolab/kabc/resourcekolab_plugin.cpp b/tderesources/kolab/kabc/resourcekolab_plugin.cpp index 55ac64205..686f3403e 100644 --- a/tderesources/kolab/kabc/resourcekolab_plugin.cpp +++ b/tderesources/kolab/kabc/resourcekolab_plugin.cpp @@ -48,5 +48,5 @@ class KolabFactory : public KRES::PluginFactoryBase } }; -K_EXPORT_COMPONENT_FACTORY(kabc_kolab,KolabFactory) +K_EXPORT_COMPONENT_FACTORY(tdeabc_kolab,KolabFactory) diff --git a/tderesources/lib/CMakeLists.txt b/tderesources/lib/CMakeLists.txt index 0289f3e8a..54a8a760d 100644 --- a/tderesources/lib/CMakeLists.txt +++ b/tderesources/lib/CMakeLists.txt @@ -30,9 +30,9 @@ tde_add_library( kgroupwarebase SHARED AUTOMOC folderlister.cpp folderconfig.cpp folderlistview.cpp folderselectdialog.cpp groupwaredataadaptor.cpp groupwaredownloadjob.cpp calendaradaptor.cpp addressbookadaptor.cpp groupwareresourcejob.cpp groupwareuploadjob.cpp - kcal_resourcegroupwarebase.cpp kabc_resourcegroupwarebase.cpp + kcal_resourcegroupwarebase.cpp tdeabc_resourcegroupwarebase.cpp tderesources_groupwareprefs.kcfgc kcal_resourcegroupwarebaseconfig.cpp - kabc_resourcegroupwarebaseconfig.cpp kcal_cachesettingsdlg.cpp + tdeabc_resourcegroupwarebaseconfig.cpp kcal_cachesettingsdlg.cpp VERSION 0.0.0 LINK tdepim-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/tderesources/lib/Makefile.am b/tderesources/lib/Makefile.am index a430fd8b2..ac7ff7abd 100644 --- a/tderesources/lib/Makefile.am +++ b/tderesources/lib/Makefile.am @@ -5,9 +5,9 @@ lib_LTLIBRARIES = libkgroupwarebase.la libkgroupwaredav.la libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview.cpp folderselectdialog.cpp \ groupwaredataadaptor.cpp groupwaredownloadjob.cpp \ calendaradaptor.cpp addressbookadaptor.cpp groupwareresourcejob.cpp \ - groupwareuploadjob.cpp kcal_resourcegroupwarebase.cpp kabc_resourcegroupwarebase.cpp \ + groupwareuploadjob.cpp kcal_resourcegroupwarebase.cpp tdeabc_resourcegroupwarebase.cpp \ tderesources_groupwareprefs.kcfgc \ - kcal_resourcegroupwarebaseconfig.cpp kabc_resourcegroupwarebaseconfig.cpp \ + kcal_resourcegroupwarebaseconfig.cpp tdeabc_resourcegroupwarebaseconfig.cpp \ kcal_cachesettingsdlg.cpp libkgroupwarebase_la_LDFLAGS = $(all_libraries) -no-undefined libkgroupwarebase_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp index 3ebd175eb..93eb05971 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupwarebase.h" +#include "tdeabc_resourcegroupwarebase.h" #include "tderesources_groupwareprefs.h" #include "folderlister.h" @@ -259,4 +259,4 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) } -#include "kabc_resourcegroupwarebase.moc" +#include "tdeabc_resourcegroupwarebase.moc" diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp index 918dfc52b..db98382be 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp @@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourcegroupwarebaseconfig.h" +#include "tdeabc_resourcegroupwarebaseconfig.h" -#include "kabc_resourcegroupwarebase.h" +#include "tdeabc_resourcegroupwarebase.h" #include "tderesources_groupwareprefs.h" #include "folderconfig.h" @@ -114,4 +114,4 @@ void ResourceGroupwareBaseConfig::updateFolders() mFolderConfig->retrieveFolderList( url ); } -#include "kabc_resourcegroupwarebaseconfig.moc" +#include "tdeabc_resourcegroupwarebaseconfig.moc" diff --git a/tderesources/newexchange/CMakeLists.txt b/tderesources/newexchange/CMakeLists.txt index deae1d25b..4680a73a0 100644 --- a/tderesources/newexchange/CMakeLists.txt +++ b/tderesources/newexchange/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( ##### other data ################################ install( FILES kcal_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES kabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +install( FILES tdeabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_newexchange (module) ################# @@ -39,11 +39,11 @@ tde_add_kpart( kcal_newexchange AUTOMOC ) -##### kabc_newexchange (module) ################# +##### tdeabc_newexchange (module) ################# -tde_add_kpart( kabc_newexchange AUTOMOC - SOURCES kabc_resourceexchange_plugin.cpp - LINK kabc_newexchange-shared +tde_add_kpart( tdeabc_newexchange AUTOMOC + SOURCES tdeabc_resourceexchange_plugin.cpp + LINK tdeabc_newexchange-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -68,11 +68,11 @@ tde_add_library( kcal_newexchange SHARED AUTOMOC ) -##### kabc_newexchange (shared) ################# +##### tdeabc_newexchange (shared) ################# -tde_add_library( kabc_newexchange SHARED AUTOMOC +tde_add_library( tdeabc_newexchange SHARED AUTOMOC SOURCES - exchangeaddressbookadaptor.cpp kabc_resourceexchange.cpp + exchangeaddressbookadaptor.cpp tdeabc_resourceexchange.cpp VERSION 1.0.0 LINK knewexchange-static kgroupwaredav-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/tderesources/newexchange/Makefile.am b/tderesources/newexchange/Makefile.am index 514351431..f5f9191bd 100644 --- a/tderesources/newexchange/Makefile.am +++ b/tderesources/newexchange/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tderesources/lib \ -I$(top_builddir)/tderesources/lib $(all_includes) -lib_LTLIBRARIES = libkabc_newexchange.la libkcal_newexchange.la +lib_LTLIBRARIES = libtdeabc_newexchange.la libkcal_newexchange.la noinst_LTLIBRARIES = libknewexchange.la libknewexchange_la_SOURCES = exchangeglobals.cpp exchangeconvertercalendar.cpp exchangeconvertercontact.cpp @@ -14,32 +14,32 @@ libkcal_newexchange_la_LIBADD = \ $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \ -lkabc -libkabc_newexchange_la_SOURCES = kabc_resourceexchange.cpp exchangeaddressbookadaptor.cpp -libkabc_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ +libtdeabc_newexchange_la_SOURCES = tdeabc_resourceexchange.cpp exchangeaddressbookadaptor.cpp +libtdeabc_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -version-info 1:0:0 -no-undefined -libkabc_newexchange_la_LIBADD = \ +libtdeabc_newexchange_la_LIBADD = \ libknewexchange.la ../lib/libkgroupwaredav.la \ $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \ -lkabc -kde_module_LTLIBRARIES = kcal_newexchange.la kabc_newexchange.la +kde_module_LTLIBRARIES = kcal_newexchange.la tdeabc_newexchange.la kcal_newexchange_la_SOURCES = kcal_resourceexchange_plugin.cpp kcal_newexchange_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) kcal_newexchange_la_LIBADD = libkcal_newexchange.la -kabc_newexchange_la_SOURCES = kabc_resourceexchange_plugin.cpp -kabc_newexchange_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) -kabc_newexchange_la_LIBADD = libkabc_newexchange.la +tdeabc_newexchange_la_SOURCES = tdeabc_resourceexchange_plugin.cpp +tdeabc_newexchange_la_LDFLAGS = $(all_libraries) -module -no-undefined $(KDE_PLUGIN) +tdeabc_newexchange_la_LIBADD = libtdeabc_newexchange.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_newexchange.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_newexchange.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_newexchange.desktop METASOURCES = AUTO -kcal_resourceexchange.lo kabc_resourceexchange.lo: ../lib/tderesources_groupwareprefs.h +kcal_resourceexchange.lo tdeabc_resourceexchange.lo: ../lib/tderesources_groupwareprefs.h diff --git a/tderesources/newexchange/tdeabc_newexchange.desktop b/tderesources/newexchange/tdeabc_newexchange.desktop index c48d5f3cf..adeb81fba 100644 --- a/tderesources/newexchange/tdeabc_newexchange.desktop +++ b/tderesources/newexchange/tdeabc_newexchange.desktop @@ -44,7 +44,7 @@ Name[tr]=Bir Exchange Sunucusu üzerinde Adres Defteri (deneyimsel) Name[uk]=Адресна книга на сервері Exchange (експериментальне) Name[zh_CN]=Exchange 服务器上的地址簿(试验性) Name[zh_TW]=Exchanger 伺服器的通訊錄(實驗中) -X-TDE-Library=kabc_newexchange +X-TDE-Library=tdeabc_newexchange Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/newexchange/tdeabc_resourceexchange.cpp b/tderesources/newexchange/tdeabc_resourceexchange.cpp index bd60cd2fc..63f46f503 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.cpp +++ b/tderesources/newexchange/tdeabc_resourceexchange.cpp @@ -21,7 +21,7 @@ #include "exchangeaddressbookadaptor.h" -#include "kabc_resourceexchange.h" +#include "tdeabc_resourceexchange.h" #include "groupwaredownloadjob.h" #include "groupwareuploadjob.h" #include "tderesources_groupwareprefs.h" @@ -51,4 +51,4 @@ void ResourceExchange::init() ResourceGroupwareBase::init(); } -#include "kabc_resourceexchange.moc" +#include "tdeabc_resourceexchange.moc" diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h index 941f91792..db5cc7b55 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.h +++ b/tderesources/newexchange/tdeabc_resourceexchange.h @@ -21,7 +21,7 @@ #ifndef KABC_RESOURCEEXCHANGE_H #define KABC_RESOURCEEXCHANGE_H -#include <kabc_resourcegroupwarebase.h> +#include <tdeabc_resourcegroupwarebase.h> namespace KABC { diff --git a/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp index adc0b6859..4f081a311 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp +++ b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp @@ -18,10 +18,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kabc_resourceexchange.h" -#include "kabc_resourcegroupwarebaseconfig.h" +#include "tdeabc_resourceexchange.h" +#include "tdeabc_resourcegroupwarebaseconfig.h" using namespace KABC; typedef KRES::PluginFactory<ResourceExchange,ResourceGroupwareBaseConfig> ExchangeFactory; -K_EXPORT_COMPONENT_FACTORY( kabc_newexchange, ExchangeFactory ) +K_EXPORT_COMPONENT_FACTORY( tdeabc_newexchange, ExchangeFactory ) diff --git a/tderesources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/kabc/CMakeLists.txt index 3aed963d7..bfdaa3478 100644 --- a/tderesources/scalix/kabc/CMakeLists.txt +++ b/tderesources/scalix/kabc/CMakeLists.txt @@ -34,9 +34,9 @@ install( DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -##### kabc_scalix (module) ###################### +##### tdeabc_scalix (module) ###################### -tde_add_kpart( kabc_scalix AUTOMOC +tde_add_kpart( tdeabc_scalix AUTOMOC SOURCES resourcescalix_plugin.cpp LINK kabcscalix-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/kabc/Makefile.am index 21e3ba17d..e8bbc3bbc 100644 --- a/tderesources/scalix/kabc/Makefile.am +++ b/tderesources/scalix/kabc/Makefile.am @@ -11,13 +11,13 @@ libkabcscalix_la_LIBADD = \ $(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \ -ltderesources -lkabc -kde_module_LTLIBRARIES = kabc_scalix.la +kde_module_LTLIBRARIES = tdeabc_scalix.la noinst_HEADERS = resourcescalix.h -kabc_scalix_la_SOURCES = resourcescalix_plugin.cpp -kabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -kabc_scalix_la_LIBADD = libkabcscalix.la +tdeabc_scalix_la_SOURCES = resourcescalix_plugin.cpp +tdeabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined +tdeabc_scalix_la_LIBADD = libkabcscalix.la servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = scalix.desktop diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index d7826e17c..ea3928a59 100644 --- a/tderesources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp @@ -70,7 +70,7 @@ class ScalixFactory : public KRES::PluginFactoryBase } }; -K_EXPORT_COMPONENT_FACTORY(kabc_scalix,ScalixFactory) +K_EXPORT_COMPONENT_FACTORY(tdeabc_scalix,ScalixFactory) static const char* s_kmailContentsType = "Contact"; static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contact"; diff --git a/tderesources/scalix/kabc/resourcescalix_plugin.cpp b/tderesources/scalix/kabc/resourcescalix_plugin.cpp index bbf7a436a..cdfc8f301 100644 --- a/tderesources/scalix/kabc/resourcescalix_plugin.cpp +++ b/tderesources/scalix/kabc/resourcescalix_plugin.cpp @@ -49,5 +49,5 @@ class ScalixFactory : public KRES::PluginFactoryBase } }; -K_EXPORT_COMPONENT_FACTORY(kabc_scalix,ScalixFactory) +K_EXPORT_COMPONENT_FACTORY(tdeabc_scalix,ScalixFactory) diff --git a/tderesources/scalix/kabc/scalix.desktop b/tderesources/scalix/kabc/scalix.desktop index 3f483dff6..cc2a8c464 100644 --- a/tderesources/scalix/kabc/scalix.desktop +++ b/tderesources/scalix/kabc/scalix.desktop @@ -23,7 +23,7 @@ Name[sv]=Adressbok på Scalix-server via Kmail Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Adres Defteri Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的地址簿 Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的通訊錄 -X-TDE-Library=kabc_scalix +X-TDE-Library=tdeabc_scalix Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt index 10f703017..47d6dc703 100644 --- a/tderesources/slox/CMakeLists.txt +++ b/tderesources/slox/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kcal_slox.desktop kcal_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES kabc_slox.desktop kabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +install( FILES tdeabc_slox.desktop tdeabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_slox (module) ######################## @@ -38,11 +38,11 @@ tde_add_kpart( kcal_slox AUTOMOC ) -##### kabc_slox (module) ######################## +##### tdeabc_slox (module) ######################## -tde_add_kpart( kabc_slox AUTOMOC +tde_add_kpart( tdeabc_slox AUTOMOC SOURCES kabcresourceslox_plugin.cpp - LINK kabc_slox-shared + LINK tdeabc_slox-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -59,9 +59,9 @@ tde_add_library( kslox SHARED AUTOMOC ) -##### kabc_slox (shared) ######################## +##### tdeabc_slox (shared) ######################## -tde_add_library( kabc_slox SHARED AUTOMOC +tde_add_library( tdeabc_slox SHARED AUTOMOC SOURCES kabcresourceslox.cpp kabcresourcesloxconfig.cpp kabcsloxprefs.kcfgc VERSION 0.0.0 diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am index 48d0c0f66..ee8a47f1c 100644 --- a/tderesources/slox/Makefile.am +++ b/tderesources/slox/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -lib_LTLIBRARIES = libkslox.la libkabc_slox.la libkcal_slox.la +lib_LTLIBRARIES = libkslox.la libtdeabc_slox.la libkcal_slox.la libkslox_la_SOURCES = sloxaccounts.cpp webdavhandler.cpp \ sloxfolder.cpp sloxfoldermanager.cpp \ @@ -15,21 +15,21 @@ libkcal_slox_la_SOURCES = kcalresourceslox.cpp kcalresourcesloxconfig.cpp \ libkcal_slox_la_LDFLAGS = $(all_libraries) libkcal_slox_la_LIBADD = libkslox.la $(top_builddir)/libkcal/libkcal.la -libkabc_slox_la_SOURCES = kabcresourceslox.cpp kabcresourcesloxconfig.cpp \ +libtdeabc_slox_la_SOURCES = kabcresourceslox.cpp kabcresourcesloxconfig.cpp \ kabcsloxprefs.kcfgc -libkabc_slox_la_LDFLAGS = $(all_libraries) -libkabc_slox_la_LIBADD = libkslox.la -lkabc +libtdeabc_slox_la_LDFLAGS = $(all_libraries) +libtdeabc_slox_la_LIBADD = libkslox.la -lkabc -kde_module_LTLIBRARIES = kcal_slox.la kabc_slox.la +kde_module_LTLIBRARIES = kcal_slox.la tdeabc_slox.la kcal_slox_la_SOURCES = kcalresourceslox_plugin.cpp kcal_slox_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcal_slox_la_LIBADD = libkcal_slox.la -kabc_slox_la_SOURCES = kabcresourceslox_plugin.cpp -kabc_slox_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kabc_slox_la_LIBADD = libkabc_slox.la +tdeabc_slox_la_SOURCES = kabcresourceslox_plugin.cpp +tdeabc_slox_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeabc_slox_la_LIBADD = libtdeabc_slox.la EXTRA_PROGRAMS = testsloxaccounts @@ -42,8 +42,8 @@ testsloxaccounts_SOURCES = testsloxaccounts.cpp kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_slox.desktop kcal_ox.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc -kabc_service_DATA = kabc_slox.desktop kabc_ox.desktop +tdeabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc +tdeabc_service_DATA = tdeabc_slox.desktop tdeabc_ox.desktop METASOURCES = AUTO diff --git a/tderesources/slox/kabcresourceslox_plugin.cpp b/tderesources/slox/kabcresourceslox_plugin.cpp index 49e1f368b..93db76b3a 100644 --- a/tderesources/slox/kabcresourceslox_plugin.cpp +++ b/tderesources/slox/kabcresourceslox_plugin.cpp @@ -33,7 +33,7 @@ extern "C" void *init_tdeabc_slox() { TDEGlobal::locale()->insertCatalogue( "libkcal" ); - TDEGlobal::locale()->insertCatalogue( "kabc_slox" ); + TDEGlobal::locale()->insertCatalogue( "tdeabc_slox" ); return new SloxFactory; } } diff --git a/tderesources/slox/kcalresourceslox_plugin.cpp b/tderesources/slox/kcalresourceslox_plugin.cpp index 97e2bbebc..f9082cd3a 100644 --- a/tderesources/slox/kcalresourceslox_plugin.cpp +++ b/tderesources/slox/kcalresourceslox_plugin.cpp @@ -34,7 +34,7 @@ extern "C" void *init_kcal_slox() { TDEGlobal::locale()->insertCatalogue( "libkcal" ); - TDEGlobal::locale()->insertCatalogue( "kabc_slox" ); + TDEGlobal::locale()->insertCatalogue( "tdeabc_slox" ); return new SLOXFactory; } } diff --git a/tderesources/slox/tdeabc_ox.desktop b/tderesources/slox/tdeabc_ox.desktop index 39570ad29..9bdec6e5f 100644 --- a/tderesources/slox/tdeabc_ox.desktop +++ b/tderesources/slox/tdeabc_ox.desktop @@ -39,7 +39,7 @@ Name[tr]=OpenXchange Sunucusu Name[uk]=Сервер OpenXchange Name[zh_CN]=OpenXchange 服务器 Name[zh_TW]=OpenXchange 伺服器 -X-TDE-Library=kabc_slox +X-TDE-Library=tdeabc_slox Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/tderesources/slox/tdeabc_slox.desktop b/tderesources/slox/tdeabc_slox.desktop index 6c7b0352c..5f97225dc 100644 --- a/tderesources/slox/tdeabc_slox.desktop +++ b/tderesources/slox/tdeabc_slox.desktop @@ -44,7 +44,7 @@ Name[tr]=SUSE LINUX Openexchange Sunucusu Name[uk]=Сервер SUSE LINUX Openexchange Name[zh_CN]=SUSE LINUX Openexchange 服务器 Name[zh_TW]=SUSE LINUX Openexchange 伺服器 -X-TDE-Library=kabc_slox +X-TDE-Library=tdeabc_slox Type=Service ServiceTypes=KResources/Plugin X-TDE-ResourceFamily=contact diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt index c437ff6f4..418d13b1c 100644 --- a/wizards/CMakeLists.txt +++ b/wizards/CMakeLists.txt @@ -79,8 +79,8 @@ if( WITH_EGROUPWARE ) install( FILES egroupware.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - process_kcfg( egroupwarewizard.cpp kabc_egroupwareprefs.h tderesources/egroupware - tderesources_kabc_egroupware.kcfg kabc_egroupwareprefs.kcfgc ) + process_kcfg( egroupwarewizard.cpp tdeabc_egroupwareprefs.h tderesources/egroupware + tderesources_tdeabc_egroupware.kcfg tdeabc_egroupwareprefs.kcfgc ) process_kcfg( egroupwarewizard.cpp kcal_egroupwareprefs.h tderesources/egroupware tderesources_kcal_egroupware.kcfg kcal_egroupwareprefs.kcfgc ) @@ -91,7 +91,7 @@ if( WITH_EGROUPWARE ) tde_add_library( egroupwarewizard SHARED NO_EXPORT SOURCES egroupwarewizard.cpp egroupwareconfig.kcfgc - LINK kcal_xmlrpc-shared kabc_xmlrpc-shared knotes_xmlrpc-shared + LINK kcal_xmlrpc-shared tdeabc_xmlrpc-shared knotes_xmlrpc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) tde_add_executable( egroupwarewizard @@ -111,7 +111,7 @@ if( WITH_SLOX ) install( FILES slox.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) process_kcfg( sloxwizard.cpp kabcsloxprefs.h tderesources/slox - tderesources_kabc_slox.kcfg kabcsloxprefs.kcfgc ) + tderesources_tdeabc_slox.kcfg kabcsloxprefs.kcfgc ) process_kcfg( sloxwizard.cpp kcalsloxprefs.h tderesources/slox tderesources_kcal_slox.kcfg kcalsloxprefs.kcfgc ) @@ -119,7 +119,7 @@ if( WITH_SLOX ) tde_add_library( sloxwizard SHARED NO_EXPORT SOURCES sloxwizard.cpp sloxconfig.kcfgc - LINK kcal_slox-shared kabc_slox-shared + LINK kcal_slox-shared tdeabc_slox-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) tde_add_executable( sloxwizard @@ -185,13 +185,13 @@ if( WITH_GROUPWISE ) process_kcfg( groupwisewizard.cpp kcal_groupwiseprefsbase.h tderesources/groupwise tderesources_kcal_groupwise.kcfg kcal_groupwiseprefsbase.kcfgc ) - process_kcfg( groupwisewizard.cpp kabc_groupwiseprefs.h tderesources/groupwise - tderesources_kabc_groupwise.kcfg kabc_groupwiseprefs.kcfgc ) + process_kcfg( groupwisewizard.cpp tdeabc_groupwiseprefs.h tderesources/groupwise + tderesources_tdeabc_groupwise.kcfg tdeabc_groupwiseprefs.kcfgc ) tde_add_library( groupwisewizard SHARED AUTOMOC NO_EXPORT SOURCES groupwisewizard.cpp groupwiseconfig.kcfgc kmailchanges.cpp - LINK kcal_groupwise-shared kabc_groupwise-shared kpimidentities-shared + LINK kcal_groupwise-shared tdeabc_groupwise-shared kpimidentities-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) tde_add_executable( groupwisewizard diff --git a/wizards/Makefile.am b/wizards/Makefile.am index e18eea38e..0df70a16b 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -45,7 +45,7 @@ kolabwizard_SOURCES = kolabmain.cpp # eGroupware libegroupwarewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libegroupwarewizard_la_SOURCES = egroupwarewizard.cpp egroupwareconfig.kcfgc -libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libkabc_xmlrpc.la \ +libegroupwarewizard_la_LIBADD = $(top_builddir)/tderesources/egroupware/libtdeabc_xmlrpc.la \ $(top_builddir)/tderesources/egroupware/libkcal_xmlrpc.la \ $(top_builddir)/tderesources/egroupware/libknotes_xmlrpc.la \ $(top_builddir)/libkcal/libkcal.la \ @@ -60,7 +60,7 @@ egroupwarewizard_SOURCES = egroupwaremain.cpp libsloxwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsloxwizard_la_SOURCES = sloxwizard.cpp sloxconfig.kcfgc libsloxwizard_la_LIBADD = $(top_builddir)/tderesources/slox/libkcal_slox.la \ - $(top_builddir)/tderesources/slox/libkabc_slox.la \ + $(top_builddir)/tderesources/slox/libtdeabc_slox.la \ $(top_builddir)/libtdepim/libtdepim.la sloxwizard_LDADD = libsloxwizard.la @@ -72,7 +72,7 @@ libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ kmailchanges.cpp libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_groupwise.la \ - $(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \ + $(top_builddir)/tderesources/groupwise/libtdeabc_groupwise.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/tdeabc_groupwiseprefs.h \ @@ -87,7 +87,7 @@ groupwisewizard_SOURCES = groupwisemain.cpp libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libexchangewizard_la_SOURCES = exchangewizard.cpp libexchangewizard_la_LIBADD = $(top_builddir)/tderesources/newexchange/libkcal_newexchange.la \ - $(top_builddir)/tderesources/newexchange/libkabc_newexchange.la \ + $(top_builddir)/tderesources/newexchange/libtdeabc_newexchange.la \ $(top_builddir)/libtdepim/libtdepim.la exchangewizard_LDADD = libexchangewizard.la |