Fix FTBFS

6 files changed, 36 insertions, 36 deletions

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