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

1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 622e70ad7..14ccaba02 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -137,7 +137,7 @@ static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd;
 //-----------------------------------------------------------------------------
 KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
                            KXMLGUIClient *aGUIClient,
-                           KActionCollection *actionCollection, KConfig* config ) :
+                           KActionCollection *actionCollection, TDEConfig* config ) :
     TQWidget(parent, name),
     mFavoritesCheckMailAction( 0 ),
     mFavoriteFolderView( 0 ),
@@ -287,8 +287,8 @@ void KMMainWidget::destruct()
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig(void)
 {
-  const KConfigGroup geometry( KMKernel::config(), "Geometry" );
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup geometry( KMKernel::config(), "Geometry" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
   mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide";
@@ -307,8 +307,8 @@ void KMMainWidget::readFolderConfig(void)
   if (!mFolder)
     return;
 
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   mFolderThreadPref = config->readBoolEntry( "threadMessagesOverride", false );
   mFolderThreadSubjPref = config->readBoolEntry( "threadMessagesBySubject", true );
   mFolderHtmlPref = config->readBoolEntry( "htmlMailOverride", false );
@@ -322,8 +322,8 @@ void KMMainWidget::writeFolderConfig(void)
   if (!mFolder)
     return;
 
-  KConfig *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   config->writeEntry( "threadMessagesOverride", mFolderThreadPref );
   config->writeEntry( "threadMessagesBySubject", mFolderThreadSubjPref );
   config->writeEntry( "htmlMailOverride", mFolderHtmlPref );
@@ -334,7 +334,7 @@ void KMMainWidget::writeFolderConfig(void)
 //-----------------------------------------------------------------------------
 void KMMainWidget::readConfig(void)
 {
-  KConfig *config = KMKernel::config();
+  TDEConfig *config = KMKernel::config();
 
   bool oldLongFolderList =  mLongFolderList;
   bool oldReaderWindowActive = mReaderWindowActive;
@@ -367,7 +367,7 @@ void KMMainWidget::readConfig(void)
   }
 
   { // area for config group "Geometry"
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     // size of the mainwin
     TQSize defaultSize(750,560);
     siz = config->readSizeEntry("MainWin", &defaultSize);
@@ -458,7 +458,7 @@ void KMMainWidget::readConfig(void)
   mFavoritesCheckMailAction->setEnabled( GlobalSettings::self()->enableFavoriteFolderView() );
 
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     mBeepOnNew = config->readBoolEntry("beep-on-mail", false);
     mConfirmEmpty = config->readBoolEntry("confirm-before-empty", true);
     // startup-Folder, defaults to system-inbox
@@ -515,8 +515,8 @@ void KMMainWidget::readConfig(void)
 void KMMainWidget::writeConfig(void)
 {
   TQString s;
-  KConfig *config = KMKernel::config();
-  KConfigGroup geometry( config, "Geometry" );
+  TDEConfig *config = KMKernel::config();
+  TDEConfigGroup geometry( config, "Geometry" );
 
   if (mMsgView)
     mMsgView->writeConfig();
@@ -1125,8 +1125,8 @@ void KMMainWidget::slotExpireFolder()
     KMessageBox::information(this, str);
     return;
   }
-  KConfig           *config = KMKernel::config();
-  KConfigGroupSaver saver(config, "General");
+  TDEConfig           *config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
     str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() ));
@@ -1319,10 +1319,10 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotExpireAll() {
-  KConfig    *config = KMKernel::config();
+  TDEConfig    *config = KMKernel::config();
   int        ret = 0;
 
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
 
   if (config->readBoolEntry("warn-before-expire", true)) {
     ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(),
@@ -1811,7 +1811,7 @@ void KMMainWidget::slotPrintMsg()
 
   bool htmlOverride = mMsgView ? mMsgView->htmlOverride() : false;
   bool htmlLoadExtOverride = mMsgView ? mMsgView->htmlLoadExtOverride() : false;
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
                                : reader.readBoolEntry( "useFixedFont", false );
 
@@ -2335,7 +2335,7 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg)
 
   assert( msg != 0 );
   KMReaderMainWin *win = new KMReaderMainWin( mFolderHtmlPref, mFolderHtmlLoadExtPref );
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
   bool useFixedFont = mMsgView ? mMsgView->isFixedFont()
                                : reader.readBoolEntry( "useFixedFont", false );
   win->setUseFixedFont( useFixedFont );