[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Merge remote-tracking branch 'origin/KDE/4.14'
From: Montel Laurent <montel () kde ! org>
Date: 2014-12-31 17:17:30
Message-ID: E1Y6Mtm-0004i1-Q0 () scm ! kde ! org
[Download RAW message or body]
Git commit fd98128b13a8fd171e8a20f030e71a17d507100c by Montel Laurent.
Committed on 31/12/2014 at 17:17.
Pushed by mlaurent into branch 'master'.
Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
agents/mailfilteragent/pop3resourceattribute.cpp
agents/mailfilteragent/pop3resourceattribute.h
importwizard/kmail1/kmail1importdata.cpp
importwizard/kmail1/kmail1importdata.h
importwizard/kmail1/kmail1settings.cpp
importwizard/kmail1/kmail1settings.h
knotes/tests/apps/knoteakonadinote.cpp
knotes/tests/apps/knoteakonadinote.h
knotes/tests/apps/knotesakonadiapp.cpp
knotes/tests/apps/knotesakonadiapp.h
knotes/tests/apps/knotesakonaditray.cpp
knotes/tests/apps/knotesakonaditray.h
knotes/tests/apps/main.cpp
mailcommon/collectionpage/newmailnotifierattribute.cpp
mailcommon/collectionpage/newmailnotifierattribute.h
pimsettingexporter/addressbook/exportaddressbookjob.h
pimsettingexporter/addressbook/importaddressbookjob.cpp
pimsettingexporter/addressbook/importaddressbookjob.h
pimsettingexporter/akregator/exportakregatorjob.cpp
pimsettingexporter/akregator/exportakregatorjob.h
pimsettingexporter/akregator/importakregatorjob.cpp
pimsettingexporter/akregator/importakregatorjob.h
pimsettingexporter/blogilo/exportblogilojob.cpp
pimsettingexporter/blogilo/exportblogilojob.h
pimsettingexporter/blogilo/importblogilojob.cpp
pimsettingexporter/blogilo/importblogilojob.h
pimsettingexporter/knode/exportknodejob.cpp
pimsettingexporter/knode/exportknodejob.h
pimsettingexporter/knode/importknodejob.cpp
pimsettingexporter/knode/importknodejob.h
pimsettingexporter/notes/exportnotesjob.cpp
pimsettingexporter/notes/exportnotesjob.h
pimsettingexporter/notes/importnotesjob.cpp
pimsettingexporter/notes/importnotesjob.h
M +1 -1 agents/notesagent/notesagent.cpp
M +1 -1 agents/notesagent/notesagent.h
M +1 -1 agents/notesagent/notesagentalarmdialog.cpp
M +1 -1 agents/notesagent/notesagentalarmdialog.h
M +1 -1 agents/notesagent/notesagentnotedialog.cpp
M +1 -1 agents/notesagent/notesagentnotedialog.h
M +1 -1 agents/notesagent/notesagentsettingsdialog.cpp
M +1 -1 agents/notesagent/notesagentsettingsdialog.h
M +1 -1 agents/notesagent/notesmanager.cpp
M +1 -1 agents/notesagent/notesmanager.h
M +1 -1 agents/sendlateragent/sendlateragent.cpp
M +1 -1 agents/sendlateragent/sendlateragent.h
M +1 -1 agents/sendlateragent/sendlaterconfiguredialog.cpp
M +1 -1 agents/sendlateragent/sendlaterconfiguredialog.h
M +1 -1 agents/sendlateragent/sendlaterdialog.cpp
M +1 -1 agents/sendlateragent/sendlaterdialog.h
M +1 -1 agents/sendlateragent/sendlaterinfo.cpp
M +1 -1 agents/sendlateragent/sendlaterinfo.h
M +1 -1 agents/sendlateragent/sendlaterjob.cpp
M +1 -1 agents/sendlateragent/sendlaterjob.h
M +1 -1 agents/sendlateragent/sendlatermanager.cpp
M +1 -1 agents/sendlateragent/sendlatermanager.h
M +1 -1 agents/sendlateragent/sendlaterremovemessagejob.cpp
M +1 -1 agents/sendlateragent/sendlaterremovemessagejob.h
M +1 -1 agents/sendlateragent/sendlatertimedatewidget.cpp
M +1 -1 agents/sendlateragent/sendlatertimedatewidget.h
M +1 -1 agents/sendlateragent/sendlaterutil.cpp
M +1 -1 agents/sendlateragent/sendlaterutil.h
M +1 -1 agents/sendlateragent/tests/sendlaterinfo_gui.cpp
M +1 -1 blogilo/src/composer/blogilocomposereditor.cpp
M +1 -1 blogilo/src/composer/blogilocomposereditor.h
M +1 -1 blogilo/src/composer/blogilocomposerview.cpp
M +1 -1 blogilo/src/composer/blogilocomposerview.h
M +1 -1 blogilo/src/composer/blogilocomposerwidget.cpp
M +1 -1 blogilo/src/composer/blogilocomposerwidget.h
M +1 -1 blogilo/src/poststabwidget.cpp
M +1 -1 blogilo/src/poststabwidget.h
M +1 -1 composereditor-ng/extendattributes/extendattributesbutton.cpp
M +1 -1 composereditor-ng/extendattributes/extendattributesbutton.h
M +1 -1 composereditor-ng/extendattributes/extendattributesutils.cpp
M +1 -1 composereditor-ng/extendattributes/extendattributeswidget.cpp
M +1 -1 composereditor-ng/extendattributes/extendattributeswidget.h
M +1 -1 composereditor-ng/image/composerimageresizetooltip.cpp
M +1 -1 composereditor-ng/image/composerimageresizetooltip.h
M +1 -1 composereditor-ng/link/composeranchordialog.cpp
M +1 -1 composereditor-ng/link/composeranchordialog.h
M +1 -1 composereditor-ng/list/composerlistdialog.cpp
M +1 -1 composereditor-ng/list/composerlistdialog.h
M +1 -1 composereditor-ng/private/composerview_p.cpp
M +1 -1 composereditor-ng/private/composerview_p.h
M +1 -1 grantleeeditor/contactthemeeditor/contactconfigurationdialog.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contactconfigurationdialog.h
M +1 -1 grantleeeditor/contactthemeeditor/contactdefaulttemplate.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contactdefaulttemplate.h
M +1 -1 grantleeeditor/contactthemeeditor/contacteditormainwindow.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contacteditormainwindow.h
M +1 -1 grantleeeditor/contactthemeeditor/contacteditorpage.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contacteditorpage.h
M +1 -1 grantleeeditor/contactthemeeditor/contacteditorutil.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contacteditorutil.h
M +1 -1 grantleeeditor/contactthemeeditor/contacteditorwidget.h
M +1 -1 grantleeeditor/contactthemeeditor/contactpreviewwidget.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contactpreviewwidget.h
M +1 -1 grantleeeditor/contactthemeeditor/contacttemplatewidget.cpp
M +1 -1 grantleeeditor/contactthemeeditor/contacttemplatewidget.h
M +1 -1 grantleeeditor/contactthemeeditor/defaultcompletion.cpp
M +1 -1 grantleeeditor/contactthemeeditor/editorpage.cpp
M +1 -1 grantleeeditor/contactthemeeditor/editorpage.h
M +1 -1 grantleeeditor/contactthemeeditor/main.cpp
M +1 -1 grantleeeditor/contactthemeeditor/previewwidget.cpp
M +1 -1 grantleeeditor/contactthemeeditor/previewwidget.h
M +1 -1 grantleeeditor/grantleethemeeditor/configurewidget.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/configurewidget.h
M +1 -1 grantleeeditor/grantleethemeeditor/desktopfilepage.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/desktopfilepage.h
M +1 -1 grantleeeditor/grantleethemeeditor/editorpage.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/editorpage.h
M +1 -1 grantleeeditor/grantleethemeeditor/editorwidget.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/editorwidget.h
M +1 -1 grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.h
M +1 -1 grantleeeditor/grantleethemeeditor/managethemes.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/managethemes.h
M +1 -1 grantleeeditor/grantleethemeeditor/newthemedialog.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/newthemedialog.h
M +1 -1 grantleeeditor/grantleethemeeditor/previewwidget.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/previewwidget.h
M +1 -1 grantleeeditor/grantleethemeeditor/themeeditortabwidget.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/themeeditortabwidget.h
M +1 -1 grantleeeditor/grantleethemeeditor/themesession.cpp
M +1 -1 grantleeeditor/grantleethemeeditor/themesession.h
M +1 -1 grantleeeditor/headerthemeeditor/defaultcompletion.cpp
M +1 -1 grantleeeditor/headerthemeeditor/editorpage.cpp
M +1 -1 grantleeeditor/headerthemeeditor/editorpage.h
M +1 -1 grantleeeditor/headerthemeeditor/main.cpp
M +1 -1 grantleeeditor/headerthemeeditor/previewwidget.cpp
M +1 -1 grantleeeditor/headerthemeeditor/previewwidget.h
M +1 -1 grantleeeditor/headerthemeeditor/themeconfiguredialog.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themeconfiguredialog.h
M +1 -1 grantleeeditor/headerthemeeditor/themedefaulttemplate.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themedefaulttemplate.h
M +1 -1 grantleeeditor/headerthemeeditor/themeeditormainwindow.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themeeditormainwindow.h
M +1 -1 grantleeeditor/headerthemeeditor/themeeditorpage.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themeeditorpage.h
M +1 -1 grantleeeditor/headerthemeeditor/themeeditorutil.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themeeditorutil.h
M +1 -1 grantleeeditor/headerthemeeditor/themeeditorwidget.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themeeditorwidget.h
M +1 -1 grantleeeditor/headerthemeeditor/themetemplatewidget.cpp
M +1 -1 grantleeeditor/headerthemeeditor/themetemplatewidget.h
M +1 -1 grantleetheme/grantleetheme.cpp
M +1 -1 grantleetheme/grantleetheme.h
M +1 -1 grantleetheme/grantleethememanager.cpp
M +1 -1 grantleetheme/grantleethememanager.h
M +1 -1 kaddressbook/merge/job/mergecontactsjob.cpp
M +1 -1 kaddressbook/merge/job/mergecontactsjob.h
M +1 -1 kaddressbook/merge/job/searchpotentialduplicatecontactjob.cpp
M +1 -1 kaddressbook/merge/job/searchpotentialduplicatecontactjob.h
M +1 -1 kaddressbook/merge/mergecontactsdialog.cpp
M +1 -1 kaddressbook/merge/mergecontactsdialog.h
M +1 -1 kaddressbook/merge/mergecontactwidget.cpp
M +1 -1 kaddressbook/merge/mergecontactwidget.h
M +1 -1 kaddressbook/merge/util/mergecontactutil.cpp
M +1 -1 kaddressbook/merge/util/mergecontactutil.h
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintaddressobject.cpp
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintaddressobject.h
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintimobject.h
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintobject.cpp
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintobject.h
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintphoneobject.cpp
M +1 -1 kaddressbook/printing/grantlee/contactgrantleeprintphoneobject.h
M +1 -1 kaddressbook/printing/grantlee/grantleeprintstyle.cpp
M +1 -1 kaddressbook/printing/grantlee/grantleeprintstyle.h
M +1 -1 kaddressbook/utils.cpp
M +1 -1 kaddressbook/utils.h
M +1 -1 kaddressbookgrantlee/formatter/grantleecontactutils.cpp
M +1 -1 kaddressbookgrantlee/grantleeutil.cpp
M +1 -1 kaddressbookgrantlee/grantleeutil.h
M +1 -1 kaddressbookgrantlee/widget/grantleecontactviewer.cpp
M +1 -1 kaddressbookgrantlee/widget/grantleecontactviewer.h
M +1 -1 kmail/configuredialog/configureaccountpage.cpp
M +1 -1 kmail/configuredialog/configureaccountpage.h
M +1 -1 kmail/configuredialog/configureagentswidget.cpp
M +1 -1 kmail/configuredialog/configureagentswidget.h
M +1 -1 kmail/configuredialog/configureappearancepage.cpp
M +1 -1 kmail/configuredialog/configureappearancepage.h
M +1 -1 kmail/configuredialog/configurecomposerpage.cpp
M +1 -1 kmail/configuredialog/configurecomposerpage.h
M +1 -1 kmail/configuredialog/configuremiscpage.cpp
M +1 -1 kmail/configuredialog/configuremiscpage.h
M +1 -1 kmail/configuredialog/configuresecuritypage.cpp
M +1 -1 kmail/configuredialog/configuresecuritypage.h
M +1 -1 kmail/dialog/addemailtoexistingcontactdialog.cpp
M +1 -1 kmail/dialog/addemailtoexistingcontactdialog.h
M +1 -1 kmail/folderarchive/folderarchiveaccountinfo.cpp
M +1 -1 kmail/folderarchive/folderarchiveaccountinfo.h
M +1 -1 kmail/folderarchive/folderarchiveagentcheckcollection.cpp
M +1 -1 kmail/folderarchive/folderarchiveagentcheckcollection.h
M +1 -1 kmail/folderarchive/folderarchiveagentjob.cpp
M +1 -1 kmail/folderarchive/folderarchiveagentjob.h
M +1 -1 kmail/folderarchive/folderarchivecache.cpp
M +1 -1 kmail/folderarchive/folderarchivecache.h
M +1 -1 kmail/folderarchive/folderarchivemanager.cpp
M +1 -1 kmail/folderarchive/folderarchivemanager.h
M +1 -1 kmail/folderarchive/folderarchiveutil.cpp
M +1 -1 kmail/folderarchive/folderarchiveutil.h
M +1 -1 kmail/job/addemailtoexistingcontactjob.cpp
M +1 -1 kmail/job/addemailtoexistingcontactjob.h
M +1 -1 kmail/searchdialog/kmailsearchpatternedit.h
M +1 -1 kmail/searchdialog/searchpatternwarning.cpp
M +1 -1 kmail/searchdialog/searchpatternwarning.h
M +1 -1 kmail/warningwidgets/externaleditorwarning.cpp
M +1 -1 kmail/warningwidgets/externaleditorwarning.h
M +1 -1 kmail/widgets/vacationscriptindicatorwidget.cpp
M +1 -1 kmail/widgets/vacationscriptindicatorwidget.h
M +1 -1 knotes/apps/knotesakonaditray.cpp
M +1 -1 knotes/apps/knotesakonaditray.h
M +1 -1 knotes/configdialog/knotedisplayconfigwidget.cpp
M +1 -1 knotes/configdialog/knotedisplayconfigwidget.h
M +1 -1 knotes/configdialog/knoteeditorconfigwidget.cpp
M +1 -1 knotes/configdialog/knoteeditorconfigwidget.h
M +1 -1 knotes/configdialog/knotesimpleconfigdialog.cpp
M +1 -1 knotes/configdialog/knotesimpleconfigdialog.h
M +1 -1 knotes/dialog/knoteselectednotesdialog.cpp
M +1 -1 knotes/dialog/knoteselectednotesdialog.h
M +1 -1 knotes/dialog/knoteskeydialog.cpp
M +1 -1 knotes/dialog/knoteskeydialog.h
M +1 -1 knotes/finddialog/knotefinddialog.cpp
M +1 -1 knotes/finddialog/knotefinddialog.h
M +1 -1 knotes/notes/knotedisplaysettings.cpp
M +1 -1 knotes/notes/knotedisplaysettings.h
M +1 -1 knotes/print/knoteprinter.cpp
M +1 -1 knotes/print/knoteprinter.h
M +1 -1 knotes/print/knoteprintobject.cpp
M +1 -1 knotes/print/knoteprintobject.h
M +1 -1 knotes/print/knoteprintselectednotesdialog.cpp
M +1 -1 knotes/print/knoteprintselectednotesdialog.h
M +1 -1 knotes/print/knoteprintselectthemecombobox.cpp
M +1 -1 knotes/print/knoteprintselectthemecombobox.h
M +1 -1 knotes/print/knoteprintselectthemedialog.cpp
M +1 -1 knotes/print/knoteprintselectthemedialog.h
M +1 -1 knotes/utils/knoteutils.cpp
M +1 -1 knotes/utils/knoteutils.h
M +1 -1 kontact/plugins/knotes/kcmknotessummary.cpp
M +1 -1 kontact/plugins/knotes/kcmknotessummary.h
M +1 -1 kontact/plugins/knotes/knoteseditdialog.cpp
M +1 -1 kontact/plugins/knotes/knoteseditdialog.h
M +1 -1 kontact/plugins/knotes/knotesiconview.cpp
M +1 -1 kontact/plugins/knotes/knotesiconview.h
M +1 -1 kontact/plugins/knotes/knoteslistwidgetsearchline.cpp
M +1 -1 kontact/plugins/knotes/knoteslistwidgetsearchline.h
M +1 -1 kontact/plugins/knotes/knotesselectdeletenotesdialog.cpp
M +1 -1 kontact/plugins/knotes/knotesselectdeletenotesdialog.h
M +1 -1 kontact/plugins/knotes/knoteswidget.h
M +1 -1 libkdepim/tests/testspellchecklineedit.cpp
M +1 -1 libkdepim/widgets/selectedcollectiondialog.cpp
M +1 -1 libkdepim/widgets/selectedcollectiondialog.h
M +1 -1 libksieve/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/autocreatescriptdialog.h
M +1 -1 libksieve/ksieveui/autocreatescripts/autocreatescriptutil.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/selectmatchtypecombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/selectmatchtypecombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/selectmimetypecombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/selectmimetypecombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/sievehelpbutton.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/commonwidgets/sievehelpbutton.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionaddflags.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionaddflags.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactiondiscard.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactiondiscard.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionremoveflags.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionremoveflags.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreturn.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreturn.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetflags.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetflags.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionstop.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionstop.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/multilineedit.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/multilineedit.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectaddheaderpositioncombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectaddheaderpositioncombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectfileintowidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectfileintowidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectimportancecombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectimportancecombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectvacationcombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectvacationcombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectvariablemodifiercombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/widgets/selectvariablemodifiercombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionlist.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionlist.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectaddresspartcombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectcomparatorcombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectcomparatorcombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectmimecombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectmimecombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizetypecombobox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizetypecombobox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveforeverypartwidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveincludewidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveincludewidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptblockwidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptdescriptiondialog.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptlistbox.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptlistbox.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptpage.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptpage.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescriptparsingerrordialog.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescripttabwidget.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievescripttabwidget.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sievewidgetpageabstract.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sievewidgetpageabstract.h
M +1 -1 libksieve/ksieveui/autocreatescripts/tests/autocreatescripts_gui.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditorhelphtmlwidget.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditorhelphtmlwidget.h
M +1 -1 libksieve/ksieveui/editor/sieveeditorloadprogressindicator.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditorloadprogressindicator.h
M +1 -1 libksieve/ksieveui/editor/sieveeditorparsingmissingfeaturewarning.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditorparsingmissingfeaturewarning.h
M +1 -1 libksieve/ksieveui/editor/sieveeditortabwidget.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditortabwidget.h
M +1 -1 libksieve/ksieveui/editor/sieveeditorutil.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditorutil.h
M +1 -1 libksieve/ksieveui/editor/sieveeditorwarning.cpp
M +1 -1 libksieve/ksieveui/editor/sieveeditorwarning.h
M +1 -1 libksieve/ksieveui/editor/sieveinfowidget.cpp
M +1 -1 libksieve/ksieveui/editor/sieveinfowidget.h
M +1 -1 libksieve/ksieveui/editor/tests/editorsieve_gui.cpp
M +1 -1 libksieve/ksieveui/editor/tests/editorsieve_gui.h
A +1 -1 libksieve/ksieveui/managescriptsjob/autotests/parseuserjobtest.cpp \
[License: GENERATED FILE] * R +1 -1 \
libksieve/ksieveui/managescriptsjob/autotests/parseuserjobtest.h M +1 -1 \
libksieve/ksieveui/managescriptsjob/generateglobalscriptjob.cpp M +1 -1 \
libksieve/ksieveui/managescriptsjob/generateglobalscriptjob.h M +1 -1 \
libksieve/ksieveui/managescriptsjob/parseuserscriptjob.cpp M +1 -1 \
libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h M +1 -1 \
libksieve/ksieveui/managesievescriptsdialog.cpp M +1 -1 \
libksieve/ksieveui/managesievescriptsdialog.h M +1 -1 \
libksieve/ksieveui/scriptsparsing/parsingresultdialog.cpp M +1 -1 \
libksieve/ksieveui/scriptsparsing/parsingresultdialog.h M +1 -1 \
libksieve/ksieveui/scriptsparsing/tests/main.cpp M +1 -1 \
libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.cpp M +1 -1 \
libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.h M +1 -1 \
libksieve/ksieveui/templates/sievedefaulttemplate.cpp M +1 -1 \
libksieve/ksieveui/templates/sievedefaulttemplate.h M +1 -1 \
libksieve/ksieveui/templates/sievetemplateeditdialog.cpp M +1 -1 \
libksieve/ksieveui/templates/sievetemplateeditdialog.h M +1 -1 \
libksieve/ksieveui/templates/sievetemplatewidget.cpp M +1 -1 \
libksieve/ksieveui/templates/sievetemplatewidget.h M +1 -1 \
libksieve/ksieveui/vacation/multiimapvacationdialog.cpp M +1 -1 \
libksieve/ksieveui/vacation/multiimapvacationdialog.h M +1 -1 \
libksieve/ksieveui/vacation/multiimapvacationmanager.cpp M +1 -1 \
libksieve/ksieveui/vacation/multiimapvacationmanager.h M +1 -1 \
libksieve/ksieveui/vacation/tests/main.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationcheckjob.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationcheckjob.h M +1 -1 \
libksieve/ksieveui/vacation/vacationcreatescriptjob.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationcreatescriptjob.h M +1 -1 \
libksieve/ksieveui/vacation/vacationdialog.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationeditwidget.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationeditwidget.h M +1 -1 \
libksieve/ksieveui/vacation/vacationhelperjob.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationhelperjob.h M +1 -1 \
libksieve/ksieveui/vacation/vacationmanager.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationmanager.h M +1 -1 \
libksieve/ksieveui/vacation/vacationpagewidget.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationpagewidget.h M +1 -1 \
libksieve/ksieveui/vacation/vacationscriptextractor.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationscriptextractor.h M +1 -1 \
libksieve/ksieveui/vacation/vacationutils.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationutils.h M +1 -1 \
libksieve/ksieveui/vacation/vacationwarningwidget.cpp M +1 -1 \
libksieve/ksieveui/vacation/vacationwarningwidget.h M +1 -1 \
libksieve/ksieveui/widgets/managesievetreeview.cpp M +1 -1 \
libksieve/ksieveui/widgets/managesievetreeview.h M +1 -1 \
libksieve/ksieveui/widgets/sievetreewidgetitem.cpp M +1 -1 \
libksieve/ksieveui/widgets/sievetreewidgetitem.h M +1 -1 \
mailcommon/filter/filterconverter/filterconverttosieve.cpp M +1 -1 \
mailcommon/filter/filterconverter/filterconverttosieve.h M +1 -1 \
mailcommon/filter/filterconverter/filterconverttosieveresultdialog.cpp M +1 -1 \
mailcommon/filter/filterconverter/filterconverttosieveresultdialog.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp [License: \
GPL (v2)] R +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportbalsatest.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp [License: \
GPL (v2)] R +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp \
[License: GPL (v2)] R +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp [License: \
GPL (v2)] R +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp [License: \
GPL (v2)] R +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp \
[License: GPL (v2)] R +1 -1 \
mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.h A +1 -1 \
mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp [License: GPL \
(v2)] A +1 -1 mailcommon/filter/filterimporter/autotests/filtertestkernel.h \
[License: GPL (v2)] M +1 -1 mailcommon/filter/filterselectiondialog.cpp
M +1 -1 mailcommon/filter/filterselectiondialog.h
M +1 -1 mailcommon/search/daterulewidgethandler.cpp
M +1 -1 mailcommon/search/daterulewidgethandler.h
M +1 -1 mailcommon/search/headersrulerwidgethandler.cpp
M +1 -1 mailcommon/search/headersrulerwidgethandler.h
M +1 -1 mailcommon/search/messagerulewidgethandler.cpp
M +1 -1 mailcommon/search/messagerulewidgethandler.h
M +1 -1 mailcommon/search/numericdoublerulewidgethandler.cpp
M +1 -1 mailcommon/search/numericdoublerulewidgethandler.h
M +1 -1 mailcommon/search/numericrulewidgethandler.cpp
M +1 -1 mailcommon/search/statusrulewidgethandler.cpp
M +1 -1 mailcommon/search/statusrulewidgethandler.h
M +1 -1 mailcommon/search/tagrulewidgethandler.cpp
M +1 -1 mailcommon/search/tagrulewidgethandler.h
M +1 -1 mailcommon/search/textrulerwidgethandler.cpp
M +1 -1 mailcommon/search/textrulerwidgethandler.h
M +1 -1 mailimporter/filter_mailmangzip.cpp
M +1 -1 mailimporter/filter_mailmangzip.h
M +1 -1 mailimporter/othermailerutil.cpp
M +1 -1 mailimporter/othermailerutil.h
M +1 -1 mboximporter/main.cpp
M +1 -1 mboximporter/mboximporterinfogui.cpp
M +1 -1 mboximporter/mboximporterinfogui.h
M +1 -1 mboximporter/mboximportkernel.cpp
M +1 -1 mboximporter/mboximportkernel.h
M +1 -1 mboximporter/mboxmainwindow.cpp
M +1 -1 mboximporter/mboxmainwindow.h
M +1 -1 messagecomposer/imagescaling/imagescalingselectformat.cpp
M +1 -1 messagecomposer/imagescaling/imagescalingselectformat.h
M +1 -1 messagecomposer/imagescaling/imagescalingutils.cpp
M +1 -1 messagecomposer/imagescaling/imagescalingutils.h
M +1 -1 messagecomposer/imagescaling/tests/imagescaling_gui.cpp
M +1 -1 messagecomposer/imagescaling/tests/imagescaling_gui.h
M +1 -1 messageviewer/adblock/adblockaddsubscriptiondialog.cpp
M +1 -1 messageviewer/adblock/adblockaddsubscriptiondialog.h
M +1 -1 messageviewer/adblock/adblockblockableitemsdialog.cpp
M +1 -1 messageviewer/adblock/adblockblockableitemsdialog.h
M +1 -1 messageviewer/adblock/adblockblockableitemswidget.cpp
M +1 -1 messageviewer/adblock/adblockblockableitemswidget.h
M +1 -1 messageviewer/adblock/adblockcreatefilterdialog.cpp
M +1 -1 messageviewer/adblock/adblockcreatefilterdialog.h
M +1 -1 messageviewer/adblock/adblockelementhiding.cpp
M +1 -1 messageviewer/adblock/adblockelementhiding.h
M +1 -1 messageviewer/adblock/adblockhostmatcher.cpp
M +1 -1 messageviewer/adblock/adblockhostmatcher.h
M +1 -1 messageviewer/adblock/adblocklistwidget.cpp
M +1 -1 messageviewer/adblock/adblocklistwidget.h
M +1 -1 messageviewer/adblock/adblockmanager.cpp
M +1 -1 messageviewer/adblock/adblockmanager.h
M +1 -1 messageviewer/adblock/adblockrule.cpp
M +1 -1 messageviewer/adblock/adblockrule.h
M +1 -1 messageviewer/adblock/adblockrulefallbackimpl.cpp
M +1 -1 messageviewer/adblock/adblockrulefallbackimpl.h
M +1 -1 messageviewer/adblock/adblockrulenullimpl.cpp
M +1 -1 messageviewer/adblock/adblockrulenullimpl.h
M +1 -1 messageviewer/adblock/adblockruletextmatchimpl.cpp
M +1 -1 messageviewer/adblock/adblockruletextmatchimpl.h
M +1 -1 messageviewer/adblock/adblocksettingwidget.cpp
M +1 -1 messageviewer/adblock/adblocksettingwidget.h
M +1 -1 messageviewer/adblock/adblockshowlistdialog.cpp
M +1 -1 messageviewer/adblock/adblockshowlistdialog.h
M +1 -1 messageviewer/adblock/adblocksyntaxhighlighter.cpp
M +1 -1 messageviewer/adblock/adblocksyntaxhighlighter.h
M +1 -1 messageviewer/adblock/adblockutil.cpp
M +1 -1 messageviewer/adblock/adblockutil.h
M +1 -1 messageviewer/adblock/networkaccessmanager.cpp
M +1 -1 messageviewer/adblock/networkaccessmanager.h
M +1 -1 messageviewer/adblock/tests/adblockblockableitemdialog_gui.cpp
M +1 -1 messageviewer/adblock/tests/adblockblockableitemdialog_gui.h
M +1 -1 messageviewer/adblock/tests/adblocksettings_gui.cpp
M +1 -1 messageviewer/adblock/tests/adblocksettingsdialog_gui.cpp
M +1 -1 messageviewer/adblock/webpage.cpp
M +1 -1 messageviewer/adblock/webpage.h
M +1 -1 messageviewer/grantleefilters/messageheaderfilter.cpp
M +1 -1 messageviewer/grantleefilters/messageheaderfilter.h
M +1 -1 messageviewer/grantleefilters/messageheadergrantleefilters.cpp
M +1 -1 messageviewer/grantleefilters/messageheadergrantleefilters.h
M +1 -1 messageviewer/header/customheadersettingwidget.cpp
M +1 -1 messageviewer/header/customheadersettingwidget.h
M +1 -1 messageviewer/header/customheaderstyle.cpp
M +1 -1 messageviewer/header/customheaderstyle.h
M +1 -1 messageviewer/header/entrepriseheaderstyle.cpp
M +1 -1 messageviewer/header/entrepriseheaderstyle.h
M +1 -1 messageviewer/header/fancyheaderstyle.cpp
M +1 -1 messageviewer/header/fancyheaderstyle.h
M +1 -1 messageviewer/header/grantleeheaderformatter.cpp
M +1 -1 messageviewer/header/grantleeheaderformatter.h
M +1 -1 messageviewer/header/grantleeheaderstyle.cpp
M +1 -1 messageviewer/header/grantleeheaderstyle.h
M +1 -1 messageviewer/header/grantleeheaderteststyle.cpp
M +1 -1 messageviewer/header/grantleeheaderteststyle.h
M +1 -1 messageviewer/header/headerstyle_util.cpp
M +1 -1 messageviewer/header/headerstyle_util.h
M +1 -1 messageviewer/header/mobileheaderstyle.cpp
M +1 -1 messageviewer/header/mobileheaderstyle.h
M +1 -1 messageviewer/header/plainheaderstyle.cpp
M +1 -1 messageviewer/header/plainheaderstyle.h
A +1 -1 messageviewer/scamdetection/autotests/test_scamdetection.cpp \
[License: GPL (v2)] A +1 -1 \
messageviewer/scamdetection/autotests/test_scamdetection.h [License: GPL (v2)] M \
+1 -1 messageviewer/scamdetection/scamattribute.cpp M +1 -1 \
messageviewer/scamdetection/scamattribute.h M +1 -1 \
messageviewer/scamdetection/scamcheckshorturl.cpp M +1 -1 \
messageviewer/scamdetection/scamcheckshorturl.h M +1 -1 \
messageviewer/scamdetection/scamdetection.cpp M +1 -1 \
messageviewer/scamdetection/scamdetection.h M +1 -1 \
messageviewer/scamdetection/scamdetectiondetailsdialog.cpp M +1 -1 \
messageviewer/scamdetection/scamdetectiondetailsdialog.h M +1 -1 \
messageviewer/scamdetection/scamdetectionwarningwidget.cpp M +1 -1 \
messageviewer/scamdetection/scamdetectionwarningwidget.h M +1 -1 \
messageviewer/scamdetection/tests/scamdetection_gui.cpp M +1 -1 \
messageviewer/scamdetection/tests/scamdetection_gui.h M +1 -1 \
messageviewer/viewer/attachmenttemporaryfilesdirs.cpp M +1 -1 \
messageviewer/viewer/attachmenttemporaryfilesdirs.h M +1 -1 \
messageviewer/viewer/messagedisplayformatattribute.cpp M +1 -1 \
messageviewer/viewer/messagedisplayformatattribute.h M +1 -1 \
messageviewer/widgets/printingsettings.cpp M +1 -1 \
messageviewer/widgets/printingsettings.h M +1 -1 \
noteshared/akonadi/notesakonaditreemodel.cpp M +1 -1 \
noteshared/akonadi/notesakonaditreemodel.h M +1 -1 \
noteshared/akonadi/noteschangerecorder.cpp M +1 -1 \
noteshared/akonadi/noteschangerecorder.h M +1 -1 \
noteshared/attributes/attributeregistrar.cpp M +1 -1 \
noteshared/attributes/notealarmattribute.cpp M +1 -1 \
noteshared/attributes/notealarmattribute.h M +1 -1 \
noteshared/attributes/notedisplayattribute.cpp M +1 -1 \
noteshared/attributes/notedisplayattribute.h M +1 -1 \
noteshared/attributes/showfoldernotesattribute.cpp M +1 -1 \
noteshared/attributes/showfoldernotesattribute.h M +1 -1 \
noteshared/config/noteactionconfig.cpp M +1 -1 \
noteshared/config/noteactionconfig.h M +1 -1 \
noteshared/config/notenetworkconfig.cpp M +1 -1 \
noteshared/config/notenetworkconfig.h M +1 -1 \
noteshared/dialog/selectednotefolderdialog.cpp M +1 -1 \
noteshared/dialog/selectednotefolderdialog.h M +1 -1 \
noteshared/editor/noteeditor.h M +1 -1 noteshared/editor/noteeditorutils.cpp
M +1 -1 noteshared/editor/noteeditorutils.h
M +1 -1 noteshared/job/createnewnotejob.cpp
M +1 -1 noteshared/job/createnewnotejob.h
M +1 -1 noteshared/noteutils.cpp
M +1 -1 noteshared/noteutils.h
M +1 -1 noteshared/resources/localresourcecreator.cpp
M +1 -1 noteshared/resources/localresourcecreator.h
M +1 -1 noteshared/widget/notelistwidget.cpp
M +1 -1 noteshared/widget/notelistwidget.h
M +1 -1 pimcommon/autocorrection/tests/autocorrection_gui.cpp
M +1 -1 pimcommon/autocorrection/tests/autocorrection_gui.h
M +1 -1 pimcommon/autocorrection/tests/richtexteditwithautocorrection_gui.cpp
M +1 -1 pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
M +1 -1 pimcommon/autocorrection/widgets/lineeditwithautocorrection.h
M +1 -1 pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
M +1 -1 pimcommon/autocorrection/widgets/richtexteditwithautocorrection.h
M +1 -1 pimcommon/folderdialog/checkedcollectionwidget.cpp
M +1 -1 pimcommon/folderdialog/checkedcollectionwidget.h
M +1 -1 pimcommon/folderdialog/selectmulticollectiondialog.cpp
M +1 -1 pimcommon/folderdialog/selectmulticollectiondialog.h
M +1 -1 pimcommon/folderdialog/selectmulticollectionwidget.cpp
M +1 -1 pimcommon/folderdialog/selectmulticollectionwidget.h
M +1 -1 pimcommon/folderdialog/tests/selectmultiselectiondialog_gui.cpp
M +1 -1 pimcommon/settings/pimcommonsettings.cpp
M +1 -1 pimcommon/settings/pimcommonsettings.h
M +1 -1 pimcommon/shorturl/abstractshorturl.cpp
M +1 -1 pimcommon/shorturl/abstractshorturl.h
M +1 -1 pimcommon/shorturl/engine/googleshorturl.cpp
M +1 -1 pimcommon/shorturl/engine/googleshorturl.h
M +1 -1 pimcommon/shorturl/engine/migremeshorturl.cpp
M +1 -1 pimcommon/shorturl/engine/migremeshorturl.h
M +1 -1 pimcommon/shorturl/engine/tinyurlshorturl.cpp
M +1 -1 pimcommon/shorturl/engine/tinyurlshorturl.h
M +1 -1 pimcommon/shorturl/engine/triopabshorturl.cpp
M +1 -1 pimcommon/shorturl/engine/triopabshorturl.h
M +1 -1 pimcommon/shorturl/shorturlconfiguredialog.cpp
M +1 -1 pimcommon/shorturl/shorturlconfiguredialog.h
M +1 -1 pimcommon/shorturl/shorturlconfigurewidget.cpp
M +1 -1 pimcommon/shorturl/shorturlconfigurewidget.h
M +1 -1 pimcommon/shorturl/shorturlutils.cpp
M +1 -1 pimcommon/shorturl/shorturlutils.h
M +1 -1 pimcommon/shorturl/shorturlwidget.cpp
M +1 -1 pimcommon/shorturl/shorturlwidget.h
M +1 -1 pimcommon/shorturl/tests/shorturlmainwidget.cpp
M +1 -1 pimcommon/shorturl/tests/shorturlmainwidget.h
M +1 -1 pimcommon/shorturl/tests/shorturlwidget_gui.cpp
M +1 -1 pimcommon/sievehighlighter/sievesyntaxhighlighterutil.cpp
M +1 -1 pimcommon/sievehighlighter/sievesyntaxhighlighterutil.h
M +1 -1 pimcommon/storageservice/authdialog/logindialog.cpp
M +1 -1 pimcommon/storageservice/authdialog/logindialog.h
M +1 -1 pimcommon/storageservice/authdialog/storageauthviewdialog.cpp
M +1 -1 pimcommon/storageservice/authdialog/storageauthviewdialog.h
M +1 -1 pimcommon/storageservice/authdialog/storageauthviewwidget.cpp
M +1 -1 pimcommon/storageservice/authdialog/storageauthviewwidget.h
M +1 -1 pimcommon/storageservice/box/boxjob.cpp
M +1 -1 pimcommon/storageservice/box/boxjob.h
M +1 -1 pimcommon/storageservice/box/boxstorageservice.cpp
M +1 -1 pimcommon/storageservice/box/boxstorageservice.h
M +1 -1 pimcommon/storageservice/box/boxutil.cpp
M +1 -1 pimcommon/storageservice/box/boxutil.h
M +1 -1 pimcommon/storageservice/box/tests/box_gui.cpp
M +1 -1 pimcommon/storageservice/box/tests/box_gui.h
M +1 -1 pimcommon/storageservice/dialog/storageservicedownloaddialog.cpp
M +1 -1 pimcommon/storageservice/dialog/storageservicedownloaddialog.h
M +1 -1 pimcommon/storageservice/dropbox/dropboxjob.cpp
M +1 -1 pimcommon/storageservice/dropbox/dropboxjob.h
M +1 -1 pimcommon/storageservice/dropbox/dropboxstorageservice.cpp
M +1 -1 pimcommon/storageservice/dropbox/dropboxstorageservice.h
M +1 -1 pimcommon/storageservice/dropbox/dropboxutil.cpp
M +1 -1 pimcommon/storageservice/dropbox/dropboxutil.h
M +1 -1 pimcommon/storageservice/dropbox/tests/dropboxtoken_gui.cpp
M +1 -1 pimcommon/storageservice/dropbox/tests/dropboxtoken_gui.h
M +1 -1 pimcommon/storageservice/hubic/hubicjob.cpp
M +1 -1 pimcommon/storageservice/hubic/hubicjob.h
M +1 -1 pimcommon/storageservice/hubic/hubicstorageservice.cpp
M +1 -1 pimcommon/storageservice/hubic/hubicstorageservice.h
M +1 -1 pimcommon/storageservice/hubic/tests/hubic_gui.cpp
M +1 -1 pimcommon/storageservice/hubic/tests/hubic_gui.h
M +1 -1 pimcommon/storageservice/job/storageserviceabstractjob.cpp
M +1 -1 pimcommon/storageservice/job/storageserviceabstractjob.h
M +1 -1 pimcommon/storageservice/settings/addservicestoragedialog.cpp
M +1 -1 pimcommon/storageservice/settings/addservicestoragedialog.h
M +1 -1 pimcommon/storageservice/settings/storagelistwidgetitem.cpp
M +1 -1 pimcommon/storageservice/settings/storagelistwidgetitem.h
M +1 -1 pimcommon/storageservice/settings/storageservicecombobox.cpp
M +1 -1 pimcommon/storageservice/settings/storageservicecombobox.h
M +1 -1 pimcommon/storageservice/settings/storageservicesettingswidget.cpp
M +1 -1 pimcommon/storageservice/settings/storageservicesettingswidget.h
M +1 -1 pimcommon/storageservice/storageserviceabstract.cpp
M +1 -1 pimcommon/storageservice/storageserviceabstract.h
M +1 -1 pimcommon/storageservice/storageservicemanager.cpp
M +1 -1 pimcommon/storageservice/storageservicemanager.h
M +1 -1 pimcommon/storageservice/tests/servicetestwidget.cpp
M +1 -1 pimcommon/storageservice/tests/servicetestwidget.h
M +1 -1 pimcommon/storageservice/tests/storageservice_gui.cpp
M +1 -1 pimcommon/storageservice/tests/storageservice_gui.h
M +1 -1 pimcommon/storageservice/utils/storageserviceutils.cpp
M +1 -1 pimcommon/storageservice/utils/storageserviceutils.h
M +1 -1 pimcommon/storageservice/webdav/tests/webdav_gui.cpp
M +1 -1 pimcommon/storageservice/webdav/tests/webdav_gui.h
M +1 -1 pimcommon/storageservice/webdav/webdavjob.cpp
M +1 -1 pimcommon/storageservice/webdav/webdavjob.h
M +1 -1 pimcommon/storageservice/webdav/webdavsettingsdialog.cpp
M +1 -1 pimcommon/storageservice/webdav/webdavsettingsdialog.h
M +1 -1 pimcommon/storageservice/webdav/webdavstorageservice.cpp
M +1 -1 pimcommon/storageservice/webdav/webdavstorageservice.h
M +1 -1 pimcommon/storageservice/yousendit/tests/yousendit_gui.cpp
M +1 -1 pimcommon/storageservice/yousendit/tests/yousendit_gui.h
M +1 -1 pimcommon/storageservice/yousendit/yousenditjob.cpp
M +1 -1 pimcommon/storageservice/yousendit/yousenditjob.h
M +1 -1 pimcommon/storageservice/yousendit/yousenditstorageservice.cpp
M +1 -1 pimcommon/storageservice/yousendit/yousenditstorageservice.h
M +1 -1 pimcommon/storageservice/yousendit/yousenditutil.cpp
M +1 -1 pimcommon/storageservice/yousendit/yousenditutil.h
M +1 -1 pimcommon/templatewidgets/templateeditdialog.cpp
M +1 -1 pimcommon/templatewidgets/templateeditdialog.h
M +1 -1 pimcommon/templatewidgets/templatelistwidget.cpp
M +1 -1 pimcommon/templatewidgets/templatelistwidget.h
M +1 -1 pimcommon/templatewidgets/templatemanager.cpp
M +1 -1 pimcommon/templatewidgets/templatemanager.h
M +1 -1 pimcommon/texteditor/commonwidget/texteditfindbarbase.cpp
M +1 -1 pimcommon/texteditor/commonwidget/texteditfindbarbase.h
M +1 -1 pimcommon/texteditor/commonwidget/textfindreplacewidget.cpp
M +1 -1 pimcommon/texteditor/commonwidget/textfindreplacewidget.h
M +1 -1 pimcommon/texteditor/plaintexteditor/plaintexteditor.cpp
M +1 -1 pimcommon/texteditor/plaintexteditor/plaintexteditor.h
M +1 -1 pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.cpp
M +1 -1 pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.h
M +1 -1 pimcommon/texteditor/plaintexteditor/tests/plaintexteditor_gui.cpp
M +1 -1 pimcommon/texteditor/richtexteditor/richtexteditfindbar.cpp
M +1 -1 pimcommon/texteditor/richtexteditor/richtexteditfindbar.h
M +1 -1 pimcommon/texteditor/richtexteditor/richtexteditor.cpp
M +1 -1 pimcommon/texteditor/richtexteditor/richtexteditor.h
M +1 -1 pimcommon/texteditor/richtexteditor/richtexteditorwidget.cpp
M +1 -1 pimcommon/texteditor/richtexteditor/richtexteditorwidget.h
M +1 -1 pimcommon/texteditor/richtexteditor/tests/richtexteditor_gui.cpp
M +1 -1 pimcommon/translator/tests/translator_gui.cpp
M +1 -1 pimcommon/translator/translatordebugdialog.cpp
M +1 -1 pimcommon/translator/translatordebugdialog.h
M +1 -1 pimcommon/util/editorutil.cpp
M +1 -1 pimcommon/util/editorutil.h
M +1 -1 pimcommon/widgets/configureimmutablewidgetutils.cpp
M +1 -1 pimcommon/widgets/configureimmutablewidgetutils.h
M +1 -1 pimcommon/widgets/customtextedit.cpp
M +1 -1 pimcommon/widgets/customtextedit.h
M +1 -1 pimcommon/widgets/customtoolswidget.cpp
M +1 -1 pimcommon/widgets/customtoolswidget.h
M +1 -1 pimcommon/widgets/customtreeview.cpp
M +1 -1 pimcommon/widgets/customtreeview.h
M +1 -1 pimcommon/widgets/tests/customtextedit_gui.cpp
M +1 -1 pimcommon/widgets/tests/customtoolswidget_gui.cpp
M +1 -1 pimcommon/widgets/tests/customtoolswidget_gui.h
M +2 -2 pimsettingexporter/addressbook/exportaddressbookjob.h
M +1 -2 pimsettingexporter/addressbook/importaddressbookjob.cpp
M +2 -2 pimsettingexporter/addressbook/importaddressbookjob.h
M +2 -2 pimsettingexporter/akregator/exportakregatorjob.cpp
M +2 -2 pimsettingexporter/akregator/exportakregatorjob.h
M +2 -2 pimsettingexporter/akregator/importakregatorjob.cpp
M +2 -2 pimsettingexporter/akregator/importakregatorjob.h
M +2 -2 pimsettingexporter/blogilo/exportblogilojob.cpp
M +2 -2 pimsettingexporter/blogilo/exportblogilojob.h
M +2 -2 pimsettingexporter/blogilo/importblogilojob.cpp
M +2 -2 pimsettingexporter/blogilo/importblogilojob.h
M +1 -1 pimsettingexporter/dialog/backupfilestructureinfodialog.cpp
M +1 -1 pimsettingexporter/dialog/backupfilestructureinfodialog.h
M +1 -1 pimsettingexporter/dialog/showarchivestructuredialog.cpp
M +1 -1 pimsettingexporter/dialog/showarchivestructuredialog.h
M +2 -2 pimsettingexporter/notes/exportnotesjob.cpp
M +2 -2 pimsettingexporter/notes/exportnotesjob.h
M +2 -2 pimsettingexporter/notes/importnotesjob.cpp
M +2 -2 pimsettingexporter/notes/importnotesjob.h
M +1 -1 pimsettingexporter/synchronizeresourcejob.cpp
M +1 -1 pimsettingexporter/synchronizeresourcejob.h
M +1 -1 pimsettingexporter/tests/selectiontreewidget_gui.cpp
M +1 -1 pimsettingexporter/tests/showarchivestructuredialog_gui.cpp
M +1 -1 pimsettingexporter/widgets/selectiontypetreewidget.cpp
M +1 -1 pimsettingexporter/widgets/selectiontypetreewidget.h
M +1 -1 sieveeditor/main.cpp
M +1 -1 sieveeditor/serversievelistwidget.cpp
M +1 -1 sieveeditor/serversievelistwidget.h
M +1 -1 sieveeditor/serversievesettings.cpp
M +1 -1 sieveeditor/serversievesettings.h
M +1 -1 sieveeditor/serversievesettingsdialog.cpp
M +1 -1 sieveeditor/serversievesettingsdialog.h
M +1 -1 sieveeditor/sieveeditorconfiguredialog.cpp
M +1 -1 sieveeditor/sieveeditorconfiguredialog.h
M +1 -1 sieveeditor/sieveeditorconfigureserverwidget.cpp
M +1 -1 sieveeditor/sieveeditorconfigureserverwidget.h
M +1 -1 sieveeditor/sieveeditormainwidget.cpp
M +1 -1 sieveeditor/sieveeditormainwidget.h
M +1 -1 sieveeditor/sieveeditormainwindow.cpp
M +1 -1 sieveeditor/sieveeditormainwindow.h
M +1 -1 sieveeditor/sieveeditorscriptmanagerwidget.cpp
M +1 -1 sieveeditor/sieveeditorscriptmanagerwidget.h
M +1 -1 sieveeditor/sieveeditorscriptwidget.h
M +1 -1 sieveeditor/sieveeditorutil.cpp
M +1 -1 sieveeditor/sieveeditorutil.h
M +1 -1 storageservicemanager/main.cpp
M +1 -1 storageservicemanager/storageservicemanagermainwindow.cpp
M +1 -1 storageservicemanager/storageservicemanagermainwindow.h
M +1 -1 storageservicemanager/storageservicepage.cpp
M +1 -1 storageservicemanager/storageservicepage.h
M +1 -1 storageservicemanager/storageservicetabwidget.cpp
M +1 -1 storageservicemanager/storageservicetabwidget.h
M +1 -1 templateparser/templatestexteditor.cpp
M +1 -1 templateparser/templatestexteditor.h
M +1 -1 templateparser/tests/templateconfigurewidget_gui.cpp
M +1 -1 templateparser/tests/templateconfigurewidget_gui.h
M +1 -1 templateparser/tests/templateeditor_gui.cpp
M +1 -1 templateparser/tests/templateeditor_gui.h
The files marked with a * at the end have a non valid license. Please read: \
http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are \
listed at that page.
http://commits.kde.org/kdepim/fd98128b13a8fd171e8a20f030e71a17d507100c
diff --cc libksieve/ksieveui/managescriptsjob/autotests/parseuserjobtest.cpp
index 6e011fa,0000000..51d9f39
mode 100644,000000..100644
--- a/libksieve/ksieveui/managescriptsjob/autotests/parseuserjobtest.cpp
+++ b/libksieve/ksieveui/managescriptsjob/autotests/parseuserjobtest.cpp
@@@ -1,103 -1,0 +1,103 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "parseuserjobtest.h"
+#include "ksieveui/managescriptsjob/parseuserscriptjob.h"
+#include <qtest.h>
+
+QTEST_MAIN(ParseUserTest)
+
+void ParseUserTest::testParseEmptyUserJob()
+{
+ const QString script;
+ bool result;
+ const QStringList lst = KSieveUi::ParseUserScriptJob::parsescript(script, \
result); + QCOMPARE(lst.count(), 0);
+ QCOMPARE(result, true);
+}
+
+void ParseUserTest::testParseUserTwoActiveScriptJob()
+{
+ const QString script = QLatin1String("# USER Management Script\n"
+ "#\n"
+ "# This script includes the various active \
sieve scripts\n" + "# it is AUTOMATICALLY \
GENERATED. DO NOT EDIT MANUALLY!\n" + "# \n"
+ "# For more information, see \
http://wiki.kolab.org/KEP:14#USER\n" + "#\n"
+ "\n"
+ "require [\"include\"];\n"
+ "include :personal \"file1\";\n"
+ "include :personal \"file2\";\n");
+ bool result;
+ const QStringList lst = KSieveUi::ParseUserScriptJob::parsescript(script, \
result); + QCOMPARE(lst.count(), 2);
+ QCOMPARE(result, true);
+}
+
+void ParseUserTest::testParseUserNoActiveScriptJob()
+{
+ const QString script = QLatin1String("# USER Management Script\n"
+ "#\n"
+ "# This script includes the various active \
sieve scripts\n" + "# it is AUTOMATICALLY \
GENERATED. DO NOT EDIT MANUALLY!\n" + "# \n"
+ "# For more information, see \
http://wiki.kolab.org/KEP:14#USER\n" + "#\n"
+ "\n"
+ "require [\"include\"];\n");
+ bool result;
+ const QStringList lst = KSieveUi::ParseUserScriptJob::parsescript(script, \
result); + QCOMPARE(lst.count(), 0);
+ QCOMPARE(result, true);
+}
+
+void ParseUserTest::testParseUserDuplicateActiveScriptJob()
+{
+ const QString script = QLatin1String("# USER Management Script\n"
+ "#\n"
+ "# This script includes the various active \
sieve scripts\n" + "# it is AUTOMATICALLY \
GENERATED. DO NOT EDIT MANUALLY!\n" + "# \n"
+ "# For more information, see \
http://wiki.kolab.org/KEP:14#USER\n" + "#\n"
+ "\n"
+ "require [\"include\"];\n"
+ "include :personal \"file1\";\n"
+ "include :personal \"file1\";\n");
+ bool result;
+ const QStringList lst = KSieveUi::ParseUserScriptJob::parsescript(script, \
result); + QCOMPARE(lst.count(), 1);
+ QCOMPARE(result, true);
+}
+
+void ParseUserTest::testParseUserErrorScriptJob()
+{
+ const QString script = QLatin1String("# USER Management Script\n"
+ "#\n"
+ "# This script includes the various active \
sieve scripts\n" + "# it is AUTOMATICALLY \
GENERATED. DO NOT EDIT MANUALLY!\n" + "# \n"
+ "# For more information, see \
http://wiki.kolab.org/KEP:14#USER\n" + "#\n"
+ "\n"
+ "errorscript\n");
+ bool result;
+ const QStringList lst = KSieveUi::ParseUserScriptJob::parsescript(script, \
result); + QCOMPARE(lst.count(), 0);
+ QCOMPARE(result, false);
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp
index ed6e0a9,0000000..daff07f
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp
@@@ -1,37 -1,0 +1,37 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "filterimportbalsatest.h"
+#include "mailfilter.h"
+#include "filtertestkernel.h"
+#include <mailcommon/kernel/mailkernel.h>
+#include <AkonadiCore/qtest_akonadi.h>
+
+QTEST_AKONADIMAIN(FilterImportBalsatest)
+
+void FilterImportBalsatest::initTestCase()
+{
+ AkonadiTest::checkTestIsIsolated();
+
+ FilterTestKernel *kernel = new FilterTestKernel(this);
+ CommonKernel->registerKernelIf(kernel); //register KernelIf early, it is used \
by the Filter classes + CommonKernel->registerSettingsIf(kernel); //SettingsIf \
is used in FolderTreeWidget +}
+
+void FilterImportBalsatest::testImportFilters()
+{
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp
index 7872902,0000000..ca208e2
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp
@@@ -1,43 -1,0 +1,43 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "filterimportclawmailtest.h"
+#include "../filterimporterclawsmail_p.h"
+#include "mailfilter.h"
+#include <AkonadiCore/qtest_akonadi.h>
+#include "filtertestkernel.h"
+#include <mailcommon/kernel/mailkernel.h>
+
+QTEST_AKONADIMAIN(FilterImportClawMailtest)
+
+void FilterImportClawMailtest::initTestCase()
+{
+ AkonadiTest::checkTestIsIsolated();
+
+ FilterTestKernel *kernel = new FilterTestKernel(this);
+ CommonKernel->registerKernelIf(kernel); //register KernelIf early, it is used \
by the Filter classes + CommonKernel->registerSettingsIf(kernel); //SettingsIf \
is used in FolderTreeWidget +}
+
+void FilterImportClawMailtest::testImportFilters()
+{
+ MailCommon::FilterImporterClawsMails importer;
+ MailCommon::MailFilter *filter = importer.parseLine("enabled rulename \"foo\" \
subject matchcase \"fff\" add_to_addressbook \"From\" \"addrbook-000002.xml\""); + \
QCOMPARE(filter->toolbarName(), QLatin1String("foo")); + \
QVERIFY(filter->isEnabled()); + delete filter;
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp
index 868a7c6,0000000..bb556eb
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp
@@@ -1,37 -1,0 +1,37 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "filterimportevolutiontest.h"
+#include "mailfilter.h"
+#include <AkonadiCore/qtest_akonadi.h>
+#include "filtertestkernel.h"
+#include <mailcommon/kernel/mailkernel.h>
+
+QTEST_AKONADIMAIN(FilterImportEvolutiontest)
+
+void FilterImportEvolutiontest::initTestCase()
+{
+ AkonadiTest::checkTestIsIsolated();
+
+ FilterTestKernel *kernel = new FilterTestKernel(this);
+ CommonKernel->registerKernelIf(kernel); //register KernelIf early, it is used \
by the Filter classes + CommonKernel->registerSettingsIf(kernel); //SettingsIf \
is used in FolderTreeWidget +}
+
+void FilterImportEvolutiontest::testImportFilters()
+{
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp
index 52338ed,0000000..0893973
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp
@@@ -1,37 -1,0 +1,37 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "filterimportprocmailtest.h"
+#include "mailfilter.h"
+#include <AkonadiCore/qtest_akonadi.h>
+#include "filtertestkernel.h"
+#include <mailcommon/kernel/mailkernel.h>
+
+QTEST_AKONADIMAIN(FilterImportProcmailtest)
+
+void FilterImportProcmailtest::initTestCase()
+{
+ AkonadiTest::checkTestIsIsolated();
+
+ FilterTestKernel *kernel = new FilterTestKernel(this);
+ CommonKernel->registerKernelIf(kernel); //register KernelIf early, it is used \
by the Filter classes + CommonKernel->registerSettingsIf(kernel); //SettingsIf \
is used in FolderTreeWidget +}
+
+void FilterImportProcmailtest::testImportFilters()
+{
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
index 0bc5429,0000000..91a894c
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
@@@ -1,37 -1,0 +1,37 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "filterimportsylpheedtest.h"
+#include "mailfilter.h"
+#include <AkonadiCore/qtest_akonadi.h>
+#include "filtertestkernel.h"
+#include <mailcommon/kernel/mailkernel.h>
+
+QTEST_AKONADIMAIN(FilterImportSylpheedtest)
+
+void FilterImportSylpheedtest::initTestCase()
+{
+ AkonadiTest::checkTestIsIsolated();
+
+ FilterTestKernel *kernel = new FilterTestKernel(this);
+ CommonKernel->registerKernelIf(kernel); //register KernelIf early, it is used \
by the Filter classes + CommonKernel->registerSettingsIf(kernel); //SettingsIf \
is used in FolderTreeWidget +}
+
+void FilterImportSylpheedtest::testImportFilters()
+{
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
index bc69a17,0000000..f6835ef
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
@@@ -1,207 -1,0 +1,207 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#include "filterimportthunderbirdtest.h"
+#include "../filterimporterthunderbird_p.h"
+#include "filtertestkernel.h"
+#include "mailfilter.h"
+#include <AkonadiCore/qtest_akonadi.h>
+#include <mailcommon/kernel/mailkernel.h>
+
+QTEST_AKONADIMAIN(FilterImportThunderbirdtest)
+
+void FilterImportThunderbirdtest::initTestCase()
+{
+ AkonadiTest::checkTestIsIsolated();
+
+ FilterTestKernel *kernel = new FilterTestKernel(this);
+ CommonKernel->registerKernelIf(kernel); //register KernelIf early, it is used \
by the Filter classes + CommonKernel->registerSettingsIf(kernel); //SettingsIf \
is used in FolderTreeWidget +}
+
+void FilterImportThunderbirdtest::testImportFiltersAllCondition()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Match All Messages\"\n"
+ "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Mark read\"\n"
+ "condition=\"ALL\"\n");
+ MailCommon::FilterImporterThunderbird importer(filter, false);
+ QList<MailCommon::MailFilter *> lst = importer.importFilter();
+ QCOMPARE(lst.count(), 1);
+ MailCommon::MailFilter *f = lst.at(0);
+ QVERIFY(f->isEnabled());
+ QCOMPARE(f->name(), QLatin1String("Match All Messages"));
+ QCOMPARE(f->pattern()->op(), MailCommon::SearchPattern::OpAll);
+
+ qDeleteAll(lst);
+}
+
+void FilterImportThunderbirdtest::testImportFiltersEmpty()
+{
+ QString filter;
+ MailCommon::FilterImporterThunderbird importer(filter, false);
+ QList<MailCommon::MailFilter *> lst = importer.importFilter();
+ QCOMPARE(lst.count(), 0);
+}
+
+void FilterImportThunderbirdtest::testImportFiltersStopExecution()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Match All Messages\"\n"
+ "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Stop execution\"\n"
+ "action=\"Mark read\"\n"
+ "condition=\"ALL\"\n");
+ MailCommon::FilterImporterThunderbird importer(filter, false);
+ QList<MailCommon::MailFilter *> lst = importer.importFilter();
+ MailCommon::MailFilter *f = lst.at(0);
+ QVERIFY(f->isEnabled());
+ QCOMPARE(f->stopProcessingHere(), true);
+ qDeleteAll(lst);
+}
+
+void FilterImportThunderbirdtest::testImportFiltersDisabled()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Match All Messages\"\n"
+ "enabled=\"no\"\n"
+ "type=\"17\"\n"
+ "action=\"Stop execution\"\n"
+ "action=\"Mark read\"\n"
+ "condition=\"ALL\"\n");
+ MailCommon::FilterImporterThunderbird importer(filter, false);
+ QList<MailCommon::MailFilter *> lst = importer.importFilter();
+ MailCommon::MailFilter *f = lst.at(0);
+ QCOMPARE(f->isEnabled(), false);
+ QCOMPARE(f->stopProcessingHere(), true);
+ qDeleteAll(lst);
+}
+
+void FilterImportThunderbirdtest::testImportTwoFilters()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Subject contains: kde\"\n"
+ "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"condition=\"AND (subject,contains,konqi)\"\n" + \
"name=\"filter1\"\n" + "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"action=\"Mark read\"\n" + "condition=\"AND \
(subject,contains,kmail) AND (subject,contains,konqueror) AND (subject,contains,kf5) \
AND (subject,contains,qtcreator)\"\n"); + MailCommon::FilterImporterThunderbird \
importer(filter, false); + QList<MailCommon::MailFilter *> lst = \
importer.importFilter(); + QCOMPARE(lst.count(), 2);
+ MailCommon::MailFilter *f = lst.at(0);
+ QCOMPARE(f->pattern()->op(), MailCommon::SearchPattern::OpAnd);
+ QCOMPARE(f->isEnabled(), true);
+ f = lst.at(1);
+ QCOMPARE(f->pattern()->op(), MailCommon::SearchPattern::OpAnd);
+ QCOMPARE(f->isEnabled(), true);
+ QCOMPARE(f->pattern()->count(), 4);
+ qDeleteAll(lst);
+}
+
+void FilterImportThunderbirdtest::testImportAndFilters()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Subject contains: kde\"\n"
+ "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"condition=\"AND (subject,contains,konqi)\"\n"); + \
MailCommon::FilterImporterThunderbird importer(filter, false); + \
QList<MailCommon::MailFilter *> lst = importer.importFilter(); + \
MailCommon::MailFilter *f = lst.at(0); + QCOMPARE(f->pattern()->op(), \
MailCommon::SearchPattern::OpAnd); + qDeleteAll(lst);
+}
+
+void FilterImportThunderbirdtest::testImportOrFilters()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Subject contains: kde\"\n"
+ "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"condition=\"OR (subject,contains,konqi)\"\n"); + \
MailCommon::FilterImporterThunderbird importer(filter, false); + \
QList<MailCommon::MailFilter *> lst = importer.importFilter(); + \
MailCommon::MailFilter *f = lst.at(0); + QCOMPARE(f->pattern()->op(), \
MailCommon::SearchPattern::OpOr); + qDeleteAll(lst);
+}
+
+void FilterImportThunderbirdtest::testImportTypeFilters()
+{
+ const QString filter = QLatin1String("version=\"9\"\n"
+ "logging=\"no\"\n"
+ "name=\"Subject contains: kde\"\n"
+ "enabled=\"yes\"\n"
+ "type=\"17\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"condition=\"AND (subject,contains,konqi)\"\n" + \
"name=\"filter1\"\n" + "enabled=\"yes\"\n"
+ "type=\"16\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"action=\"Mark read\"\n" + "condition=\"AND \
(subject,contains,kmail) AND (subject,contains,konqueror) AND (subject,contains,kf5) \
AND (subject,contains,qtcreator)\"\n" + \
"name=\"filter1\"\n" + "enabled=\"yes\"\n"
+ "type=\"1\"\n"
+ "action=\"Copy to folder\"\n"
+ \
"actionValue=\"mailbox://kde@pop.kde.org/Inbox\"\n" + \
"action=\"Mark read\"\n" + "condition=\"AND \
(subject,contains,kmail) AND (subject,contains,konqueror) AND (subject,contains,kf5) \
AND (subject,contains,qtcreator)\"\n"); + MailCommon::FilterImporterThunderbird \
importer(filter, false); + QList<MailCommon::MailFilter *> lst = \
importer.importFilter(); +
+ MailCommon::MailFilter *f = lst.at(0);
+ //17
+ QCOMPARE(f->applyOnInbound(), true);
+ QCOMPARE(f->applyOnExplicit(), true);
+
+ f = lst.at(1);
+ //16
+ QCOMPARE(f->applyOnInbound(), false);
+ QCOMPARE(f->applyOnExplicit(), true);
+
+ f = lst.at(2);
+ //1
+ QCOMPARE(f->applyOnInbound(), true);
+ QCOMPARE(f->applyOnExplicit(), false);
+
+ qDeleteAll(lst);
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp
index 3e8391a,0000000..d04e0e0
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp
+++ b/mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp
@@@ -1,122 -1,0 +1,122 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "filtertestkernel.h"
+
+#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
+#include <messagecomposer/sender/akonadisender.h>
+#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <AkonadiCore/session.h>
+#include <AkonadiCore/entitytreemodel.h>
+#include <AkonadiCore/entitymimetypefiltermodel.h>
+#include <AkonadiCore/changerecorder.h>
+#include <KSharedConfig>
+
+FilterTestKernel::FilterTestKernel(QObject *parent)
+ : QObject(parent)
+{
+ mMessageSender = new MessageComposer::AkonadiSender(this);
+ mIdentityManager = new KIdentityManagement::IdentityManager(false, this);
+ Akonadi::Session *session = new Akonadi::Session("Filter Kernel ETM", this);
+ mFolderCollectionMonitor = new MailCommon::FolderCollectionMonitor(session, \
this); +
+ mEntityTreeModel = new Akonadi::EntityTreeModel(folderCollectionMonitor(), \
this); + mEntityTreeModel->setIncludeUnsubscribed(false);
+ mEntityTreeModel->setItemPopulationStrategy(Akonadi::EntityTreeModel::LazyPopulation);
+
+ mCollectionModel = new Akonadi::EntityMimeTypeFilterModel(this);
+ mCollectionModel->setSourceModel(mEntityTreeModel);
+ mCollectionModel->addMimeTypeInclusionFilter(Akonadi::Collection::mimeType());
+ mCollectionModel->setHeaderGroup(Akonadi::EntityTreeModel::CollectionTreeHeaders);
+ mCollectionModel->setDynamicSortFilter(true);
+ mCollectionModel->setSortCaseSensitivity(Qt::CaseInsensitive);
+}
+
+KIdentityManagement::IdentityManager *FilterTestKernel::identityManager()
+{
+ return mIdentityManager;
+}
+
+MessageComposer::MessageSender *FilterTestKernel::msgSender()
+{
+ return mMessageSender;
+}
+
+Akonadi::EntityMimeTypeFilterModel *FilterTestKernel::collectionModel() const
+{
+ return mCollectionModel;
+}
+
+KSharedConfig::Ptr FilterTestKernel::config()
+{
+ return KSharedConfig::openConfig();
+}
+
+void FilterTestKernel::syncConfig()
+{
+ Q_ASSERT(false);
+}
+
+MailCommon::JobScheduler *FilterTestKernel::jobScheduler() const
+{
+ Q_ASSERT(false);
+ return 0;
+}
+
+Akonadi::ChangeRecorder *FilterTestKernel::folderCollectionMonitor() const
+{
+ return mFolderCollectionMonitor->monitor();
+}
+
+void FilterTestKernel::updateSystemTray()
+{
+ Q_ASSERT(false);
+}
+
+bool FilterTestKernel::showPopupAfterDnD()
+{
+ return false;
+}
+
+qreal FilterTestKernel::closeToQuotaThreshold()
+{
+ return 80;
+}
+
+QStringList FilterTestKernel::customTemplates()
+{
+ Q_ASSERT(false);
+ return QStringList();
+}
+
+bool FilterTestKernel::excludeImportantMailFromExpiry()
+{
+ Q_ASSERT(false);
+ return true;
+}
+
+Akonadi::Entity::Id FilterTestKernel::lastSelectedFolder()
+{
+ Q_ASSERT(false);
+ return Akonadi::Entity::Id();
+}
+
+void FilterTestKernel::setLastSelectedFolder(const Akonadi::Entity::Id &col)
+{
+ Q_UNUSED(col);
+}
+
diff --cc mailcommon/filter/filterimporter/autotests/filtertestkernel.h
index 69a7a35,0000000..702125e
mode 100644,000000..100644
--- a/mailcommon/filter/filterimporter/autotests/filtertestkernel.h
+++ b/mailcommon/filter/filterimporter/autotests/filtertestkernel.h
@@@ -1,63 -1,0 +1,63 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+#ifndef FILTERTESTKERNEL_H
+#define FILTERTESTKERNEL_H
+
+#include <mailcommon/interfaces/mailinterfaces.h>
+
+namespace Akonadi
+{
+class EntityTreeModel;
+class EntityMimeTypeFilterModel;
+}
+
+namespace MailCommon
+{
+class FolderCollectionMonitor;
+}
+
+class FilterTestKernel : public QObject, public MailCommon::IKernel, public \
MailCommon::ISettings +{
+public:
+ explicit FilterTestKernel(QObject *parent = Q_NULLPTR);
+
+ KIdentityManagement::IdentityManager *identityManager() Q_DECL_OVERRIDE;
+ MessageComposer::MessageSender *msgSender() Q_DECL_OVERRIDE;
+
+ Akonadi::EntityMimeTypeFilterModel *collectionModel() const Q_DECL_OVERRIDE;
+ KSharedConfig::Ptr config() Q_DECL_OVERRIDE;
+ void syncConfig() Q_DECL_OVERRIDE;
+ MailCommon::JobScheduler *jobScheduler() const Q_DECL_OVERRIDE;
+ Akonadi::ChangeRecorder *folderCollectionMonitor() const Q_DECL_OVERRIDE;
+ void updateSystemTray() Q_DECL_OVERRIDE;
+
+ qreal closeToQuotaThreshold() Q_DECL_OVERRIDE;
+ bool excludeImportantMailFromExpiry() Q_DECL_OVERRIDE;
+ QStringList customTemplates() Q_DECL_OVERRIDE;
+ Akonadi::Entity::Id lastSelectedFolder() Q_DECL_OVERRIDE;
+ void setLastSelectedFolder(const Akonadi::Entity::Id &col) Q_DECL_OVERRIDE;
+ bool showPopupAfterDnD() Q_DECL_OVERRIDE;
+
+private:
+ KIdentityManagement::IdentityManager *mIdentityManager;
+ MessageComposer::MessageSender *mMessageSender;
+ MailCommon::FolderCollectionMonitor *mFolderCollectionMonitor;
+ Akonadi::EntityTreeModel *mEntityTreeModel;
+ Akonadi::EntityMimeTypeFilterModel *mCollectionModel;
+};
+
+#endif
diff --cc messageviewer/scamdetection/autotests/test_scamdetection.cpp
index 0984663,0000000..4de3be3
mode 100644,000000..100644
--- a/messageviewer/scamdetection/autotests/test_scamdetection.cpp
+++ b/messageviewer/scamdetection/autotests/test_scamdetection.cpp
@@@ -1,125 -1,0 +1,125 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "test_scamdetection.h"
+#include "messageviewer/scamdetection/scamdetection.h"
+#include "messageviewer/scamdetection/scamcheckshorturl.h"
+
+#include <QWebElement>
+#include <QWebFrame>
+#include <QWebSettings>
+#include <QWebPage>
+
+bool ScamDetectionTest::scanPage(QWebFrame *frame)
+{
+ QString details;
+ bool foundScam = false;
+ const QWebElement rootElement = frame->documentElement();
+ bool result = MessageViewer::ScamDetection::scanFrame(rootElement, details);
+ if (result) {
+ foundScam = true;
+ }
+ foreach (QWebFrame *childFrame, frame->childFrames()) {
+ result = MessageViewer::ScamDetection::scanFrame(childFrame->documentElement(), \
details); + if (result) {
+ foundScam = true;
+ }
+ }
+ return foundScam;
+}
+
+bool ScamDetectionTest::testHtml(const QString &content)
+{
+ QWebPage page;
+ page.settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
+ page.settings()->setAttribute(QWebSettings::JavaEnabled, false);
+ page.settings()->setAttribute(QWebSettings::PluginsEnabled, false);
+
+ page.currentFrame()->setHtml(content);
+
+ return scanPage(page.currentFrame());
+}
+
+void ScamDetectionTest::testNoScam()
+{
+ QString content = QLatin1String("<html><body><a \
href=\"www.kde.org\">kde</a></body></html>"); + QCOMPARE(testHtml(content), \
false); +
+ content = QLatin1String("<html><body><a href=\"http://www.kde.org\" \
title=\"http://www.kde.org\">kde</a></body></html>"); + \
QCOMPARE(testHtml(content), false); +
+ content = QLatin1String("<html><body><a href=\"https://www.kde.org\" \
title=\"https://www.kde.org\">kde</a></body></html>"); + \
QCOMPARE(testHtml(content), false); +}
+
+void ScamDetectionTest::testHexaValue()
+{
+ const QString content = QLatin1String("<html><body><a \
href=\"http://125.15.55.88/\" \
title=\"http://0x12.0x1e.0x0A.0x00\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); +}
+
+void ScamDetectionTest::testIp()
+{
+ QString content = QLatin1String("<html><body><a \
href=\"http://127.0.0.1/\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), false); +
+ content = QLatin1String("<html><body><a href=\"http://125.15.55.88/\" \
title=\"http://www.kde.org\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); +
+ content = QLatin1String("<html><body><a href=\"http://125.15.55.88/\" \
title=\"http://125.15.55.88/\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); +}
+
+void ScamDetectionTest::testHref()
+{
+ const QString content = QLatin1String("<html><body><a \
href=\"http://www.kde.org/\" title=\"http://www.kde.org\">test</a></body></html>"); \
+ QCOMPARE(testHtml(content), false); +}
+
+void ScamDetectionTest::testRedirectUrl()
+{
+ const QString content = QLatin1String("<html><body><a \
href=\"http://www.google.fr/url?q=http://www.yahoo.com\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); +}
+
+void ScamDetectionTest::testUrlWithNumericValue()
+{
+ QString content = QLatin1String("<html><body><a \
href=\"http://baseball2.2ndhalfplays.com/nested/attribs/\">http://baseball2.2ndhalfplays.com/nested/attribs</html>");
+ QCOMPARE(testHtml(content), false);
+ content = QLatin1String("<html><body><a \
href=\"http://25.15.55.88/\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); + content = QLatin1String("<html><body><a \
href=\"http://255.0.1.1/\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); + content = QLatin1String("<html><body><a \
href=\"http://1.0.1.1/\">test</a></body></html>"); + QCOMPARE(testHtml(content), \
true); + content = QLatin1String("<html><body><a \
href=\"http://255.500.1.1/\">test</a></body></html>"); + \
QCOMPARE(testHtml(content), true); + content = QLatin1String("<html><body><a \
href=\"http://baseball.2ndhalfplays.com/nested/attribs/\">http://baseball2.2ndhalfplays.com/nested/attribs</html>");
+ QCOMPARE(testHtml(content), false);
+ content = QLatin1String("<html><body><a \
href=\"http://baseball.2ndhalfplays.com/nested/attribs/\">http://baseball2.2ndhalfplays.com/nested/attribs</html>");
+ QCOMPARE(testHtml(content), false);
+}
+
+void ScamDetectionTest::testShortUrl()
+{
+ MessageViewer::ScamCheckShortUrl::loadLongUrlServices();
+ const QString content = QLatin1String("<html><body><a \
href=\"http://tinyurl.com/6d3x\">http://tinyurl.com/6d3x</a></body></html>"); + \
QCOMPARE(testHtml(content), true); +}
+
+QTEST_MAIN(ScamDetectionTest)
+
diff --cc messageviewer/scamdetection/autotests/test_scamdetection.h
index f8bed61,0000000..e864bdb
mode 100644,000000..100644
--- a/messageviewer/scamdetection/autotests/test_scamdetection.h
+++ b/messageviewer/scamdetection/autotests/test_scamdetection.h
@@@ -1,41 -1,0 +1,41 @@@
+/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
++ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License, version 2, as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef TEST_SCAMDETECTION_H
+#define TEST_SCAMDETECTION_H
+
+#include <qtest.h>
+#include <QObject>
+class QWebFrame;
+class ScamDetectionTest : public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void testIp();
+ void testNoScam();
+ void testHref();
+ void testHexaValue();
+ void testRedirectUrl();
+ void testUrlWithNumericValue();
+ void testShortUrl();
+
+private:
+ bool scanPage(QWebFrame *frame);
+ bool testHtml(const QString &content);
+};
+
+#endif
diff --cc pimsettingexporter/addressbook/importaddressbookjob.cpp
index 38c0373,797ad3d..e2609a3
--- a/pimsettingexporter/addressbook/importaddressbookjob.cpp
+++ b/pimsettingexporter/addressbook/importaddressbookjob.cpp
@@@ -1,6 -1,6 +1,5 @@@
/*
- Copyright (c) 2013, 2014 Montel Laurent <montel@kde.org>
-
+ Copyright (c) 2013-2015 Montel Laurent <montel@kde.org>
-
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
published by the Free Software Foundation.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic