From 5942d965c8fb73b53495797b81286c182f7e6328 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:25:21 -0600 Subject: Rename KABC namespace --- tdeioslave/ldap/Makefile.am | 2 +- tdeioslave/ldap/tdeio_ldap.cpp | 2 +- tdeioslave/ldap/tdeio_ldap.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tdeioslave/ldap') diff --git a/tdeioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am index 3f71b669b..f21902229 100644 --- a/tdeioslave/ldap/Makefile.am +++ b/tdeioslave/ldap/Makefile.am @@ -10,7 +10,7 @@ LDADD = $(LIB_KIO) $(LDAP_LIBS) kde_module_LTLIBRARIES = tdeio_ldap.la tdeio_ldap_la_SOURCES = tdeio_ldap.cpp -tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC) +tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_TDEABC) tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN) noinst_HEADERS = tdeio_ldap.h diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 29fc24905..b61c2af74 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -25,7 +25,7 @@ #include "tdeio_ldap.h" using namespace TDEIO; -using namespace KABC; +using namespace TDEABC; extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } diff --git a/tdeioslave/ldap/tdeio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h index dfab32a71..e39090481 100644 --- a/tdeioslave/ldap/tdeio_ldap.h +++ b/tdeioslave/ldap/tdeio_ldap.h @@ -52,12 +52,12 @@ class LDAPProtocol : public TDEIO::SlaveBase void addModOp( LDAPMod ***pmods, int mod_type, const TQString &attr, const TQByteArray &value ); void LDAPEntry2UDSEntry( const TQString &dn, TDEIO::UDSEntry &entry, - const KABC::LDAPUrl &usrc, bool dir=false ); - int asyncSearch( KABC::LDAPUrl &usrc ); + const TDEABC::LDAPUrl &usrc, bool dir=false ); + int asyncSearch( TDEABC::LDAPUrl &usrc ); TQCString LDAPEntryAsLDIF( LDAPMessage *msg ); void LDAPErr( const KURL &url, int err = LDAP_SUCCESS ); - void changeCheck( KABC::LDAPUrl &url ); + void changeCheck( TDEABC::LDAPUrl &url ); void fillAuthInfo( TDEIO::AuthInfo &info ); }; -- cgit v1.2.1