From 4ea1cac0cc7b392f1f8d867e5b1980a621288dfa Mon Sep 17 00:00:00 2001
From: Stefan Taferner <taferner@kde.org>
Date: Thu, 11 Jun 1998 21:00:29 +0000
Subject: [PATCH] Fixed a stupid bug I just commited ;-)

svn path=/trunk/kdenetwork/kmail/; revision=8160
---
 kmcomposewin.cpp | 7 +++----
 kmcomposewin.h   | 2 +-
 kmfilter.cpp     | 7 +------
 kmmsglist.cpp    | 5 -----
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 7c2e82049..e6bbfe127 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -197,7 +197,7 @@ KMComposeWin::~KMComposeWin()
 void KMComposeWin::readConfig(void)
 {
   KConfig *config = kapp->getConfig();
-  QString str, bodyFont;
+  QString str;
   int w, h;
 
   config->setGroup("Composer");
@@ -214,8 +214,7 @@ void KMComposeWin::readConfig(void)
   mAutoPgpSign = config->readNumEntry("pgp-auto-sign", 0);
 
   config->setGroup("Fonts");
-  bodyFont = config->readEntry("body-font", "helvetica");
-  mEditor->setFont(QFont(bodyFont));
+  mBodyFont = config->readEntry("body-font", "helvetica");
 
 #ifdef CHARSETS  
   m7BitAscii = config->readNumEntry("7bit-is-ascii",1);
@@ -647,7 +646,7 @@ void KMComposeWin::setupEditor(void)
 
 
   // Font setup
-
+  mEditor->setFont(QFont(mBodyFont));
 
   // Color setup
   if( mForeColor.isEmpty())
diff --git a/kmcomposewin.h b/kmcomposewin.h
index 08c7d0a4f..27e439a8f 100644
--- a/kmcomposewin.h
+++ b/kmcomposewin.h
@@ -295,7 +295,7 @@ protected:
   int mWordWrap;
   short mBtnIdSign, mBtnIdEncrypt;
   short mMnuIdUrgent, mMnuIdConfDeliver, mMnuIdConfRead;
-  QString mForeColor, mBackColor;
+  QString mForeColor, mBackColor, mBodyFont;
   QList<QLineEdit> mEdtList;
 #ifdef HAS_KSPELL
   KSpell* mKSpell;
diff --git a/kmfilter.cpp b/kmfilter.cpp
index 1acf484a6..9dc5a8c68 100644
--- a/kmfilter.cpp
+++ b/kmfilter.cpp
@@ -32,13 +32,8 @@ static int findInStrList(const char* strList[], const char* str)
   if (!str) return -1;
 
   for (i=0; strList[i]; i++)
-    if (strcasecmp(strList[i], str)==0) 
-    {
-      debug("findInStrList: %s is at %d", str, i);
-      return i;
-    }
+    if (strcasecmp(strList[i], str)==0) return i;
 
-  debug("findInStrList: %s not found", str);
   return -1;
 }
 
diff --git a/kmmsglist.cpp b/kmmsglist.cpp
index fa6b19118..f34ae9dae 100644
--- a/kmmsglist.cpp
+++ b/kmmsglist.cpp
@@ -4,11 +4,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-// we need this for sorting.
-static KMMsgList::SortField sortCriteria;
-static int* sortIndex;
-static KMMsgList* sortList;
-static bool sortDescending;
 
 //-----------------------------------------------------------------------------
 KMMsgList::KMMsgList(int initSize): KMMsgListInherited(initSize)