Bye bye WhoField but need to implement whofield when empty

svn path=/trunk/KDE/kdepim/kmail/; revision=1139517

foldercollection.cpp

@@ -172,7 +172,6 @@ void FolderCollection::readConfig()
   mIdentity = configGroup.readEntry("Identity", defaultIdentity );
   slotIdentitiesChanged();
 
-  setUserWhoField( configGroup.readEntry( "WhoField" ), false );
   mPutRepliesInSameFolder = configGroup.readEntry( "PutRepliesInSameFolder", false );
   mHideInSelectionDialog = configGroup.readEntry( "HideInSelectionDialog", false );
   mIgnoreNewMail = configGroup.readEntry( "IgnoreNewMail", false );
@@ -231,7 +230,6 @@ void FolderCollection::writeConfig() const
   else
       configGroup.deleteEntry("Identity");
 
-  configGroup.writeEntry("WhoField", mUserWhoField);
   configGroup.writeEntry( "PutRepliesInSameFolder", mPutRepliesInSameFolder );
   configGroup.writeEntry( "HideInSelectionDialog", mHideInSelectionDialog );
   configGroup.writeEntry( "IgnoreNewMail", mIgnoreNewMail );
@@ -254,7 +252,7 @@ void FolderCollection::setShortcut( const KShortcut &sc, KMMainWidget *main )
   }
 }
 
-
+#if 0
 void FolderCollection::setUserWhoField( const QString& whoField, bool _writeConfig )
 {
   if ( mUserWhoField == whoField && !whoField.isEmpty() )
@@ -298,6 +296,7 @@ void FolderCollection::setUserWhoField( const QString& whoField, bool _writeConf
   //TODO fixme !!!
   emit viewConfigChanged();
 }
+#endif
 
 void FolderCollection::setUseDefaultIdentity( bool useDefaultIdentity )
 {

foldercollection.h

@@ -81,11 +81,6 @@ public:
 
   void setShortcut( const KShortcut&, KMMainWidget * );
 
-
-  /** Get / set the user-settings for the WhoField (From/To/Empty) */
-  QString userWhoField(void) { return mUserWhoField; }
-  void setUserWhoField(const QString &whoField,bool writeConfig=true);
-
   /** Get / set whether the default identity should be used instead of the
    *  identity specified by setIdentity(). */
   void setUseDefaultIdentity( bool useDefaultIdentity );
@@ -240,8 +235,6 @@ private:
 
   /** Should new mail in this folder be ignored? */
   bool mIgnoreNewMail;
-  /** name of the field that is used for "From" in listbox */
-  QString mWhoField, mUserWhoField;
 
   /** Should replies to messages in this folder be put in here? */
   bool mPutRepliesInSameFolder;