summaryrefslogtreecommitdiffstats
path: root/kioslave/ldap
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kioslave/ldap
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/ldap')
-rw-r--r--kioslave/ldap/kio_ldap.cpp2
-rw-r--r--kioslave/ldap/kio_ldap.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp
index fe958c35c..d4a29f1d4 100644
--- a/kioslave/ldap/kio_ldap.cpp
+++ b/kioslave/ldap/kio_ldap.cpp
@@ -24,7 +24,7 @@
#include "kio_ldap.h"
-using namespace KIO;
+using namespace TDEIO;
using namespace KABC;
extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
diff --git a/kioslave/ldap/kio_ldap.h b/kioslave/ldap/kio_ldap.h
index d262b61ea..4ee15ad2b 100644
--- a/kioslave/ldap/kio_ldap.h
+++ b/kioslave/ldap/kio_ldap.h
@@ -12,7 +12,7 @@
#include <ldap.h>
#include <kabc/ldapurl.h>
-class LDAPProtocol : public KIO::SlaveBase
+class LDAPProtocol : public TDEIO::SlaveBase
{
public:
LDAPProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app );
@@ -51,7 +51,7 @@ class LDAPProtocol : public KIO::SlaveBase
const TQByteArray &value, bool critical );
void addModOp( LDAPMod ***pmods, int mod_type,
const TQString &attr, const TQByteArray &value );
- void LDAPEntry2UDSEntry( const TQString &dn, KIO::UDSEntry &entry,
+ void LDAPEntry2UDSEntry( const TQString &dn, TDEIO::UDSEntry &entry,
const KABC::LDAPUrl &usrc, bool dir=false );
int asyncSearch( KABC::LDAPUrl &usrc );
@@ -59,7 +59,7 @@ class LDAPProtocol : public KIO::SlaveBase
void LDAPErr( const KURL &url, int err = LDAP_SUCCESS );
void changeCheck( KABC::LDAPUrl &url );
- void fillAuthInfo( KIO::AuthInfo &info );
+ void fillAuthInfo( TDEIO::AuthInfo &info );
};
#endif