summaryrefslogtreecommitdiffstats
path: root/libtdepim/ldapclient.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:21 -0600
commit86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch)
tree97d3ac2c2f60780d9a1de4f82caac7cb27534501 /libtdepim/ldapclient.cpp
parenta9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff)
downloadtdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz
tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/ldapclient.cpp')
-rw-r--r--libtdepim/ldapclient.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 1bebe3350..9f1a6fd8e 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -44,8 +44,8 @@
using namespace KPIM;
-KConfig *KPIM::LdapSearch::s_config = 0L;
-static KStaticDeleter<KConfig> configDeleter;
+TDEConfig *KPIM::LdapSearch::s_config = 0L;
+static KStaticDeleter<TDEConfig> configDeleter;
TQString LdapObject::toString() const
{
@@ -136,12 +136,12 @@ void LdapClient::startQuery( const TQString& filter )
startParseLDIF();
mActive = true;
- mJob = KIO::get( url, false, false );
- connect( mJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
- this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
- connect( mJob, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
- connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ mJob = TDEIO::get( url, false, false );
+ connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( slotDone() ) );
}
@@ -155,12 +155,12 @@ void LdapClient::cancelQuery()
mActive = false;
}
-void LdapClient::slotData( KIO::Job*, const TQByteArray& data )
+void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
{
parseLDIF( data );
}
-void LdapClient::slotInfoMessage( KIO::Job*, const TQString & )
+void LdapClient::slotInfoMessage( TDEIO::Job*, const TQString & )
{
//tqDebug("Job said \"%s\"", info.latin1());
}
@@ -175,7 +175,7 @@ void LdapClient::slotDone()
}
#endif
int err = mJob->error();
- if ( err && err != KIO::ERR_USER_CANCELED ) {
+ if ( err && err != TDEIO::ERR_USER_CANCELED ) {
emit error( mJob->errorString() );
}
emit done();
@@ -274,7 +274,7 @@ void LdapClient::setCompletionWeight( int weight )
mCompletionWeight = weight;
}
-void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool active )
+void LdapSearch::readConfig( LdapServer &server, TDEConfig *config, int j, bool active )
{
TQString prefix;
if ( active ) prefix = "Selected";
@@ -309,7 +309,7 @@ void LdapSearch::readConfig( LdapServer &server, KConfig *config, int j, bool ac
server.setMech( config->readEntry( prefix + TQString( "Mech%1" ).arg( j ) ) );
}
-void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j, bool active )
+void LdapSearch::writeConfig( const LdapServer &server, TDEConfig *config, int j, bool active )
{
TQString prefix;
if ( active ) prefix = "Selected";
@@ -327,10 +327,10 @@ void LdapSearch::writeConfig( const LdapServer &server, KConfig *config, int j,
config->writeEntry( prefix + TQString( "Mech%1" ).arg( j ), server.mech() );
}
-KConfig* LdapSearch::config()
+TDEConfig* LdapSearch::config()
{
if ( !s_config )
- configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
+ configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals
return s_config;
}
@@ -349,7 +349,7 @@ LdapSearch::LdapSearch()
TQT_SLOT(slotFileChanged(const TQString&)));
}
-void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int clientNumber )
+void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber )
{
const int completionWeight = config->readNumEntry( TQString( "SelectedCompletionWeight%1" ).arg( clientNumber ), -1 );
if ( completionWeight != -1 )
@@ -358,7 +358,7 @@ void LdapSearch::readWeighForClient( LdapClient *client, KConfig *config, int cl
void LdapSearch::updateCompletionWeights()
{
- KConfig *config = KPIM::LdapSearch::config();
+ TDEConfig *config = KPIM::LdapSearch::config();
config->setGroup( "LDAP" );
for ( uint i = 0; i < mClients.size(); i++ ) {
readWeighForClient( mClients[i], config, i );
@@ -374,7 +374,7 @@ void LdapSearch::readConfig()
mClients.clear();
// stolen from KAddressBook
- KConfig *config = KPIM::LdapSearch::config();
+ TDEConfig *config = KPIM::LdapSearch::config();
config->setGroup( "LDAP" );
int numHosts = config->readUnsignedNumEntry( "NumSelectedHosts");
if ( !numHosts ) {