From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:37:21 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kmail/kmheaders.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'kmail/kmheaders.cpp')

diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index bfe87194..8e142c91 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -426,9 +426,9 @@ bool KMHeaders::event(TQEvent *e)
 //-----------------------------------------------------------------------------
 void KMHeaders::readColorConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   // Custom/System colors
-  KConfigGroupSaver saver(config, "Reader");
+  TDEConfigGroupSaver saver(config, "Reader");
   TQColor c1=TQColor(kapp->palette().active().text());
   TQColor c2=TQColor("red");
   TQColor c3=TQColor("blue");
@@ -468,11 +468,11 @@ void KMHeaders::readColorConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::readConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
   // Backing pixmap support
   { // area for config group "Pixmaps"
-    KConfigGroupSaver saver(config, "Pixmaps");
+    TDEConfigGroupSaver saver(config, "Pixmaps");
     TQString pixmapFile = config->readEntry("Headers");
     mPaintInfo.pixmapOn = false;
     if (!pixmapFile.isEmpty()) {
@@ -482,7 +482,7 @@ void KMHeaders::readConfig (void)
   }
 
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "General");
+    TDEConfigGroupSaver saver(config, "General");
     bool show = config->readBoolEntry("showMessageSize");
     slotToggleColumn(KPaintInfo::COL_SIZE, show);
 
@@ -530,7 +530,7 @@ void KMHeaders::readConfig (void)
 
   // Custom/System fonts
   { // area for config group "General"
-    KConfigGroupSaver saver(config, "Fonts");
+    TDEConfigGroupSaver saver(config, "Fonts");
     if (!(config->readBoolEntry("defaultFonts",true)))
     {
       TQFont listFont( TDEGlobalSettings::generalFont() );
@@ -551,13 +551,13 @@ void KMHeaders::readConfig (void)
 
   // Behavior
   {
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     mReaderWindowActive = config->readEntry( "readerWindowMode", "below" ) != "hide";
   }
 }
 
 //-----------------------------------------------------------------------------
-void KMHeaders::restoreColumnLayout( KConfig *config, const TQString &group )
+void KMHeaders::restoreColumnLayout( TDEConfig *config, const TQString &group )
 {
   // KListView::restoreLayout() will call setSorting(), which is reimplemented by us.
   // We don't want to change the sort order, so we set a flag here that is checked in
@@ -591,8 +591,8 @@ void KMHeaders::refreshNestedState(void)
 {
   bool oldState = isThreaded();
   NestingPolicy oldNestPolicy = nestingPolicy;
-  KConfig* config = KMKernel::config();
-  KConfigGroupSaver saver(config, "Geometry");
+  TDEConfig* config = KMKernel::config();
+  TDEConfigGroupSaver saver(config, "Geometry");
   mNested = config->readBoolEntry( "nestedMessages", false );
 
   nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
@@ -609,9 +609,9 @@ void KMHeaders::refreshNestedState(void)
 void KMHeaders::readFolderConfig (void)
 {
   if (!mFolder) return;
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
 
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   mNestedOverride = config->readBoolEntry( "threadMessagesOverride", false );
   mSortCol = config->readNumEntry("SortColumn", mSortCol+1 /* inited to  date column */);
   mSortDescending = (mSortCol < 0);
@@ -625,7 +625,7 @@ void KMHeaders::readFolderConfig (void)
   mPaintInfo.status = config->readBoolEntry( "Status", false );
 
   { //area for config group "Geometry"
-    KConfigGroupSaver saver(config, "Geometry");
+    TDEConfigGroupSaver saver(config, "Geometry");
     mNested = config->readBoolEntry( "nestedMessages", false );
     nestingPolicy = (NestingPolicy)config->readNumEntry( "nestingPolicy", OpenUnread );
   }
@@ -639,10 +639,10 @@ void KMHeaders::readFolderConfig (void)
 void KMHeaders::writeFolderConfig (void)
 {
   if (!mFolder) return;
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   int mSortColAdj = mSortCol + 1;
 
-  KConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
+  TDEConfigGroupSaver saver(config, "Folder-" + mFolder->idString());
   config->writeEntry("SortColumn", (mSortDescending ? -mSortColAdj : mSortColAdj));
   config->writeEntry("Top", topItemIndex());
   config->writeEntry("Current", currentItemIndex());
@@ -659,9 +659,9 @@ void KMHeaders::writeFolderConfig (void)
 //-----------------------------------------------------------------------------
 void KMHeaders::writeConfig (void)
 {
-  KConfig* config = KMKernel::config();
+  TDEConfig* config = KMKernel::config();
   saveLayout(config, "Header-Geometry");
-  KConfigGroupSaver saver(config, "General");
+  TDEConfigGroupSaver saver(config, "General");
   config->writeEntry("showMessageSize"         , mPaintInfo.showSize);
   config->writeEntry("showAttachmentColumn"    , mPaintInfo.showAttachment);
   config->writeEntry("showInvitationColumn"    , mPaintInfo.showInvitation);
-- 
cgit v1.2.3