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

1 files changed, 16 insertions, 16 deletions

diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp
index f7be16a64..f6acd0e51 100644
--- a/wizards/scalixwizard.cpp
+++ b/wizards/scalixwizard.cpp
@@ -48,11 +48,11 @@
 
 #include <unistd.h>
 
-class SetupLDAPSearchAccount : public KConfigPropagator::Change
+class SetupLDAPSearchAccount : public TDEConfigPropagator::Change
 {
   public:
     SetupLDAPSearchAccount()
-      : KConfigPropagator::Change( i18n("Setup LDAP Search Account") )
+      : TDEConfigPropagator::Change( i18n("Setup LDAP Search Account") )
     {
     }
 
@@ -63,13 +63,13 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
       TQString basedn( "o=Scalix" );
 
       { // while we're here, write default domain
-        KConfig c( "kmailrc" );
+        TDEConfig c( "kmailrc" );
         c.setGroup( "General" );
         c.writeEntry( "Default domain", basedn );
       }
 
       // Set the changes
-      KConfig c( "kabldaprc" );
+      TDEConfig c( "kabldaprc" );
       c.setGroup( "LDAP" );
       bool hasMyServer = false;
       uint selHosts = c.readNumEntry("NumSelectedHosts", 0);
@@ -86,17 +86,17 @@ class SetupLDAPSearchAccount : public KConfigPropagator::Change
 
 };
 
-class SetupScalixAdmin : public KConfigPropagator::Change
+class SetupScalixAdmin : public TDEConfigPropagator::Change
 {
   public:
     SetupScalixAdmin()
-      : KConfigPropagator::Change( i18n( "Setup ScalixAdmin Account" ) )
+      : TDEConfigPropagator::Change( i18n( "Setup ScalixAdmin Account" ) )
     {
     }
 
     void apply()
     {
-      KConfig c( "scalixadminrc" );
+      TDEConfig c( "scalixadminrc" );
       c.setGroup( "Account" );
 
       c.writeEntry( "user", ScalixConfig::self()->user() );
@@ -149,11 +149,11 @@ class SetupScalixAdmin : public KConfigPropagator::Change
     }
 };
 
-class CreateCalendarImapResource : public KConfigPropagator::Change
+class CreateCalendarImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateCalendarImapResource()
-      : KConfigPropagator::Change( i18n("Create Calendar IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Calendar IMAP Resource") )
     {
     }
 
@@ -169,11 +169,11 @@ class CreateCalendarImapResource : public KConfigPropagator::Change
     }
 };
 
-class CreateContactImapResource : public KConfigPropagator::Change
+class CreateContactImapResource : public TDEConfigPropagator::Change
 {
   public:
     CreateContactImapResource()
-      : KConfigPropagator::Change( i18n("Create Contact IMAP Resource") )
+      : TDEConfigPropagator::Change( i18n("Create Contact IMAP Resource") )
     {
     }
 
@@ -190,11 +190,11 @@ class CreateContactImapResource : public KConfigPropagator::Change
 
 };
 
-class SynchronizeScalixAccount : public KConfigPropagator::Change
+class SynchronizeScalixAccount : public TDEConfigPropagator::Change
 {
   public:
     SynchronizeScalixAccount()
-      : KConfigPropagator::Change( i18n("Synchronize Scalix Account") )
+      : TDEConfigPropagator::Change( i18n("Synchronize Scalix Account") )
     {
     }
 
@@ -238,11 +238,11 @@ class SynchronizeScalixAccount : public KConfigPropagator::Change
 };
 
 
-class ScalixPropagator : public KConfigPropagator
+class ScalixPropagator : public TDEConfigPropagator
 {
   public:
     ScalixPropagator()
-      : KConfigPropagator( ScalixConfig::self(), "scalix.kcfg" )
+      : TDEConfigPropagator( ScalixConfig::self(), "scalix.kcfg" )
     {
     }
 
@@ -360,7 +360,7 @@ class ScalixPropagator : public KConfigPropagator
     }
 };
 
-ScalixWizard::ScalixWizard() : KConfigWizard( new ScalixPropagator )
+ScalixWizard::ScalixWizard() : TDEConfigWizard( new ScalixPropagator )
 {
   TQFrame *page = createWizardPage( i18n("Scalix Server") );