Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 23 insertions, 23 deletions

diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 52f72296f..279491c5f 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -28,7 +28,7 @@ Settings* Settings::mSelf = 0;
 
 Settings::Settings()
 {
-  mSlave = KIO::Scheduler::getConnectedSlave( accountUrl(),
+  mSlave = TDEIO::Scheduler::getConnectedSlave( accountUrl(),
                                               accountData() );
 }
 
@@ -44,12 +44,12 @@ Settings* Settings::self()
   return mSelf;
 }
 
-KIO::MetaData Settings::accountData() const
+TDEIO::MetaData Settings::accountData() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Account" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Account" );
 
-  KIO::MetaData data;
+  TDEIO::MetaData data;
   data.insert( "auth", group.readEntry( "auth" ) );
   data.insert( "tls", group.readBoolEntry( "use-tls" ) ? "on" : "off" );
 
@@ -58,8 +58,8 @@ KIO::MetaData Settings::accountData() const
 
 KURL Settings::accountUrl() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Account" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Account" );
 
   KURL url;
   url.setProtocol( group.readBoolEntry( "use-ssl" ) ? "imaps" : "imap" );
@@ -73,25 +73,25 @@ KURL Settings::accountUrl() const
 
 TQString Settings::accountPassword() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Account" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Account" );
 
   return KStringHandler::obscure( group.readEntry( "pass" ) );
 }
 
-KIO::Slave* Settings::globalSlave() const
+TDEIO::Slave* Settings::globalSlave() const
 {
   return mSlave;
 }
 
 TQString Settings::rulesWizardUrl() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "Misc" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "Misc" );
 
   TQString url = group.readEntry( "rulesWizardUrl" );
   if ( url.isEmpty() ) {
-    KConfigGroup group( &config, "Account" );
+    TDEConfigGroup group( &config, "Account" );
     url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
                                                        .arg( group.readEntry( "user" ) );
   }
@@ -101,36 +101,36 @@ TQString Settings::rulesWizardUrl() const
 
 TQString Settings::ldapHost() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "host" );
 }
 
 TQString Settings::ldapPort() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "port" );
 }
 
 TQString Settings::ldapBase() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "base" );
 }
 
 TQString Settings::ldapBindDn() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "bindDn" );
 }
 
 TQString Settings::ldapPassword() const
 {
-  KConfig config( "scalixadminrc" );
-  KConfigGroup group( &config, "LDAP" );
+  TDEConfig config( "scalixadminrc" );
+  TDEConfigGroup group( &config, "LDAP" );
   return group.readEntry( "password" );
 }