Fix FTBFS

6 files changed, 26 insertions, 26 deletions

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 )