[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] mailcommon/filter/filterimporter: Clean up code
From:       Montel Laurent <montel () kde ! org>
Date:       2013-10-05 13:47:24
Message-ID: E1VSSCa-0003WP-W0 () scm ! kde ! org
[Download RAW message or body]

Git commit 821c563939e15f2db955066e182a010e3b08926b by Montel Laurent.
Committed on 05/10/2013 at 13:47.
Pushed by mlaurent into branch 'master'.

Clean up code

M  +2    -2    mailcommon/filter/filterimporter/filterimporterabstract.cpp
M  +2    -1    mailcommon/filter/filterimporter/filterimporterabstract_p.h
M  +1    -2    mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
M  +2    -4    mailcommon/filter/filterimporter/filterimporterthunderbird.cpp

http://commits.kde.org/kdepim/821c563939e15f2db955066e182a010e3b08926b

diff --git a/mailcommon/filter/filterimporter/filterimporterabstract.cpp \
b/mailcommon/filter/filterimporter/filterimporterabstract.cpp index 35ad303..d14f3c1 \
                100644
--- a/mailcommon/filter/filterimporter/filterimporterabstract.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterabstract.cpp
@@ -25,8 +25,8 @@
 
 using namespace MailCommon;
 
-FilterImporterAbstract::FilterImporterAbstract()
-    : mInteractive(true)
+FilterImporterAbstract::FilterImporterAbstract(bool interactive)
+    : mInteractive(interactive)
 {
 }
 
diff --git a/mailcommon/filter/filterimporter/filterimporterabstract_p.h \
b/mailcommon/filter/filterimporter/filterimporterabstract_p.h index ebd5d20..ac1c3b0 \
                100644
--- a/mailcommon/filter/filterimporter/filterimporterabstract_p.h
+++ b/mailcommon/filter/filterimporter/filterimporterabstract_p.h
@@ -33,7 +33,7 @@ class MailFilter;
 class MAILCOMMON_EXPORT FilterImporterAbstract
 {
 public:
-    explicit FilterImporterAbstract();
+    explicit FilterImporterAbstract(bool interactive = true);
     ~FilterImporterAbstract();
     QList<MailFilter*> importFilter() const;
     QStringList emptyFilter() const;
@@ -46,6 +46,7 @@ protected:
 
     QList<MailFilter*> mListMailFilter;
     QStringList mEmptyFilter;
+private:
     bool mInteractive;
 };
 
diff --git a/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp \
b/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp index 753fff8..ff52db9 \
                100644
--- a/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
@@ -50,9 +50,8 @@ FilterImporterClawsMails::FilterImporterClawsMails( QFile *file )
 }
 
 FilterImporterClawsMails::FilterImporterClawsMails(bool interactive)
-    :FilterImporterAbstract()
+    :FilterImporterAbstract(interactive)
 {
-    mInteractive = interactive;
 }
 
 FilterImporterClawsMails::~FilterImporterClawsMails()
diff --git a/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp \
b/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp index \
                53f888f..a60fa6e 100644
--- a/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
@@ -26,17 +26,15 @@
 using namespace MailCommon;
 
 FilterImporterThunderbird::FilterImporterThunderbird(QFile *file , bool interactive)
-    : FilterImporterAbstract()
+    : FilterImporterAbstract(interactive)
 {
-    mInteractive = interactive;
     QTextStream stream(file);
     readStream(stream);
 }
 
 FilterImporterThunderbird::FilterImporterThunderbird(QString string , bool \
                interactive)
-    : FilterImporterAbstract()
+    : FilterImporterAbstract(interactive)
 {
-    mInteractive = interactive;
     QTextStream stream(&string);
     readStream(stream);
 }


[prev in list] [next in list] [prev in thread] [next in thread]