Fix FTBFS

6 files changed, 20 insertions, 20 deletions

diff --git a/tderesources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt
index 10f70301..47d6dc70 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 48d0c0f6..ee8a47f1 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 49e1f368..93db76b3 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 97e2bbeb..f9082cd3 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 39570ad2..9bdec6e5 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 6c7b0352..5f97225d 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