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

1 files changed, 12 insertions, 12 deletions

diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp
index a77de303..0adfc46b 100644
--- a/wizards/kolabkmailchanges.cpp
+++ b/wizards/kolabkmailchanges.cpp
@@ -30,7 +30,7 @@
 
 class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter
 {
-  void writeFolder( KConfig &c, int id )
+  void writeFolder( TDEConfig &c, int id )
   {
     c.setGroup( "IMAP Resource" );
     c.writeEntry( "TheIMAPResourceAccount", id );
@@ -39,65 +39,65 @@ class KolabCustomWriter : 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 = KolabConfig::self()->kolab1Legacy() ? "IcalVcard" : "XML";
   changes.append( c );
 
-  c = new KConfigPropagator::ChangeConfig;
+  c = new TDEConfigPropagator::ChangeConfig;
   c->file = "kmailrc";
   c->group = "IMAP Resource";
   c->name = "Folder Language";
@@ -123,7 +123,7 @@ void createKMailChanges( KConfigPropagator::Change::List& changes )
     user = email = user+"@"+KolabConfig::self()->server();
 
   if ( KolabConfig::self()->useOnlineForNonGroupware() ) {
-    c = new KConfigPropagator::ChangeConfig;
+    c = new TDEConfigPropagator::ChangeConfig;
     c->file = "kmailrc";
     c->group = "IMAP Resource";
     c->name = "ShowOnlyGroupwareFoldersForGroupwareAccount";