11 files changed, 52 insertions, 52 deletions
diff --git a/kabc/plugins/CMakeLists.txt b/kabc/plugins/CMakeLists.txt
index 019afd842..597486816 100644
--- a/kabc/plugins/CMakeLists.txt
+++ b/kabc/plugins/CMakeLists.txt
@@ -12,4 +12,4 @@
 add_subdirectory( file )
 add_subdirectory( dir )
 add_subdirectory( net )
-add_subdirectory( ldapkio )
+add_subdirectory( ldaptdeio )
diff --git a/kabc/plugins/Makefile.am b/kabc/plugins/Makefile.am
index 5a5dcb137..bdedbec0f 100644
--- a/kabc/plugins/Makefile.am
+++ b/kabc/plugins/Makefile.am
@@ -1 +1 @@
-SUBDIRS = file dir net ldapkio
+SUBDIRS = file dir net ldaptdeio
diff --git a/kabc/plugins/ldapkio/Makefile.am b/kabc/plugins/ldapkio/Makefile.am
deleted file mode 100644
index a9803f650..000000000
--- a/kabc/plugins/ldapkio/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = resourceldapkioconfig.h
-
-lib_LTLIBRARIES = libkabc_ldapkio.la
-libkabc_ldapkio_la_SOURCES = resourceldapkio.cpp resourceldapkioconfig.cpp
-libkabc_ldapkio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_ldapkio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_ldapkio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
-
-kde_module_LTLIBRARIES = kabc_ldapkio.la
-kabc_ldapkio_la_SOURCES = resourceldapkioplugin.cpp
-kabc_ldapkio_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_ldapkio_la_LIBADD	= libkabc_ldapkio.la $(LIB_QT) $(LIB_TDECORE)
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kabc_ldapkio.pot
-
-kabcincludedir = $(includedir)/kabc
-kabcinclude_HEADERS = resourceldapkio.h
-
-servicedir = $(kde_servicesdir)/tderesources/kabc
-service_DATA = ldapkio.desktop
-
-resourceldapkioplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/ldapkio/CMakeLists.txt b/kabc/plugins/ldaptdeio/CMakeLists.txt
index 0869c54e1..75098cc9d 100644
--- a/kabc/plugins/ldapkio/CMakeLists.txt
+++ b/kabc/plugins/ldaptdeio/CMakeLists.txt
@@ -33,21 +33,21 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    resourceldapkio.h
+    resourceldaptdeio.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
 
 
 ##### other data ################################
 
-install( FILES ldapkio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
+install( FILES ldaptdeio.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc )
 
 
-##### kabc_ldapkio ##############################
+##### kabc_ldaptdeio ##############################
 
-set( target kabc_ldapkio )
+set( target kabc_ldaptdeio )
 
 set( ${target}_SRCS
-  resourceldapkio.cpp resourceldapkioconfig.cpp
+  resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
@@ -58,12 +58,12 @@ tde_add_library( ${target} SHARED AUTOMOC
 )
 
 
-##### kabc_ldapkio ##############################
+##### kabc_ldaptdeio ##############################
 
-set( target kabc_ldapkio )
+set( target kabc_ldaptdeio )
 
 set( ${target}_SRCS
-  resourceldapkioplugin.cpp
+  resourceldaptdeioplugin.cpp
 )
 
 tde_add_kpart( ${target}
diff --git a/kabc/plugins/ldaptdeio/Makefile.am b/kabc/plugins/ldaptdeio/Makefile.am
new file mode 100644
index 000000000..9c2d31ad7
--- /dev/null
+++ b/kabc/plugins/ldaptdeio/Makefile.am
@@ -0,0 +1,28 @@
+INCLUDES = -I$(top_srcdir)/kabc -I$(top_builddir)/kabc $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS = resourceldaptdeioconfig.h
+
+lib_LTLIBRARIES = libkabc_ldaptdeio.la
+libkabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
+libkabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
+libkabc_ldaptdeio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+
+kde_module_LTLIBRARIES = kabc_ldaptdeio.la
+kabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp
+kabc_ldaptdeio_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
+kabc_ldaptdeio_la_LIBADD	= libkabc_ldaptdeio.la $(LIB_QT) $(LIB_TDECORE)
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kabc_ldaptdeio.pot
+
+kabcincludedir = $(includedir)/kabc
+kabcinclude_HEADERS = resourceldaptdeio.h
+
+servicedir = $(kde_servicesdir)/tderesources/kabc
+service_DATA = ldaptdeio.desktop
+
+resourceldaptdeioplugin.lo: ../../addressee.h
diff --git a/kabc/plugins/ldapkio/ldapkio.desktop b/kabc/plugins/ldaptdeio/ldaptdeio.desktop
index e70bf9c9d..9bcd13337 100644
--- a/kabc/plugins/ldapkio/ldapkio.desktop
+++ b/kabc/plugins/ldaptdeio/ldaptdeio.desktop
@@ -3,8 +3,8 @@ Name=LDAP
 Name[bn]=এল-ডি-এ-পি (LDAP)
 Name[hi]=एलडीएपी (LDAP)
 Name[te]=ఎల్డిఏపి
-X-TDE-Library=kabc_ldapkio
+X-TDE-Library=kabc_ldaptdeio
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=contact
-X-TDE-ResourceType=ldapkio
+X-TDE-ResourceType=ldaptdeio
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index 034fb0ef8..b28289ecb 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -38,8 +38,8 @@
 #include <kabc/ldif.h>
 #include <kabc/ldapurl.h>
 
-#include "resourceldapkio.h"
-#include "resourceldapkioconfig.h"
+#include "resourceldaptdeio.h"
+#include "resourceldaptdeioconfig.h"
 
 using namespace KABC;
 
@@ -110,7 +110,7 @@ ResourceLDAPTDEIO::ResourceLDAPTDEIO( const TDEConfig *config )
     d->mCachePolicy = Cache_No;
     d->mAutoCache = true;
   }
-  d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldapkio") + "/" +
+  d->mCacheDst = TDEGlobal::dirs()->saveLocation("cache", "ldaptdeio") + "/" +
     type() + "_" + identifier();
   init(); 
 }
@@ -414,7 +414,7 @@ void ResourceLDAPTDEIO::init()
 
   d->mReadOnly = readOnly();
 
-  kdDebug(7125) << "resource_ldapkio url: " << d->mLDAPUrl.prettyURL() << endl;
+  kdDebug(7125) << "resource_ldaptdeio url: " << d->mLDAPUrl.prettyURL() << endl;
 }
 
 void ResourceLDAPTDEIO::writeConfig( TDEConfig *config )
@@ -1038,4 +1038,4 @@ TQString ResourceLDAPTDEIO::cacheDst() const
 }    
 
 
-#include "resourceldapkio.moc"
+#include "resourceldaptdeio.moc"
diff --git a/kabc/plugins/ldapkio/resourceldapkio.h b/kabc/plugins/ldaptdeio/resourceldaptdeio.h
index 5c9282b9c..5c9282b9c 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.h
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeio.h
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index b517cffa5..a8060c17a 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -38,10 +38,10 @@
 #include <kmessagebox.h>
 #include <tdeio/netaccess.h>
 
-#include "resourceldapkio.h"
+#include "resourceldaptdeio.h"
 
-#include "resourceldapkioconfig.h"
-#include "resourceldapkioconfig.moc"
+#include "resourceldaptdeioconfig.h"
+#include "resourceldaptdeioconfig.moc"
 
 using namespace KABC;
 
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index 0fde41d64..0fde41d64 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
diff --git a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp b/kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index 6d928412d..ac08e8e2b 100644
--- a/kabc/plugins/ldapkio/resourceldapkioplugin.cpp
+++ b/kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "resourceldapkio.h"
-#include "resourceldapkioconfig.h"
+#include "resourceldaptdeio.h"
+#include "resourceldaptdeioconfig.h"
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -28,9 +28,9 @@ using namespace KABC;
 
 extern "C"
 {
-  KDE_EXPORT void *init_kabc_ldapkio()
+  KDE_EXPORT void *init_kabc_ldaptdeio()
   {
-    TDEGlobal::locale()->insertCatalogue("kabc_ldapkio");
+    TDEGlobal::locale()->insertCatalogue("kabc_ldaptdeio");
     return new KRES::PluginFactory<ResourceLDAPTDEIO, ResourceLDAPTDEIOConfig>();
   }
 }