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

1 files changed, 7 insertions, 7 deletions

diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index abf480c99..fbafbc1b5 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -1073,7 +1073,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
   // pretend the folder just changed back to the mail type, which
   // does the right thing, namely remove resource
   folderContentsTypeChanged( folder, KMail::ContentsTypeMail );
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.deleteEntry( folder->idString() + "-storageFormat" );
   configGroup.deleteEntry( folder->idString() + "-changes" );
 }
@@ -1493,7 +1493,7 @@ void KMailICalIfaceImpl::setStorageFormat( KMFolder* folder, StorageFormat forma
     FolderInfo info( format, NoChange );
     mFolderInfoMap.insert( folder, info );
   }
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.writeEntry( folder->idString() + "-storageFormat",
                           format == StorageXML ? "xml" : "icalvcard" );
 }
@@ -1506,13 +1506,13 @@ void KMailICalIfaceImpl::addFolderChange( KMFolder* folder, FolderChanges change
   } else { // Otherwise, well, it's a folder we don't care about.
     kdDebug(5006) << "addFolderChange: nothing known about folder " << folder->location() << endl;
   }
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   configGroup.writeEntry( folder->idString() + "-changes", (*it).mChanges );
 }
 
 KMailICalIfaceImpl::FolderInfo KMailICalIfaceImpl::readFolderInfo( const KMFolder * const folder ) const
 {
-  KConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
+  TDEConfigGroup configGroup( kmkernel->config(), "GroupwareFolderInfo" );
   TQString str = configGroup.readEntry( folder->idString() + "-storageFormat", "unset" );
   FolderInfo info;
   if ( str == "unset" ) {
@@ -1591,7 +1591,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
   kdDebug() << "Triggering PFB update for " << folderURL << " : getting " << httpURL << endl;
   // "Fire and forget". No need for error handling, nor for explicit deletion.
   // Maybe we should try to prevent launching it if it's already running (for this URL) though.
-  /*KIO::Job* job =*/ KIO::get( httpURL, false, false /*no progress info*/ );
+  /*TDEIO::Job* job =*/ TDEIO::get( httpURL, false, false /*no progress info*/ );
 }
 
 void KMailICalIfaceImpl::slotFolderPropertiesChanged( KMFolder* folder )
@@ -1660,7 +1660,7 @@ void KMailICalIfaceImpl::changeResourceUIName( const TQString &folderPath, const
   if ( f ) {
     KMailICalIfaceImpl::getResourceMap()->insert( folderPath, newName );
     kmkernel->folderMgr()->renameFolder( f, newName );
-    KConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
+    TDEConfigGroup configGroup( kmkernel->config(), "Resource UINames" );
     configGroup.writeEntry( folderPath, newName );
   }
 }
@@ -1950,7 +1950,7 @@ void KMailICalIfaceImpl::readConfig()
     subresourceAdded( folderContentsType( KMail::ContentsTypeNote ), mNotes->location(), mNotes->label(), true, false );
   }
 
-  KConfig *config = kmkernel->config();
+  TDEConfig *config = kmkernel->config();
   config->setGroup("Resource UINames");
   *KMailICalIfaceImpl::mSubResourceUINamesMap =  config->entryMap( "Resource UINames" );