diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/ldap | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/ldap')
| -rw-r--r-- | tdeioslave/ldap/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeioslave/ldap/tdeio_ldap.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/ldap/tdeio_ldap.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdeioslave/ldap/CMakeLists.txt b/tdeioslave/ldap/CMakeLists.txt index d05048e0d..f32c3132a 100644 --- a/tdeioslave/ldap/CMakeLists.txt +++ b/tdeioslave/ldap/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} tde_add_kpart( tdeio_ldap AUTOMOC SOURCES tdeio_ldap.cpp - LINK kabc-shared ${LDAP_LIBRARIES} + LINK tdeabc-shared ${LDAP_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 2e22e6994..29fc24905 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #ifdef HAVE_SASL_SASL_H //prefer libsasl2 #include <sasl/sasl.h> @@ -20,7 +20,7 @@ #include <sasl.h> #endif #endif -#include <kabc/ldif.h> +#include <tdeabc/ldif.h> #include "tdeio_ldap.h" diff --git a/tdeioslave/ldap/tdeio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h index f3bd61fe5..dfab32a71 100644 --- a/tdeioslave/ldap/tdeio_ldap.h +++ b/tdeioslave/ldap/tdeio_ldap.h @@ -10,7 +10,7 @@ #define LDAP_DEPRECATED 1 /* Needed for ldap_simple_bind_s with openldap >= 2.3.x */ #include <lber.h> #include <ldap.h> -#include <kabc/ldapurl.h> +#include <tdeabc/ldapurl.h> class LDAPProtocol : public TDEIO::SlaveBase { |