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

1 files changed, 12 insertions, 12 deletions

diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp
index 56c18afe9..4926678ed 100644
--- a/wizards/scalixkmailchanges.cpp
+++ b/wizards/scalixkmailchanges.cpp
@@ -30,7 +30,7 @@
 
 class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
 {
-  void writeFolder( KConfig &c, int id )
+  void writeFolder( TDEConfig &c, int id )
   {
     c.setGroup( "IMAP Resource" );
     c.writeEntry( "TheIMAPResourceAccount", id );
@@ -40,65 +40,65 @@ class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
   void writeIds( int, int ) {}
 };
 
-void createKMailChanges( KConfigPropagator::Change::List& changes )
+void createKMailChanges( TDEConfigPropagator::Change::List& changes )
 {
-  KConfigPropagator::ChangeConfig *c = new KConfigPropagator::ChangeConfig;
+  TDEConfigPropagator::ChangeConfig *c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "Enabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "AutoAccept";
   c->value = "false";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "AutoDeclConflict";
   c->value = "false";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "LegacyMangleFromToHeaders";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "Groupware";
   c->name = "LegacyBodyInvites";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Enabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "TheIMAPResourceEnabled";
   c->value = "true";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "TheIMAPResourceStorageFormat";
   c->value = "IcalVcard";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Folder Language";
@@ -106,7 +106,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes )
   changes.append( c );
 
   // Don't show the account wizard as we created an account already
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "AccountWizard";
   c->name = "ShowOnStartup";