Reactive antispam wizard

svn path=/branches/work/akonadi-ports/kdepim/; revision=1040523

antispamwizard.cpp

@@ -63,7 +63,7 @@
 using namespace KMail;
 
 AntiSpamWizard::AntiSpamWizard( WizardMode mode,
-                                QWidget* parent, MainFolderView * mainFolderTree )
+                                QWidget* parent )
   : KAssistantDialog( parent ),
     mInfoPage( 0 ),
     mSpamRulesPage( 0 ),
@@ -114,13 +114,13 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode,
             this, SLOT( checkProgramsSelections( void ) ) );
 
   if ( mMode == AntiSpam ) {
-    mSpamRulesPage = new ASWizSpamRulesPage( 0, "", mainFolderTree );
+    mSpamRulesPage = new ASWizSpamRulesPage( 0, "" );
     addPage( mSpamRulesPage, i18n( "Options to fine-tune the handling of spam messages" ));
     connect( mSpamRulesPage, SIGNAL( selectionChanged( void ) ),
              this, SLOT( slotBuildSummary( void ) ) );
   }
   else {
-    mVirusRulesPage = new ASWizVirusRulesPage( 0, "", mainFolderTree );
+    mVirusRulesPage = new ASWizVirusRulesPage( 0, "" );
     addPage( mVirusRulesPage, i18n( "Options to fine-tune the handling of virus messages" ));
     connect( mVirusRulesPage, SIGNAL( selectionChanged( void ) ),
              this, SLOT( checkVirusRulesSelections( void ) ) );
@@ -971,8 +971,7 @@ void ASWizInfoPage::processSelectionChange()
 
 
 //---------------------------------------------------------------------------
-ASWizSpamRulesPage::ASWizSpamRulesPage( QWidget * parent, const char * name,
-                                        MainFolderView * mainFolderTree )
+ASWizSpamRulesPage::ASWizSpamRulesPage( QWidget * parent, const char * name)
   : ASWizPage( parent, name )
 {
   QVBoxLayout *layout = new QVBoxLayout();
@@ -1097,8 +1096,7 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled )
 
 
 //---------------------------------------------------------------------------
-ASWizVirusRulesPage::ASWizVirusRulesPage( QWidget * parent, const char * name,
-                                  MainFolderView * mainFolderTree )
+ASWizVirusRulesPage::ASWizVirusRulesPage( QWidget * parent, const char * name )
   : ASWizPage( parent, name )
 {
   QGridLayout *grid = new QGridLayout();
@@ -1129,7 +1127,7 @@ ASWizVirusRulesPage::ASWizVirusRulesPage( QWidget * parent, const char * name,
             "to the selected folder.") );
   grid->addWidget( mMarkRules, 2, 0 );
 #ifdef OLD_FOLDERVIEW
-  mFolderTree = new FolderSelectionTreeWidget( this, mainFolderTree );
+  mFolderTree = new FolderSelectionTreeWidget( this );
   mFolderTree->reload( true, true, true, QString( "trash" ) );
   grid->addWidget( mFolderTree, 3, 0 );
 #endif

antispamwizard.h

@@ -40,9 +40,9 @@
 #include <QBoxLayout>
 #include <akonadi/collection.h>
 class QLabel;
+class FolderSelectionTreeView;
 
 namespace KMail {
-  class MainFolderView;
   class FolderRequester;
 
   class ASWizInfoPage;
@@ -118,7 +118,7 @@ namespace KMail {
           within one of the wizard pages.
       */
       AntiSpamWizard( WizardMode mode,
-                      QWidget * parent, MainFolderView * mainFolderTree );
+                      QWidget * parent);
 
     protected:
       /**
@@ -329,7 +329,7 @@ namespace KMail {
     Q_OBJECT
 
     public:
-      ASWizSpamRulesPage( QWidget * parent, const char * name, MainFolderView * mainFolderTree );
+      ASWizSpamRulesPage( QWidget * parent, const char * name);
 
       bool markAsReadSelected() const;
       bool moveSpamSelected() const;
@@ -361,7 +361,7 @@ namespace KMail {
     Q_OBJECT
 
     public:
-      ASWizVirusRulesPage( QWidget * parent, const char * name, MainFolderView * mainFolderTree );
+      ASWizVirusRulesPage( QWidget * parent, const char * name );
 
       bool pipeRulesSelected() const;
       bool moveRulesSelected() const;

kmmainwidget.cpp

@@ -4674,19 +4674,15 @@ void KMMainWidget::toggleSystemTray()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotAntiSpamWizard()
 {
-#ifdef OLD_FOLDERVIEW
-  AntiSpamWizard wiz( AntiSpamWizard::AntiSpam, this, mainFolderView() );
+  AntiSpamWizard wiz( AntiSpamWizard::AntiSpam, this );
   wiz.exec();
-#endif
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotAntiVirusWizard()
 {
-#ifdef OLD_FOLDERVIEW
-  AntiSpamWizard wiz( AntiSpamWizard::AntiVirus, this, mainFolderView() );
+  AntiSpamWizard wiz( AntiSpamWizard::AntiVirus, this);
   wiz.exec();
-#endif
 }
 
 //-----------------------------------------------------------------------------