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

List:       kde-commits
Subject:    [kdepim] importwizard: Add import sylpheed filters
From:       Montel Laurent <montel () kde ! org>
Date:       2012-02-29 21:38:35
Message-ID: 20120229213835.44237A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 6fac77c123f4f4c609dd07c755765ed321cafe27 by Montel Laurent.
Committed on 29/02/2012 at 22:38.
Pushed by mlaurent into branch 'master'.

Add import sylpheed filters

M  +0    -1    importwizard/pimimportabstract.h
M  +13   -0    importwizard/sylpheed/sylpheedimportdata.cpp
M  +2    -2    importwizard/thunderbird/thunderbirdimportdata.cpp

http://commits.kde.org/kdepim/6fac77c123f4f4c609dd07c755765ed321cafe27

diff --git a/importwizard/pimimportabstract.h b/importwizard/pimimportabstract.h
index 386a1ce..d68d940 100644
--- a/importwizard/pimimportabstract.h
+++ b/importwizard/pimimportabstract.h
@@ -18,7 +18,6 @@
 #ifndef PIMIMPORTABSTRACT_H
 #define PIMIMPORTABSTRACT_H
 #include <QObject>
-
 class ImportWizard;
 
 namespace MailImporter {
diff --git a/importwizard/sylpheed/sylpheedimportdata.cpp \
b/importwizard/sylpheed/sylpheedimportdata.cpp index e795510..544a1e5 100644
--- a/importwizard/sylpheed/sylpheedimportdata.cpp
+++ b/importwizard/sylpheed/sylpheedimportdata.cpp
@@ -19,6 +19,8 @@
 #include "mailimporter/filter_sylpheed.h"
 #include "mailimporter/filterinfo.h"
 #include "importfilterinfogui.h"
+#include "mailcommon/filter/filterimporterexporter.h"
+#include "importwizard.h"
 
 #include <KLocale>
 
@@ -86,6 +88,17 @@ bool SylpheedImportData::importMails()
 
 bool SylpheedImportData::importFilters()
 {
+  MailCommon::FilterImporterExporter importer( mImportWizard );
+  bool canceled = false;
+  const QString filterPath = mPath + QLatin1String("/filter.xml");
+  if ( QFile( filterPath ).exists() ) {
+    QList<MailCommon::MailFilter*> listFilter = importer.importFilters( canceled, \
MailCommon::FilterImporterExporter::SylpheedFilter, filterPath ); +    appendFilters( \
listFilter ); +    return true;
+  } else {
+    //TODO
+  }
+  
   return false;
 }
 
diff --git a/importwizard/thunderbird/thunderbirdimportdata.cpp \
b/importwizard/thunderbird/thunderbirdimportdata.cpp index c94df20..a034f2e 100644
--- a/importwizard/thunderbird/thunderbirdimportdata.cpp
+++ b/importwizard/thunderbird/thunderbirdimportdata.cpp
@@ -17,12 +17,12 @@
 
 #include "thunderbirdimportdata.h"
 #include "importfilterinfogui.h"
-#include "importwizard.h"
 
 #include "mailimporter/filter_thunderbird.h"
 #include "mailimporter/filterinfo.h"
-
 #include "mailcommon/filter/filterimporterexporter.h"
+#include "importwizard.h"
+
 
 #include <KLocale>
 #include <KConfig>


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