Use KMFolderTree::createFolderList() in KMScoringManager::getGroups()

svn path=/trunk/kdenetwork/kmail/; revision=92913

configuredialog.cpp

@@ -1009,6 +1009,7 @@ void ConfigureDialog::makeAppearancePage( void )
   KScoringRulesConfig* ksc =
       new KScoringRulesConfig(KMScoringManager::globalScoringManager(),
                               false, page6);
+  KMScoringManager::globalScoringManager()->setMainWin(parent());
   vlay->addWidget( ksc );
 
 }

kmscoring.cpp

@@ -2,9 +2,9 @@
 
 #include <kdebug.h>
 
+#include "kmmainwin.h"
 #include "kmmessage.h"
-#include "kmfoldermgr.h"
-#include "kmkernel.h"
+#include "kmfoldertree.h"
 #include "kmscoring.h"
 
 KMScorableArticle::KMScorableArticle(const QString &msg)
@@ -80,7 +80,8 @@ KMScorableGroup::~KMScorableGroup()
 //////////////////////////////
 
 KMScoringManager::KMScoringManager()
-    : mConfDialog(0)
+  : mConfDialog(0),
+    mMainWin(0)
 {
 }
 
@@ -90,13 +91,28 @@ KMScoringManager::~KMScoringManager()
 
 class KMFolder;
 
+void
+KMScoringManager::setMainWin(QObject *parent)
+{
+  mMainWin = dynamic_cast<KMMainWin*>(parent);
+  if (!mMainWin) {
+    kdDebug() << "KMScoringManager::setMainWin() : mMainWin == 0" << endl;
+  }
+}
+
+
 QStringList
 KMScoringManager::getGroups() const
 {
   QValueList<QGuardedPtr<KMFolder> > dummy;
     
   QStringList res;
-  kernel->folderMgr()->createFolderList( &res, &dummy );
+
+  if (mMainWin) {
+    KMFolderTree *tree = mMainWin->folderTree();
+    if (tree)
+      tree->createFolderList( &res, &dummy );
+  }
   
   return res;
 }

kmscoring.h

@@ -19,6 +19,8 @@
 #include <qmap.h>
 #include <kscoring.h>
 
+class QWidget;
+class KMMainWin;
 class KDialogBase;
 
 class KMScorableArticle : public ScorableArticle
@@ -54,21 +56,24 @@ class KMScoringManager : public KScoringManager
   Q_OBJECT
 
 public:
-    KMScoringManager();
-    virtual ~KMScoringManager();
-    virtual QStringList getGroups() const;
+  KMScoringManager();
+  virtual ~KMScoringManager();
+  virtual QStringList getGroups() const;
 
-    void configure();
+  void setMainWin(QObject *parent);
+  
+  void configure();
 
-    static KMScoringManager* globalScoringManager();
+  static KMScoringManager* globalScoringManager();
 
 protected:
-    KDialogBase  *mConfDialog;
+  KDialogBase  *mConfDialog;
+  KMMainWin *mMainWin;
 
-    static KMScoringManager *mScoringManager;
+  static KMScoringManager *mScoringManager;
     
 protected slots:
-    void slotDialogDone();
+  void slotDialogDone();
 
 };