diff options
34 files changed, 46 insertions, 46 deletions
diff --git a/admin b/admin -Subproject 50c595422f05af2f2e1457ee3d27f8e5ce1ab35 +Subproject 39466b7b95f25a3e0f6da52b156b194b10cbac9 diff --git a/cmake b/cmake -Subproject 5438330f961347e3026326e78e0e70a1ec083aa +Subproject 274366fb8b90704586d7beef216b765cc0688b0 diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am index 675c6da1..da3d8299 100644 --- a/kabc/frontend/Makefile.am +++ b/kabc/frontend/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(includedir)/kabc $(all_includes) +INCLUDES = -I$(includedir)/tdeabc $(all_includes) METASOURCES = AUTO diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am index 84d4fa7e..c6643804 100644 --- a/kabc/kabc2mutt/Makefile.am +++ b/kabc/kabc2mutt/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(includedir)/kabc $(all_includes) +INCLUDES = -I$(includedir)/tdeabc $(all_includes) METASOURCES = AUTO @@ -9,5 +9,5 @@ kabc2mutt_LDADD = -lkabc $(LIB_TDECORE) kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am index d97fdc3f..0eb5c411 100644 --- a/kabc/kabcdistlistupdater/Makefile.am +++ b/kabc/kabcdistlistupdater/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(includedir)/kabc -I$(top_srcdir) $(all_includes) +INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes) METASOURCES = AUTO diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index cb20a3ca..d4852e80 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -89,7 +89,7 @@ KParts::ReadOnlyPart* KAddressbookPlugin::createPart() TQStringList KAddressbookPlugin::configModules() const { TQStringList modules; - modules << "PIM/kabconfig.desktop" << "PIM/kabldapconfig.desktop"; + modules << "PIM/tdeabconfig.desktop" << "PIM/kabldapconfig.desktop"; return modules; } diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index 0b76b7f3..ccd350f5 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -29,7 +29,7 @@ #include <tqmap.h> #include <tdepimmacros.h> -// This is here because it can't go to tdelibs/kabc yet, but ultimately +// This is here because it can't go to tdelibs/tdeabc yet, but ultimately // it should probably go there (maybe redesigned to have a real object // for subresources). diff --git a/tdeioslaves/opengroupware/opengroupware.cpp b/tdeioslaves/opengroupware/opengroupware.cpp index c1fd485d..6ff1d6b5 100644 --- a/tdeioslaves/opengroupware/opengroupware.cpp +++ b/tdeioslaves/opengroupware/opengroupware.cpp @@ -27,7 +27,7 @@ #include <tdeio/davjob.h> #include <tdelocale.h> -#include <libtdepim/kabcresourcecached.h> +#include <libtdepim/tdeabcresourcecached.h> #include <libkcal/freebusy.h> #include <libkcal/icalformat.h> diff --git a/tderesources/carddav/CMakeLists.txt b/tderesources/carddav/CMakeLists.txt index 36e086b4..491ea2ae 100644 --- a/tderesources/carddav/CMakeLists.txt +++ b/tderesources/carddav/CMakeLists.txt @@ -30,7 +30,7 @@ link_directories( install( FILES kabc_carddav.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kabc_carddav (module) ##################### diff --git a/tderesources/carddav/Makefile.am b/tderesources/carddav/Makefile.am index b82849df..3b47f2ab 100644 --- a/tderesources/carddav/Makefile.am +++ b/tderesources/carddav/Makefile.am @@ -26,7 +26,7 @@ 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 -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_carddav.desktop METASOURCES = AUTO diff --git a/tderesources/egroupware/CMakeLists.txt b/tderesources/egroupware/CMakeLists.txt index ac6182f1..294b1067 100644 --- a/tderesources/egroupware/CMakeLists.txt +++ b/tderesources/egroupware/CMakeLists.txt @@ -28,12 +28,12 @@ link_directories( install( FILES kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kabc ) + DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc ) ##### other data ################################ -install( FILES kabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) +install( FILES kabc_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 ) diff --git a/tderesources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am index 31a6702b..b3b7206c 100644 --- a/tderesources/egroupware/Makefile.am +++ b/tderesources/egroupware/Makefile.am @@ -39,7 +39,7 @@ libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \ $(top_builddir)/libtdepim/libtdepim.la \ libegwcommon.la -kabcincludedir = $(includedir)/kabc +kabcincludedir = $(includedir)/tdeabc kabcinclude_HEADERS = kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h kde_module_LTLIBRARIES = kabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la @@ -56,7 +56,7 @@ 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/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_xmlrpc.desktop kcal_servicedir = $(kde_servicesdir)/tderesources/kcal diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.h b/tderesources/egroupware/kabc_resourcexmlrpc.h index d9b745aa..b4b6411a 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpc.h +++ b/tderesources/egroupware/kabc_resourcexmlrpc.h @@ -24,7 +24,7 @@ #include <tqmap.h> #include <tdepimmacros.h> -#include "libtdepim/kabcresourcecached.h" +#include "libtdepim/tdeabcresourcecached.h" class TDEConfig; class Synchronizer; diff --git a/tderesources/groupdav/CMakeLists.txt b/tderesources/groupdav/CMakeLists.txt index bc903d00..f85244b3 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/kabc ) -install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc RENAME kabc_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) ##### kcal_groupdav (module) #################### diff --git a/tderesources/groupdav/Makefile.am b/tderesources/groupdav/Makefile.am index cbc9418b..3b04b2fb 100644 --- a/tderesources/groupdav/Makefile.am +++ b/tderesources/groupdav/Makefile.am @@ -34,15 +34,15 @@ kabc_groupdav_la_LIBADD = libkabc_groupdav.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupdav.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_groupdav.desktop METASOURCES = AUTO install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kabc + $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc $(mkinstalldirs) $(DESTDIR)$(kde_servicesdir)/tderesources/kcal - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc/kabc_opengroupware.desktop + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/tdeabc/tdeabc_opengroupware.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_servicesdir)/tderesources/kcal/kcal_opengroupware.desktop messages: rc.cpp diff --git a/tderesources/groupware/Makefile.am b/tderesources/groupware/Makefile.am index 08c257ba..35138a0d 100644 --- a/tderesources/groupware/Makefile.am +++ b/tderesources/groupware/Makefile.am @@ -33,7 +33,7 @@ kabc_groupware_la_LIBADD = libkabc_groupware.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupware.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_groupware.desktop METASOURCES = AUTO diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt index a5617229..f13a96f6 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/kabc ) +install( FILES kabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_groupwise (module) ################### diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am index 486e8977..14c1320c 100644 --- a/tderesources/groupwise/Makefile.am +++ b/tderesources/groupwise/Makefile.am @@ -37,7 +37,7 @@ kabc_groupwise_la_LIBADD = libkabc_groupwise.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_groupwise.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_groupwise.desktop METASOURCES = AUTO diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 4eb24024..5464dae2 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -23,7 +23,7 @@ #include <tqregexp.h> -#include <libtdepim/kabcresourcecached.h> +#include <libtdepim/tdeabcresourcecached.h> #include <libkcal/freebusy.h> #include <libkcal/icalformat.h> diff --git a/tderesources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/kabc/CMakeLists.txt index e4e3e00c..cd137125 100644 --- a/tderesources/kolab/kabc/CMakeLists.txt +++ b/tderesources/kolab/kabc/CMakeLists.txt @@ -27,11 +27,11 @@ link_directories( install( FILES kolab.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME imap.desktop ) diff --git a/tderesources/kolab/kabc/Makefile.am b/tderesources/kolab/kabc/Makefile.am index 80643fba..483cff5e 100644 --- a/tderesources/kolab/kabc/Makefile.am +++ b/tderesources/kolab/kabc/Makefile.am @@ -19,7 +19,7 @@ kabc_kolab_la_SOURCES = resourcekolab_plugin.cpp kabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kabc_kolab_la_LIBADD = libkabckolab.la -servicedir = $(kde_servicesdir)/tderesources/kabc +servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = kolab.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp index 722b2947..fa62e791 100644 --- a/tderesources/lib/addressbookadaptor.cpp +++ b/tderesources/lib/addressbookadaptor.cpp @@ -25,7 +25,7 @@ #include <tdeabc/addressee.h> #include <tdeabc/vcardconverter.h> -#include <libtdepim/kabcresourcecached.h> +#include <libtdepim/tdeabcresourcecached.h> #include <tdeio/job.h> diff --git a/tderesources/newexchange/CMakeLists.txt b/tderesources/newexchange/CMakeLists.txt index 8323c310..deae1d25 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/kabc ) +install( FILES kabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_newexchange (module) ################# diff --git a/tderesources/newexchange/Makefile.am b/tderesources/newexchange/Makefile.am index 62a99b47..51435143 100644 --- a/tderesources/newexchange/Makefile.am +++ b/tderesources/newexchange/Makefile.am @@ -36,7 +36,7 @@ kabc_newexchange_la_LIBADD = libkabc_newexchange.la kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_newexchange.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_newexchange.desktop METASOURCES = AUTO diff --git a/tderesources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/kabc/CMakeLists.txt index 99d42a33..3aed963d 100644 --- a/tderesources/scalix/kabc/CMakeLists.txt +++ b/tderesources/scalix/kabc/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( install( FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) install( FILES ../uninstall.desktop RENAME imap.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kabc_scalix (module) ###################### diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/kabc/Makefile.am index 769c8dde..21e3ba17 100644 --- a/tderesources/scalix/kabc/Makefile.am +++ b/tderesources/scalix/kabc/Makefile.am @@ -19,7 +19,7 @@ kabc_scalix_la_SOURCES = resourcescalix_plugin.cpp kabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined kabc_scalix_la_LIBADD = libkabcscalix.la -servicedir = $(kde_servicesdir)/tderesources/kabc +servicedir = $(kde_servicesdir)/tderesources/tdeabc service_DATA = scalix.desktop install-data-local: $(srcdir)/../uninstall.desktop diff --git a/tderesources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt index 51d974c4..10f70301 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/kabc ) +install( FILES kabc_slox.desktop kabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) ##### kcal_slox (module) ######################## diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am index 7189d633..48d0c0f6 100644 --- a/tderesources/slox/Makefile.am +++ b/tderesources/slox/Makefile.am @@ -42,10 +42,10 @@ testsloxaccounts_SOURCES = testsloxaccounts.cpp kcal_servicedir = $(kde_servicesdir)/tderesources/kcal kcal_service_DATA = kcal_slox.desktop kcal_ox.desktop -kabc_servicedir = $(kde_servicesdir)/tderesources/kabc +kabc_servicedir = $(kde_servicesdir)/tderesources/tdeabc kabc_service_DATA = kabc_slox.desktop kabc_ox.desktop METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kabc_slox.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeabc_slox.pot diff --git a/tderesources/slox/kabcresourceslox.h b/tderesources/slox/kabcresourceslox.h index d51b06a1..b79167a1 100644 --- a/tderesources/slox/kabcresourceslox.h +++ b/tderesources/slox/kabcresourceslox.h @@ -23,7 +23,7 @@ #include "sloxbase.h" #include "webdavhandler.h" -#include <libtdepim/kabcresourcecached.h> +#include <libtdepim/tdeabcresourcecached.h> #include <tdepimmacros.h> #include <tdeabc/addressee.h> diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 93cbeae6..e18eea38 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -75,7 +75,7 @@ libgroupwisewizard_la_LIBADD = $(top_builddir)/tderesources/groupwise/libkcal_gr $(top_builddir)/tderesources/groupwise/libkabc_groupwise.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la -libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/kabc_groupwiseprefs.h \ +libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/tderesources/groupwise/tdeabc_groupwiseprefs.h \ $(top_builddir)/tderesources/groupwise/kcal_groupwiseprefsbase.h @@ -117,8 +117,8 @@ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/tdepimwizards.pot -egroupwarewizard.lo: ../tderesources/egroupware/kabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h +egroupwarewizard.lo: ../tderesources/egroupware/tdeabc_egroupwareprefs.h ../tderesources/egroupware/kcal_egroupwareprefs.h ../tderesources/egroupware/knotes_egroupwareprefs.h exchangewizard.lo: ../tderesources/lib/tderesources_groupwareprefs.h -sloxwizard.lo: ../tderesources/slox/kabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h +sloxwizard.lo: ../tderesources/slox/tdeabcsloxprefs.h ../tderesources/slox/kcalsloxprefs.h xdg_apps_DATA = groupwarewizard.desktop diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index 80cab2c4..a2376204 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -21,8 +21,8 @@ #include "egroupwarewizard.h" #include "egroupwareconfig.h" -#include "tderesources/egroupware/kabc_egroupwareprefs.h" -#include "tderesources/egroupware/kabc_resourcexmlrpc.h" +#include "tderesources/egroupware/tdeabc_egroupwareprefs.h" +#include "tderesources/egroupware/tdeabc_resourcexmlrpc.h" #include "tderesources/egroupware/kcal_egroupwareprefs.h" #include "tderesources/egroupware/kcal_resourcexmlrpc.h" #include "tderesources/egroupware/knotes_egroupwareprefs.h" diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index de61328f..79e98268 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -20,7 +20,7 @@ #include "exchangewizard.h" -#include "tderesources/newexchange/kabc_resourceexchange.h" +#include "tderesources/newexchange/tdeabc_resourceexchange.h" #include "tderesources/newexchange/kcal_resourceexchange.h" #include "tderesources/lib/folderconfig.h" diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 71e89f49..52df469b 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -23,8 +23,8 @@ #include "groupwiseconfig.h" #include "kmailchanges.h" -#include "tderesources/groupwise/kabc_groupwiseprefs.h" -#include "tderesources/groupwise/kabc_resourcegroupwise.h" +#include "tderesources/groupwise/tdeabc_groupwiseprefs.h" +#include "tderesources/groupwise/tdeabc_resourcegroupwise.h" #include "tderesources/groupwise/kcal_groupwiseprefsbase.h" #include "tderesources/groupwise/kcal_resourcegroupwise.h" diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 64659726..8486a74f 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -21,8 +21,8 @@ #include "sloxwizard.h" #include "sloxconfig.h" -#include "tderesources/slox/kabcsloxprefs.h" -#include "tderesources/slox/kabcresourceslox.h" +#include "tderesources/slox/tdeabcsloxprefs.h" +#include "tderesources/slox/tdeabcresourceslox.h" #include "tderesources/slox/kcalsloxprefs.h" #include "tderesources/slox/kcalresourceslox.h" |