summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-14 09:08:36 +0200
committerMontel Laurent <[email protected]>2015-09-14 09:08:36 +0200
commit53269ca2eabfac52da48eff0a401e77f26c2a93a (patch)
tree364b6eed3f6ba86b7157e36068634d320a6b8bc9
parentf327b08f61b73b18b318411f6fd22fc8c590329c (diff)
Make it installable
-rw-r--r--agents/archivemailagent/CMakeLists.txt2
-rw-r--r--agents/archivemailagent/addarchivemaildialog.cpp2
-rw-r--r--agents/archivemailagent/addarchivemaildialog.h2
-rw-r--r--agents/archivemailagent/archivemailagent.cpp2
-rw-r--r--agents/archivemailagent/archivemaildialog.cpp2
-rw-r--r--agents/archivemailagent/archivemailinfo.h2
-rw-r--r--agents/archivemailagent/archivemailkernel.cpp4
-rw-r--r--agents/archivemailagent/archivemailkernel.h2
-rw-r--r--agents/archivemailagent/archivemailmanager.cpp4
-rw-r--r--agents/archivemailagent/archivemailwidget.cpp2
-rw-r--r--agents/archivemailagent/autotests/CMakeLists.txt2
-rw-r--r--agents/archivemailagent/job/archivejob.cpp4
-rw-r--r--agents/archivemailagent/job/archivejob.h2
-rw-r--r--agents/archivemailagent/widgets/formatcombobox.h2
-rw-r--r--agents/mailfilteragent/CMakeLists.txt2
-rw-r--r--agents/mailfilteragent/dummykernel.cpp2
-rw-r--r--agents/mailfilteragent/dummykernel.h2
-rw-r--r--agents/mailfilteragent/filterlogdialog.cpp2
-rw-r--r--agents/mailfilteragent/filtermanager.cpp8
-rw-r--r--agents/mailfilteragent/filtermanager.h2
-rw-r--r--agents/mailfilteragent/mailfilteragent.cpp2
-rw-r--r--agents/mailfilteragent/mailfilteragent.h2
-rw-r--r--calendarsupport/src/CMakeLists.txt4
-rw-r--r--calendarsupport/src/collectiongeneralpage.cpp6
-rw-r--r--importwizard/CMakeLists.txt2
-rw-r--r--importwizard/autodetect/abstractimporter.cpp2
-rw-r--r--importwizard/autodetect/abstractimporter.h2
-rw-r--r--importwizard/autodetect/balsa/balsaimportdata.cpp2
-rw-r--r--importwizard/autodetect/balsa/balsasettings.cpp2
-rw-r--r--importwizard/autodetect/claws-mail/clawsmailimportdata.cpp2
-rw-r--r--importwizard/autodetect/claws-mail/clawsmailsettings.cpp2
-rw-r--r--importwizard/autodetect/evolutionv3/evolutionsettings.cpp2
-rw-r--r--importwizard/autodetect/evolutionv3/evolutionv3importdata.cpp2
-rw-r--r--importwizard/autodetect/icedove/icedoveimportdata.cpp2
-rw-r--r--importwizard/autodetect/opera/operasettings.cpp2
-rw-r--r--importwizard/autodetect/pmail/pmailsettings.cpp2
-rw-r--r--importwizard/autodetect/sylpheed/sylpheedimportdata.cpp2
-rw-r--r--importwizard/autodetect/sylpheed/sylpheedsettings.cpp2
-rw-r--r--importwizard/autodetect/thunderbird/thunderbirdimportdata.cpp2
-rw-r--r--importwizard/autodetect/thunderbird/thunderbirdsettings.cpp2
-rw-r--r--importwizard/importwizard.cpp2
-rw-r--r--importwizard/importwizardkernel.cpp2
-rw-r--r--importwizard/importwizardkernel.h2
-rw-r--r--importwizard/ui/autodetect/importmailpage.ui2
-rw-r--r--importwizard/ui/manual/manualselectfilterpage.ui2
-rw-r--r--kmail/CMakeLists.txt7
-rw-r--r--kmail/antispam-virus/antispamwizard.cpp22
-rw-r--r--kmail/autotests/CMakeLists.txt2
-rw-r--r--kmail/collectionpage/collectionmailinglistpage.h2
-rw-r--r--kmail/collectionpage/collectionshortcutpage.h2
-rw-r--r--kmail/collectionpage/collectiontemplatespage.cpp2
-rw-r--r--kmail/collectionpage/collectionviewpage.cpp2
-rw-r--r--kmail/configuredialog/configureaccountpage.cpp4
-rw-r--r--kmail/configuredialog/configureappearancepage.cpp8
-rw-r--r--kmail/configuredialog/configureappearancepage.h2
-rw-r--r--kmail/configuredialog/configuremiscpage.cpp2
-rw-r--r--kmail/configuredialog/configuresecuritypage.cpp2
-rw-r--r--kmail/dialog/archivefolderdialog.cpp4
-rw-r--r--kmail/editor/attachment/attachmentcontroller.cpp2
-rw-r--r--kmail/editor/kmcomposewin.cpp8
-rw-r--r--kmail/editor/widgets/snippetwidget.cpp2
-rw-r--r--kmail/foldershortcutactionmanager.cpp2
-rw-r--r--kmail/identity/identitydialog.cpp2
-rw-r--r--kmail/identity/identitypage.cpp2
-rw-r--r--kmail/job/removecollectionjob.cpp4
-rw-r--r--kmail/kcm_kpimidentities/CMakeLists.txt2
-rw-r--r--kmail/kmail_part.cpp2
-rw-r--r--kmail/kmcommands.cpp12
-rw-r--r--kmail/kmkernel.cpp10
-rw-r--r--kmail/kmlaunchexternalcomponent.cpp2
-rw-r--r--kmail/kmmainwidget.cpp24
-rw-r--r--kmail/kmmainwidget.h4
-rw-r--r--kmail/kmreadermainwin.cpp2
-rw-r--r--kmail/kmreaderwin.cpp2
-rw-r--r--kmail/kmsystemtray.cpp4
-rw-r--r--kmail/manageshowcollectionproperties.h2
-rw-r--r--kmail/searchdialog/kmailsearchpatternedit.h2
-rw-r--r--kmail/searchdialog/kmsearchmessagemodel.cpp2
-rw-r--r--kmail/searchdialog/searchwindow.cpp8
-rw-r--r--kmail/searchdialog/searchwindow.h2
-rw-r--r--kmail/settings/globalsettings_kmail.kcfgc2
-rw-r--r--kmail/tag/tagactionmanager.cpp2
-rw-r--r--kmail/tag/tagactionmanager.h2
-rw-r--r--kmail/tag/tagselectdialog.cpp2
-rw-r--r--kmail/tag/tagselectdialog.h2
-rw-r--r--kmail/ui/searchwindow.ui2
-rw-r--r--kmail/util.cpp2
-rw-r--r--kmail/util.h2
-rw-r--r--kmail/widgets/collectionpane.cpp2
-rw-r--r--kmail/widgets/kactionmenuaccount.cpp2
-rw-r--r--mailcommon/CMakeLists.txt299
-rw-r--r--mailcommon/src/CMakeLists.txt446
-rw-r--r--mailcommon/src/Mainpage.dox (renamed from mailcommon/Mainpage.dox)0
-rw-r--r--mailcommon/src/Messages.sh (renamed from mailcommon/Messages.sh)0
-rw-r--r--mailcommon/src/collectionpage/attributeregistrar.cpp (renamed from mailcommon/collectionpage/attributeregistrar.cpp)0
-rw-r--r--mailcommon/src/collectionpage/attributes/collectionannotationsattribute.cpp (renamed from mailcommon/collectionpage/attributes/collectionannotationsattribute.cpp)0
-rw-r--r--mailcommon/src/collectionpage/attributes/collectionannotationsattribute.h (renamed from mailcommon/collectionpage/attributes/collectionannotationsattribute.h)0
-rw-r--r--mailcommon/src/collectionpage/attributes/expirecollectionattribute.cpp (renamed from mailcommon/collectionpage/attributes/expirecollectionattribute.cpp)0
-rw-r--r--mailcommon/src/collectionpage/attributes/expirecollectionattribute.h (renamed from mailcommon/collectionpage/attributes/expirecollectionattribute.h)0
-rw-r--r--mailcommon/src/collectionpage/autotests/CMakeLists.txt (renamed from mailcommon/collectionpage/autotests/CMakeLists.txt)2
-rw-r--r--mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.cpp (renamed from mailcommon/collectionpage/autotests/collectionannotationsattributetest.cpp)0
-rw-r--r--mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.h (renamed from mailcommon/collectionpage/autotests/collectionannotationsattributetest.h)0
-rw-r--r--mailcommon/src/collectionpage/autotests/contenttypewidgettest.cpp (renamed from mailcommon/collectionpage/autotests/contenttypewidgettest.cpp)0
-rw-r--r--mailcommon/src/collectionpage/autotests/contenttypewidgettest.h (renamed from mailcommon/collectionpage/autotests/contenttypewidgettest.h)0
-rw-r--r--mailcommon/src/collectionpage/autotests/expirecollectionattributetest.cpp (renamed from mailcommon/collectionpage/autotests/expirecollectionattributetest.cpp)0
-rw-r--r--mailcommon/src/collectionpage/autotests/expirecollectionattributetest.h (renamed from mailcommon/collectionpage/autotests/expirecollectionattributetest.h)0
-rw-r--r--mailcommon/src/collectionpage/autotests/incidencesforwidgettest.cpp (renamed from mailcommon/collectionpage/autotests/incidencesforwidgettest.cpp)0
-rw-r--r--mailcommon/src/collectionpage/autotests/incidencesforwidgettest.h (renamed from mailcommon/collectionpage/autotests/incidencesforwidgettest.h)0
-rw-r--r--mailcommon/src/collectionpage/collectionexpirypage.cpp (renamed from mailcommon/collectionpage/collectionexpirypage.cpp)0
-rw-r--r--mailcommon/src/collectionpage/collectionexpirypage.h (renamed from mailcommon/collectionpage/collectionexpirypage.h)0
-rw-r--r--mailcommon/src/collectionpage/collectiongeneralpage.cpp (renamed from mailcommon/collectionpage/collectiongeneralpage.cpp)0
-rw-r--r--mailcommon/src/collectionpage/collectiongeneralpage.h (renamed from mailcommon/collectionpage/collectiongeneralpage.h)0
-rw-r--r--mailcommon/src/collectionpage/collectiontypeutil.cpp (renamed from mailcommon/collectionpage/collectiontypeutil.cpp)0
-rw-r--r--mailcommon/src/collectionpage/collectiontypeutil.h (renamed from mailcommon/collectionpage/collectiontypeutil.h)0
-rw-r--r--mailcommon/src/collectionpage/contenttypewidget.cpp (renamed from mailcommon/collectionpage/contenttypewidget.cpp)0
-rw-r--r--mailcommon/src/collectionpage/contenttypewidget.h (renamed from mailcommon/collectionpage/contenttypewidget.h)0
-rw-r--r--mailcommon/src/collectionpage/incidencesforwidget.cpp (renamed from mailcommon/collectionpage/incidencesforwidget.cpp)0
-rw-r--r--mailcommon/src/collectionpage/incidencesforwidget.h (renamed from mailcommon/collectionpage/incidencesforwidget.h)0
-rw-r--r--mailcommon/src/dbusoperators.h (renamed from mailcommon/dbusoperators.h)0
-rw-r--r--mailcommon/src/designer/mailcommon.widgets (renamed from mailcommon/designer/mailcommon.widgets)0
-rw-r--r--mailcommon/src/filter/TODO (renamed from mailcommon/filter/TODO)0
-rw-r--r--mailcommon/src/filter/autotests/CMakeLists.txt (renamed from mailcommon/filter/autotests/CMakeLists.txt)2
-rw-r--r--mailcommon/src/filter/autotests/filteractionaddheadertest.cpp (renamed from mailcommon/filter/autotests/filteractionaddheadertest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionaddheadertest.h (renamed from mailcommon/filter/autotests/filteractionaddheadertest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.cpp (renamed from mailcommon/filter/autotests/filteractionaddtoaddressbooktest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.h (renamed from mailcommon/filter/autotests/filteractionaddtoaddressbooktest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractioncopytest.cpp (renamed from mailcommon/filter/autotests/filteractioncopytest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractioncopytest.h (renamed from mailcommon/filter/autotests/filteractioncopytest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractiondeletetest.cpp (renamed from mailcommon/filter/autotests/filteractiondeletetest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractiondeletetest.h (renamed from mailcommon/filter/autotests/filteractiondeletetest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionexectest.cpp (renamed from mailcommon/filter/autotests/filteractionexectest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionexectest.h (renamed from mailcommon/filter/autotests/filteractionexectest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionforwardtest.cpp (renamed from mailcommon/filter/autotests/filteractionforwardtest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionforwardtest.h (renamed from mailcommon/filter/autotests/filteractionforwardtest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionmovetest.cpp (renamed from mailcommon/filter/autotests/filteractionmovetest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionmovetest.h (renamed from mailcommon/filter/autotests/filteractionmovetest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionpipethroughtest.cpp (renamed from mailcommon/filter/autotests/filteractionpipethroughtest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionpipethroughtest.h (renamed from mailcommon/filter/autotests/filteractionpipethroughtest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionplaysoundtest.cpp (renamed from mailcommon/filter/autotests/filteractionplaysoundtest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionplaysoundtest.h (renamed from mailcommon/filter/autotests/filteractionplaysoundtest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionredirecttest.cpp (renamed from mailcommon/filter/autotests/filteractionredirecttest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionredirecttest.h (renamed from mailcommon/filter/autotests/filteractionredirecttest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionremoveheadertest.cpp (renamed from mailcommon/filter/autotests/filteractionremoveheadertest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionremoveheadertest.h (renamed from mailcommon/filter/autotests/filteractionremoveheadertest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionreplytotest.cpp (renamed from mailcommon/filter/autotests/filteractionreplytotest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionreplytotest.h (renamed from mailcommon/filter/autotests/filteractionreplytotest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionrewriteheadertest.cpp (renamed from mailcommon/filter/autotests/filteractionrewriteheadertest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionrewriteheadertest.h (renamed from mailcommon/filter/autotests/filteractionrewriteheadertest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.cpp (renamed from mailcommon/filter/autotests/filteractionsendfakedispositiontest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.h (renamed from mailcommon/filter/autotests/filteractionsendfakedispositiontest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsendreceipttest.cpp (renamed from mailcommon/filter/autotests/filteractionsendreceipttest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsendreceipttest.h (renamed from mailcommon/filter/autotests/filteractionsendreceipttest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsetstatustest.cpp (renamed from mailcommon/filter/autotests/filteractionsetstatustest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsetstatustest.h (renamed from mailcommon/filter/autotests/filteractionsetstatustest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsettransporttest.cpp (renamed from mailcommon/filter/autotests/filteractionsettransporttest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionsettransporttest.h (renamed from mailcommon/filter/autotests/filteractionsettransporttest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionunsetstatustest.cpp (renamed from mailcommon/filter/autotests/filteractionunsetstatustest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionunsetstatustest.h (renamed from mailcommon/filter/autotests/filteractionunsetstatustest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionwithaddresstest.cpp (renamed from mailcommon/filter/autotests/filteractionwithaddresstest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionwithaddresstest.h (renamed from mailcommon/filter/autotests/filteractionwithaddresstest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionwithurltest.cpp (renamed from mailcommon/filter/autotests/filteractionwithurltest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filteractionwithurltest.h (renamed from mailcommon/filter/autotests/filteractionwithurltest.h)0
-rw-r--r--mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.cpp (renamed from mailcommon/filter/autotests/filterconverttosieveresultdialogtest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.h (renamed from mailcommon/filter/autotests/filterconverttosieveresultdialogtest.h)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterdialogtest.cpp (renamed from mailcommon/filter/autotests/invalidfilterdialogtest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterdialogtest.h (renamed from mailcommon/filter/autotests/invalidfilterdialogtest.h)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterinfotest.cpp (renamed from mailcommon/filter/autotests/invalidfilterinfotest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterinfotest.h (renamed from mailcommon/filter/autotests/invalidfilterinfotest.h)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterinfowidgettest.cpp (renamed from mailcommon/filter/autotests/invalidfilterinfowidgettest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterinfowidgettest.h (renamed from mailcommon/filter/autotests/invalidfilterinfowidgettest.h)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterlistwidgettest.cpp (renamed from mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterlistwidgettest.h (renamed from mailcommon/filter/autotests/invalidfilterlistwidgettest.h)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterwidgettest.cpp (renamed from mailcommon/filter/autotests/invalidfilterwidgettest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/invalidfilterwidgettest.h (renamed from mailcommon/filter/autotests/invalidfilterwidgettest.h)0
-rw-r--r--mailcommon/src/filter/autotests/itemcontexttest.cpp (renamed from mailcommon/filter/autotests/itemcontexttest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/itemcontexttest.h (renamed from mailcommon/filter/autotests/itemcontexttest.h)0
-rw-r--r--mailcommon/src/filter/autotests/mailfiltertest.cpp (renamed from mailcommon/filter/autotests/mailfiltertest.cpp)0
-rw-r--r--mailcommon/src/filter/autotests/mailfiltertest.h (renamed from mailcommon/filter/autotests/mailfiltertest.h)0
-rw-r--r--mailcommon/src/filter/dialog/filteractionmissingargumentdialog.cpp (renamed from mailcommon/filter/dialog/filteractionmissingargumentdialog.cpp)0
-rw-r--r--mailcommon/src/filter/dialog/filteractionmissingargumentdialog.h (renamed from mailcommon/filter/dialog/filteractionmissingargumentdialog.h)0
-rw-r--r--mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp (renamed from mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.cpp)0
-rw-r--r--mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.h (renamed from mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.h)0
-rw-r--r--mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp (renamed from mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.cpp)0
-rw-r--r--mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.h (renamed from mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteraction.cpp (renamed from mailcommon/filter/filteractions/filteraction.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteraction.h (renamed from mailcommon/filter/filteractions/filteraction.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionaddheader.cpp (renamed from mailcommon/filter/filteractions/filteractionaddheader.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionaddheader.h (renamed from mailcommon/filter/filteractions/filteractionaddheader.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionaddtag.cpp (renamed from mailcommon/filter/filteractions/filteractionaddtag.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionaddtag.h (renamed from mailcommon/filter/filteractions/filteractionaddtag.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.cpp (renamed from mailcommon/filter/filteractions/filteractionaddtoaddressbook.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.h (renamed from mailcommon/filter/filteractions/filteractionaddtoaddressbook.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractioncopy.cpp (renamed from mailcommon/filter/filteractions/filteractioncopy.cpp)2
-rw-r--r--mailcommon/src/filter/filteractions/filteractioncopy.h (renamed from mailcommon/filter/filteractions/filteractioncopy.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractiondelete.cpp (renamed from mailcommon/filter/filteractions/filteractiondelete.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractiondelete.h (renamed from mailcommon/filter/filteractions/filteractiondelete.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractiondict.cpp (renamed from mailcommon/filter/filteractions/filteractiondict.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractiondict.h (renamed from mailcommon/filter/filteractions/filteractiondict.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionexec.cpp (renamed from mailcommon/filter/filteractions/filteractionexec.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionexec.h (renamed from mailcommon/filter/filteractions/filteractionexec.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionforward.cpp (renamed from mailcommon/filter/filteractions/filteractionforward.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionforward.h (renamed from mailcommon/filter/filteractions/filteractionforward.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionmove.cpp (renamed from mailcommon/filter/filteractions/filteractionmove.cpp)2
-rw-r--r--mailcommon/src/filter/filteractions/filteractionmove.h (renamed from mailcommon/filter/filteractions/filteractionmove.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionpipethrough.cpp (renamed from mailcommon/filter/filteractions/filteractionpipethrough.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionpipethrough.h (renamed from mailcommon/filter/filteractions/filteractionpipethrough.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionplaysound.cpp (renamed from mailcommon/filter/filteractions/filteractionplaysound.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionplaysound.h (renamed from mailcommon/filter/filteractions/filteractionplaysound.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionredirect.cpp (renamed from mailcommon/filter/filteractions/filteractionredirect.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionredirect.h (renamed from mailcommon/filter/filteractions/filteractionredirect.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionremoveheader.cpp (renamed from mailcommon/filter/filteractions/filteractionremoveheader.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionremoveheader.h (renamed from mailcommon/filter/filteractions/filteractionremoveheader.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionreplyto.cpp (renamed from mailcommon/filter/filteractions/filteractionreplyto.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionreplyto.h (renamed from mailcommon/filter/filteractions/filteractionreplyto.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionrewriteheader.cpp (renamed from mailcommon/filter/filteractions/filteractionrewriteheader.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionrewriteheader.h (renamed from mailcommon/filter/filteractions/filteractionrewriteheader.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsendfakedisposition.cpp (renamed from mailcommon/filter/filteractions/filteractionsendfakedisposition.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsendfakedisposition.h (renamed from mailcommon/filter/filteractions/filteractionsendfakedisposition.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsendreceipt.cpp (renamed from mailcommon/filter/filteractions/filteractionsendreceipt.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsendreceipt.h (renamed from mailcommon/filter/filteractions/filteractionsendreceipt.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsetidentity.cpp (renamed from mailcommon/filter/filteractions/filteractionsetidentity.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsetidentity.h (renamed from mailcommon/filter/filteractions/filteractionsetidentity.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsetstatus.cpp (renamed from mailcommon/filter/filteractions/filteractionsetstatus.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsetstatus.h (renamed from mailcommon/filter/filteractions/filteractionsetstatus.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsettransport.cpp (renamed from mailcommon/filter/filteractions/filteractionsettransport.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionsettransport.h (renamed from mailcommon/filter/filteractions/filteractionsettransport.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionstatus.cpp (renamed from mailcommon/filter/filteractions/filteractionstatus.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionstatus.h (renamed from mailcommon/filter/filteractions/filteractionstatus.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionunsetstatus.cpp (renamed from mailcommon/filter/filteractions/filteractionunsetstatus.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionunsetstatus.h (renamed from mailcommon/filter/filteractions/filteractionunsetstatus.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwidget.cpp (renamed from mailcommon/filter/filteractions/filteractionwidget.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwidget.h (renamed from mailcommon/filter/filteractions/filteractionwidget.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithaddress.cpp (renamed from mailcommon/filter/filteractions/filteractionwithaddress.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithaddress.h (renamed from mailcommon/filter/filteractions/filteractionwithaddress.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithcommand.cpp (renamed from mailcommon/filter/filteractions/filteractionwithcommand.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithcommand.h (renamed from mailcommon/filter/filteractions/filteractionwithcommand.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithfolder.cpp (renamed from mailcommon/filter/filteractions/filteractionwithfolder.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithfolder.h (renamed from mailcommon/filter/filteractions/filteractionwithfolder.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithnone.cpp (renamed from mailcommon/filter/filteractions/filteractionwithnone.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithnone.h (renamed from mailcommon/filter/filteractions/filteractionwithnone.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithstring.cpp (renamed from mailcommon/filter/filteractions/filteractionwithstring.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithstring.h (renamed from mailcommon/filter/filteractions/filteractionwithstring.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithstringlist.cpp (renamed from mailcommon/filter/filteractions/filteractionwithstringlist.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithstringlist.h (renamed from mailcommon/filter/filteractions/filteractionwithstringlist.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithtest.cpp (renamed from mailcommon/filter/filteractions/filteractionwithtest.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithtest.h (renamed from mailcommon/filter/filteractions/filteractionwithtest.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithuoid.cpp (renamed from mailcommon/filter/filteractions/filteractionwithuoid.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithuoid.h (renamed from mailcommon/filter/filteractions/filteractionwithuoid.h)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithurl.cpp (renamed from mailcommon/filter/filteractions/filteractionwithurl.cpp)0
-rw-r--r--mailcommon/src/filter/filteractions/filteractionwithurl.h (renamed from mailcommon/filter/filteractions/filteractionwithurl.h)0
-rw-r--r--mailcommon/src/filter/filterconverter/filterconverttosieve.cpp (renamed from mailcommon/filter/filterconverter/filterconverttosieve.cpp)0
-rw-r--r--mailcommon/src/filter/filterconverter/filterconverttosieve.h (renamed from mailcommon/filter/filterconverter/filterconverttosieve.h)0
-rw-r--r--mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.cpp (renamed from mailcommon/filter/filterconverter/filterconverttosieveresultdialog.cpp)0
-rw-r--r--mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.h (renamed from mailcommon/filter/filterconverter/filterconverttosieveresultdialog.h)0
-rw-r--r--mailcommon/src/filter/filtereditdialog.cpp (renamed from mailcommon/filter/filtereditdialog.cpp)0
-rw-r--r--mailcommon/src/filter/filtereditdialog_p.h (renamed from mailcommon/filter/filtereditdialog_p.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/CMakeLists.txt (renamed from mailcommon/filter/filterimporter/autotests/CMakeLists.txt)14
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportbalsatest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportergmailtest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportergmailtest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp (renamed from mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.h (renamed from mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filtertestkernel.cpp (renamed from mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/filtertestkernel.h (renamed from mailcommon/filter/filterimporter/autotests/filtertestkernel.h)2
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml (renamed from mailcommon/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc (renamed from mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc)0
-rwxr-xr-xmailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc (renamed from mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc (renamed from mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc)0
-rw-r--r--mailcommon/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc (renamed from mailcommon/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterabstract.cpp (renamed from mailcommon/filter/filterimporter/filterimporterabstract.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterabstract.h (renamed from mailcommon/filter/filterimporter/filterimporterabstract.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterbalsa.cpp (renamed from mailcommon/filter/filterimporter/filterimporterbalsa.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterbalsa.h (renamed from mailcommon/filter/filterimporter/filterimporterbalsa.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterclawsmail.cpp (renamed from mailcommon/filter/filterimporter/filterimporterclawsmail.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterclawsmail.h (renamed from mailcommon/filter/filterimporter/filterimporterclawsmail.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterevolution.cpp (renamed from mailcommon/filter/filterimporter/filterimporterevolution.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterevolution.h (renamed from mailcommon/filter/filterimporter/filterimporterevolution.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimportergmail.cpp (renamed from mailcommon/filter/filterimporter/filterimportergmail.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimportergmail.h (renamed from mailcommon/filter/filterimporter/filterimportergmail.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterprocmail.cpp (renamed from mailcommon/filter/filterimporter/filterimporterprocmail.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterprocmail.h (renamed from mailcommon/filter/filterimporter/filterimporterprocmail.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimportersylpheed.cpp (renamed from mailcommon/filter/filterimporter/filterimportersylpheed.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimportersylpheed.h (renamed from mailcommon/filter/filterimporter/filterimportersylpheed.h)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterthunderbird.cpp (renamed from mailcommon/filter/filterimporter/filterimporterthunderbird.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporter/filterimporterthunderbird.h (renamed from mailcommon/filter/filterimporter/filterimporterthunderbird.h)0
-rw-r--r--mailcommon/src/filter/filterimporterexporter.cpp (renamed from mailcommon/filter/filterimporterexporter.cpp)0
-rw-r--r--mailcommon/src/filter/filterimporterexporter.h (renamed from mailcommon/filter/filterimporterexporter.h)0
-rw-r--r--mailcommon/src/filter/filterlog.cpp (renamed from mailcommon/filter/filterlog.cpp)0
-rw-r--r--mailcommon/src/filter/filterlog.h (renamed from mailcommon/filter/filterlog.h)0
-rw-r--r--mailcommon/src/filter/filtermanager.cpp (renamed from mailcommon/filter/filtermanager.cpp)0
-rw-r--r--mailcommon/src/filter/filtermanager.h (renamed from mailcommon/filter/filtermanager.h)0
-rw-r--r--mailcommon/src/filter/filterselectiondialog.cpp (renamed from mailcommon/filter/filterselectiondialog.cpp)0
-rw-r--r--mailcommon/src/filter/filterselectiondialog.h (renamed from mailcommon/filter/filterselectiondialog.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterdialog.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterdialog.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterdialog.h (renamed from mailcommon/filter/invalidfilters/invalidfilterdialog.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterinfo.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterinfo.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterinfo.h (renamed from mailcommon/filter/invalidfilters/invalidfilterinfo.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterinfowidget.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.h (renamed from mailcommon/filter/invalidfilters/invalidfilterinfowidget.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterlistitemdelegate.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.h (renamed from mailcommon/filter/invalidfilters/invalidfilterlistitemdelegate.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterlistmodel.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.h (renamed from mailcommon/filter/invalidfilters/invalidfilterlistmodel.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterlistview.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterlistview.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterlistview.h (renamed from mailcommon/filter/invalidfilters/invalidfilterlistview.h)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterwidget.cpp (renamed from mailcommon/filter/invalidfilters/invalidfilterwidget.cpp)0
-rw-r--r--mailcommon/src/filter/invalidfilters/invalidfilterwidget.h (renamed from mailcommon/filter/invalidfilters/invalidfilterwidget.h)0
-rw-r--r--mailcommon/src/filter/itemcontext.cpp (renamed from mailcommon/filter/itemcontext.cpp)0
-rw-r--r--mailcommon/src/filter/itemcontext.h (renamed from mailcommon/filter/itemcontext.h)0
-rw-r--r--mailcommon/src/filter/kmfilteraccountlist.cpp (renamed from mailcommon/filter/kmfilteraccountlist.cpp)0
-rw-r--r--mailcommon/src/filter/kmfilteraccountlist.h (renamed from mailcommon/filter/kmfilteraccountlist.h)0
-rw-r--r--mailcommon/src/filter/kmfilterdialog.cpp (renamed from mailcommon/filter/kmfilterdialog.cpp)0
-rw-r--r--mailcommon/src/filter/kmfilterdialog.h (renamed from mailcommon/filter/kmfilterdialog.h)0
-rw-r--r--mailcommon/src/filter/kmfilterlistbox.cpp (renamed from mailcommon/filter/kmfilterlistbox.cpp)0
-rw-r--r--mailcommon/src/filter/kmfilterlistbox.h (renamed from mailcommon/filter/kmfilterlistbox.h)0
-rw-r--r--mailcommon/src/filter/mailfilter.cpp (renamed from mailcommon/filter/mailfilter.cpp)0
-rw-r--r--mailcommon/src/filter/mailfilter.h (renamed from mailcommon/filter/mailfilter.h)0
-rw-r--r--mailcommon/src/filter/mdnadvicedialog.cpp (renamed from mailcommon/filter/mdnadvicedialog.cpp)2
-rw-r--r--mailcommon/src/filter/mdnadvicedialog.h (renamed from mailcommon/filter/mdnadvicedialog.h)0
-rw-r--r--mailcommon/src/filter/soundtestwidget.cpp (renamed from mailcommon/filter/soundtestwidget.cpp)0
-rw-r--r--mailcommon/src/filter/soundtestwidget.h (renamed from mailcommon/filter/soundtestwidget.h)0
-rw-r--r--mailcommon/src/filter/tests/CMakeLists.txt (renamed from mailcommon/filter/tests/CMakeLists.txt)6
-rw-r--r--mailcommon/src/filter/tests/filterimporterexportergui.cpp (renamed from mailcommon/filter/tests/filterimporterexportergui.cpp)0
-rw-r--r--mailcommon/src/filter/tests/filterimporterexportergui.h (renamed from mailcommon/filter/tests/filterimporterexportergui.h)2
-rw-r--r--mailcommon/src/filter/tests/invalidfilterdialoggui.cpp (renamed from mailcommon/filter/tests/invalidfilterdialoggui.cpp)0
-rw-r--r--mailcommon/src/filter/tests/mndadvicedialoggui.cpp (renamed from mailcommon/filter/tests/mndadvicedialoggui.cpp)0
-rw-r--r--mailcommon/src/filter/ui/filterconfigwidget.ui (renamed from mailcommon/filter/ui/filterconfigwidget.ui)0
-rw-r--r--mailcommon/src/filter/ui/selectthunderbirdfilterfileswidget.ui (renamed from mailcommon/filter/ui/selectthunderbirdfilterfileswidget.ui)0
-rw-r--r--mailcommon/src/folder/accountconfigorderdialog.cpp (renamed from mailcommon/folder/accountconfigorderdialog.cpp)2
-rw-r--r--mailcommon/src/folder/accountconfigorderdialog.h (renamed from mailcommon/folder/accountconfigorderdialog.h)0
-rw-r--r--mailcommon/src/folder/entitycollectionorderproxymodel.cpp (renamed from mailcommon/folder/entitycollectionorderproxymodel.cpp)0
-rw-r--r--mailcommon/src/folder/entitycollectionorderproxymodel.h (renamed from mailcommon/folder/entitycollectionorderproxymodel.h)0
-rw-r--r--mailcommon/src/folder/foldercollection.cpp (renamed from mailcommon/folder/foldercollection.cpp)0
-rw-r--r--mailcommon/src/folder/foldercollection.h (renamed from mailcommon/folder/foldercollection.h)0
-rw-r--r--mailcommon/src/folder/foldercollectionmonitor.cpp (renamed from mailcommon/folder/foldercollectionmonitor.cpp)0
-rw-r--r--mailcommon/src/folder/foldercollectionmonitor.h (renamed from mailcommon/folder/foldercollectionmonitor.h)0
-rw-r--r--mailcommon/src/folder/folderrequester.cpp (renamed from mailcommon/folder/folderrequester.cpp)0
-rw-r--r--mailcommon/src/folder/folderrequester.h (renamed from mailcommon/folder/folderrequester.h)0
-rw-r--r--mailcommon/src/folder/folderselectiondialog.cpp (renamed from mailcommon/folder/folderselectiondialog.cpp)0
-rw-r--r--mailcommon/src/folder/folderselectiondialog.h (renamed from mailcommon/folder/folderselectiondialog.h)0
-rw-r--r--mailcommon/src/folder/foldertreeview.cpp (renamed from mailcommon/folder/foldertreeview.cpp)0
-rw-r--r--mailcommon/src/folder/foldertreeview.h (renamed from mailcommon/folder/foldertreeview.h)0
-rw-r--r--mailcommon/src/folder/foldertreewidget.cpp (renamed from mailcommon/folder/foldertreewidget.cpp)0
-rw-r--r--mailcommon/src/folder/foldertreewidget.h (renamed from mailcommon/folder/foldertreewidget.h)0
-rw-r--r--mailcommon/src/folder/foldertreewidgetproxymodel.cpp (renamed from mailcommon/folder/foldertreewidgetproxymodel.cpp)0
-rw-r--r--mailcommon/src/folder/foldertreewidgetproxymodel.h (renamed from mailcommon/folder/foldertreewidgetproxymodel.h)0
-rw-r--r--mailcommon/src/interfaces/mailinterfaces.h (renamed from mailcommon/interfaces/mailinterfaces.h)0
-rw-r--r--mailcommon/src/interfaces/rulewidgethandler.h (renamed from mailcommon/interfaces/rulewidgethandler.h)0
-rw-r--r--mailcommon/src/job/backupjob.cpp (renamed from mailcommon/job/backupjob.cpp)0
-rw-r--r--mailcommon/src/job/backupjob.h (renamed from mailcommon/job/backupjob.h)0
-rw-r--r--mailcommon/src/job/expirejob.cpp (renamed from mailcommon/job/expirejob.cpp)0
-rw-r--r--mailcommon/src/job/expirejob.h (renamed from mailcommon/job/expirejob.h)0
-rw-r--r--mailcommon/src/job/folderjob.cpp (renamed from mailcommon/job/folderjob.cpp)0
-rw-r--r--mailcommon/src/job/folderjob.h (renamed from mailcommon/job/folderjob.h)0
-rw-r--r--mailcommon/src/job/jobscheduler.cpp (renamed from mailcommon/job/jobscheduler.cpp)0
-rw-r--r--mailcommon/src/job/jobscheduler.h (renamed from mailcommon/job/jobscheduler.h)0
-rw-r--r--mailcommon/src/kernel/mailkernel.cpp (renamed from mailcommon/kernel/mailkernel.cpp)0
-rw-r--r--mailcommon/src/kernel/mailkernel.h (renamed from mailcommon/kernel/mailkernel.h)0
-rw-r--r--mailcommon/src/mdn/sendmdnhandler.cpp (renamed from mailcommon/mdn/sendmdnhandler.cpp)0
-rw-r--r--mailcommon/src/mdn/sendmdnhandler.h (renamed from mailcommon/mdn/sendmdnhandler.h)0
-rw-r--r--mailcommon/src/search/autotests/CMakeLists.txt (renamed from mailcommon/search/autotests/CMakeLists.txt)2
-rw-r--r--mailcommon/src/search/autotests/searchpatterntest.cpp (renamed from mailcommon/search/autotests/searchpatterntest.cpp)0
-rw-r--r--mailcommon/src/search/autotests/searchpatterntest.h (renamed from mailcommon/search/autotests/searchpatterntest.h)0
-rw-r--r--mailcommon/src/search/autotests/searchruledatetest.cpp (renamed from mailcommon/search/autotests/searchruledatetest.cpp)0
-rw-r--r--mailcommon/src/search/autotests/searchruledatetest.h (renamed from mailcommon/search/autotests/searchruledatetest.h)0
-rw-r--r--mailcommon/src/search/autotests/searchrulenumericaltest.cpp (renamed from mailcommon/search/autotests/searchrulenumericaltest.cpp)0
-rw-r--r--mailcommon/src/search/autotests/searchrulenumericaltest.h (renamed from mailcommon/search/autotests/searchrulenumericaltest.h)0
-rw-r--r--mailcommon/src/search/autotests/searchrulestatustest.cpp (renamed from mailcommon/search/autotests/searchrulestatustest.cpp)0
-rw-r--r--mailcommon/src/search/autotests/searchrulestatustest.h (renamed from mailcommon/search/autotests/searchrulestatustest.h)0
-rw-r--r--mailcommon/src/search/autotests/searchrulestringtest.cpp (renamed from mailcommon/search/autotests/searchrulestringtest.cpp)0
-rw-r--r--mailcommon/src/search/autotests/searchrulestringtest.h (renamed from mailcommon/search/autotests/searchrulestringtest.h)0
-rw-r--r--mailcommon/src/search/autotests/searchruletest.cpp (renamed from mailcommon/search/autotests/searchruletest.cpp)0
-rw-r--r--mailcommon/src/search/autotests/searchruletest.h (renamed from mailcommon/search/autotests/searchruletest.h)0
-rw-r--r--mailcommon/src/search/searchpattern.cpp (renamed from mailcommon/search/searchpattern.cpp)0
-rw-r--r--mailcommon/src/search/searchpattern.h (renamed from mailcommon/search/searchpattern.h)0
-rw-r--r--mailcommon/src/search/searchpatternedit.cpp (renamed from mailcommon/search/searchpatternedit.cpp)0
-rw-r--r--mailcommon/src/search/searchpatternedit.h (renamed from mailcommon/search/searchpatternedit.h)0
-rw-r--r--mailcommon/src/search/searchrule/searchrule.cpp (renamed from mailcommon/search/searchrule/searchrule.cpp)0
-rw-r--r--mailcommon/src/search/searchrule/searchrule.h (renamed from mailcommon/search/searchrule/searchrule.h)0
-rw-r--r--mailcommon/src/search/searchrule/searchruledate.cpp (renamed from mailcommon/search/searchrule/searchruledate.cpp)0
-rw-r--r--mailcommon/src/search/searchrule/searchruledate.h (renamed from mailcommon/search/searchrule/searchruledate.h)0
-rw-r--r--mailcommon/src/search/searchrule/searchrulenumerical.cpp (renamed from mailcommon/search/searchrule/searchrulenumerical.cpp)0
-rw-r--r--mailcommon/src/search/searchrule/searchrulenumerical.h (renamed from mailcommon/search/searchrule/searchrulenumerical.h)0
-rw-r--r--mailcommon/src/search/searchrule/searchrulestatus.cpp (renamed from mailcommon/search/searchrule/searchrulestatus.cpp)0
-rw-r--r--mailcommon/src/search/searchrule/searchrulestatus.h (renamed from mailcommon/search/searchrule/searchrulestatus.h)0
-rw-r--r--mailcommon/src/search/searchrule/searchrulestring.cpp (renamed from mailcommon/search/searchrule/searchrulestring.cpp)0
-rw-r--r--mailcommon/src/search/searchrule/searchrulestring.h (renamed from mailcommon/search/searchrule/searchrulestring.h)0
-rw-r--r--mailcommon/src/search/widgethandler/daterulewidgethandler.cpp (renamed from mailcommon/search/widgethandler/daterulewidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/daterulewidgethandler.h (renamed from mailcommon/search/widgethandler/daterulewidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/headersrulerwidgethandler.cpp (renamed from mailcommon/search/widgethandler/headersrulerwidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/headersrulerwidgethandler.h (renamed from mailcommon/search/widgethandler/headersrulerwidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/messagerulewidgethandler.cpp (renamed from mailcommon/search/widgethandler/messagerulewidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/messagerulewidgethandler.h (renamed from mailcommon/search/widgethandler/messagerulewidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.cpp (renamed from mailcommon/search/widgethandler/numericdoublerulewidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.h (renamed from mailcommon/search/widgethandler/numericdoublerulewidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/numericrulewidgethandler.cpp (renamed from mailcommon/search/widgethandler/numericrulewidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/numericrulewidgethandler.h (renamed from mailcommon/search/widgethandler/numericrulewidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/rulewidgethandlermanager.cpp (renamed from mailcommon/search/widgethandler/rulewidgethandlermanager.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/rulewidgethandlermanager.h (renamed from mailcommon/search/widgethandler/rulewidgethandlermanager.h)0
-rw-r--r--mailcommon/src/search/widgethandler/statusrulewidgethandler.cpp (renamed from mailcommon/search/widgethandler/statusrulewidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/statusrulewidgethandler.h (renamed from mailcommon/search/widgethandler/statusrulewidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/tagrulewidgethandler.cpp (renamed from mailcommon/search/widgethandler/tagrulewidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/tagrulewidgethandler.h (renamed from mailcommon/search/widgethandler/tagrulewidgethandler.h)0
-rw-r--r--mailcommon/src/search/widgethandler/textrulerwidgethandler.cpp (renamed from mailcommon/search/widgethandler/textrulerwidgethandler.cpp)0
-rw-r--r--mailcommon/src/search/widgethandler/textrulerwidgethandler.h (renamed from mailcommon/search/widgethandler/textrulerwidgethandler.h)0
-rw-r--r--mailcommon/src/settings.kcfg (renamed from mailcommon/settings.kcfg)0
-rw-r--r--mailcommon/src/settings/mailcommon.kcfg (renamed from mailcommon/settings/mailcommon.kcfg)0
-rw-r--r--mailcommon/src/settings/mailcommonsettings_base.kcfgc (renamed from mailcommon/settings/mailcommonsettings_base.kcfgc)0
-rw-r--r--mailcommon/src/snippets/autotests/CMakeLists.txt (renamed from mailcommon/snippets/autotests/CMakeLists.txt)2
-rw-r--r--mailcommon/src/snippets/autotests/snippetsmanagertest.cpp (renamed from mailcommon/snippets/autotests/snippetsmanagertest.cpp)0
-rw-r--r--mailcommon/src/snippets/autotests/snippetsmanagertest.h (renamed from mailcommon/snippets/autotests/snippetsmanagertest.h)0
-rw-r--r--mailcommon/src/snippets/snippetdialog.cpp (renamed from mailcommon/snippets/snippetdialog.cpp)0
-rw-r--r--mailcommon/src/snippets/snippetdialog.h (renamed from mailcommon/snippets/snippetdialog.h)0
-rw-r--r--mailcommon/src/snippets/snippetsmanager.cpp (renamed from mailcommon/snippets/snippetsmanager.cpp)0
-rw-r--r--mailcommon/src/snippets/snippetsmanager.h (renamed from mailcommon/snippets/snippetsmanager.h)0
-rw-r--r--mailcommon/src/snippets/snippetsmodel.cpp (renamed from mailcommon/snippets/snippetsmodel.cpp)0
-rw-r--r--mailcommon/src/snippets/snippetsmodel.h (renamed from mailcommon/snippets/snippetsmodel.h)0
-rw-r--r--mailcommon/src/snippets/snippetvariabledialog.cpp (renamed from mailcommon/snippets/snippetvariabledialog.cpp)0
-rw-r--r--mailcommon/src/snippets/snippetvariabledialog.h (renamed from mailcommon/snippets/snippetvariabledialog.h)0
-rw-r--r--mailcommon/src/snippets/ui/snippetdialog.ui (renamed from mailcommon/snippets/ui/snippetdialog.ui)0
-rw-r--r--mailcommon/src/tag/addtagdialog.cpp (renamed from mailcommon/tag/addtagdialog.cpp)2
-rw-r--r--mailcommon/src/tag/addtagdialog.h (renamed from mailcommon/tag/addtagdialog.h)0
-rw-r--r--mailcommon/src/tag/tag.cpp (renamed from mailcommon/tag/tag.cpp)0
-rw-r--r--mailcommon/src/tag/tag.h (renamed from mailcommon/tag/tag.h)0
-rw-r--r--mailcommon/src/tag/tagwidget.cpp (renamed from mailcommon/tag/tagwidget.cpp)0
-rw-r--r--mailcommon/src/tag/tagwidget.h (renamed from mailcommon/tag/tagwidget.h)0
-rw-r--r--mailcommon/src/util/kcursorsaver.h (renamed from mailcommon/util/kcursorsaver.h)0
-rw-r--r--mailcommon/src/util/mailutil.cpp (renamed from mailcommon/util/mailutil.cpp)0
-rw-r--r--mailcommon/src/util/mailutil.h (renamed from mailcommon/util/mailutil.h)0
-rw-r--r--mailcommon/src/widgets/favoritecollectionwidget.cpp (renamed from mailcommon/widgets/favoritecollectionwidget.cpp)0
-rw-r--r--mailcommon/src/widgets/favoritecollectionwidget.h (renamed from mailcommon/widgets/favoritecollectionwidget.h)0
-rw-r--r--mailcommon/src/widgets/redirectdialog.cpp (renamed from mailcommon/widgets/redirectdialog.cpp)0
-rw-r--r--mailcommon/src/widgets/redirectdialog.h (renamed from mailcommon/widgets/redirectdialog.h)0
-rw-r--r--mailcommon/src/widgets/redirectwidget.cpp (renamed from mailcommon/widgets/redirectwidget.cpp)0
-rw-r--r--mailcommon/src/widgets/redirectwidget.h (renamed from mailcommon/widgets/redirectwidget.h)0
-rw-r--r--mboximporter/CMakeLists.txt2
-rw-r--r--mboximporter/mboximportkernel.cpp2
-rw-r--r--mboximporter/mboximportkernel.h2
-rw-r--r--mboximporter/mboxmainwindow.cpp2
-rw-r--r--mboximporter/ui/mboximportwidget.ui2
-rw-r--r--messagecomposer/CMakeLists.txt1
-rw-r--r--messagecomposer/composer/composerviewbase.cpp2
-rw-r--r--messagecomposer/composer/keyresolver.cpp2
-rw-r--r--messagecomposer/helper/messagefactory.cpp2
-rw-r--r--pimsettingexporter/console/CMakeLists.txt2
-rw-r--r--pimsettingexporter/core/CMakeLists.txt2
-rw-r--r--pimsettingexporter/core/abstractimportexportjob.cpp2
-rw-r--r--pimsettingexporter/core/addressbook/exportaddressbookjob.cpp2
-rw-r--r--pimsettingexporter/core/akregator/exportakregatorjob.cpp2
-rw-r--r--pimsettingexporter/core/alarm/exportalarmjob.cpp2
-rw-r--r--pimsettingexporter/core/blogilo/exportblogilojob.cpp2
-rw-r--r--pimsettingexporter/core/calendar/exportcalendarjob.cpp2
-rw-r--r--pimsettingexporter/core/mail/exportmailjob.cpp8
-rw-r--r--pimsettingexporter/core/mail/importmailjob.cpp8
-rw-r--r--pimsettingexporter/core/notes/exportnotesjob.cpp2
-rw-r--r--pimsettingexporter/core/pimsettingexporterkernel.cpp2
-rw-r--r--pimsettingexporter/core/pimsettingexporterkernel.h2
-rw-r--r--pimsettingexporter/core/tests/CMakeLists.txt4
-rw-r--r--pimsettingexporter/core/utils.cpp2
-rw-r--r--pimsettingexporter/gui/CMakeLists.txt2
-rw-r--r--pimsettingexporter/gui/pimsettingexporterwindow.cpp4
470 files changed, 709 insertions, 452 deletions
diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
index ba3bdca..751e656 100644
--- a/agents/archivemailagent/CMakeLists.txt
+++ b/agents/archivemailagent/CMakeLists.txt
@@ -40,7 +40,7 @@ target_link_libraries(akonadi_archivemail_agent
KF5::WindowSystem
KF5::KIOWidgets
KF5::Notifications
- mailcommon
+ KF5::MailCommon
KF5::Libkdepim
KF5::IconThemes
)
diff --git a/agents/archivemailagent/addarchivemaildialog.cpp b/agents/archivemailagent/addarchivemaildialog.cpp
index 8f64d6b..dc3c130 100644
--- a/agents/archivemailagent/addarchivemaildialog.cpp
+++ b/agents/archivemailagent/addarchivemaildialog.cpp
@@ -17,7 +17,7 @@
#include "addarchivemaildialog.h"
#include "widgets/formatcombobox.h"
#include "widgets/unitcombobox.h"
-#include "mailcommon/folder/folderrequester.h"
+#include "MailCommon/FolderRequester"
#include <Collection>
diff --git a/agents/archivemailagent/addarchivemaildialog.h b/agents/archivemailagent/addarchivemaildialog.h
index dc79e64..9f235b4 100644
--- a/agents/archivemailagent/addarchivemaildialog.h
+++ b/agents/archivemailagent/addarchivemaildialog.h
@@ -18,7 +18,7 @@
#ifndef ADDARCHIVEMAILDIALOG_H
#define ADDARCHIVEMAILDIALOG_H
-#include "mailcommon/job/backupjob.h"
+#include "MailCommon/BackupJob"
#include "archivemailinfo.h"
#include <QDialog>
#include <Collection>
diff --git a/agents/archivemailagent/archivemailagent.cpp b/agents/archivemailagent/archivemailagent.cpp
index 2f2cb55..529f741 100644
--- a/agents/archivemailagent/archivemailagent.cpp
+++ b/agents/archivemailagent/archivemailagent.cpp
@@ -22,7 +22,7 @@
#include "archivemailagentsettings.h"
#include <KLocalizedString>
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
#include <kdbusconnectionpool.h>
#include <Monitor>
#include <Session>
diff --git a/agents/archivemailagent/archivemaildialog.cpp b/agents/archivemailagent/archivemaildialog.cpp
index 32ad2c0..8aa5fad 100644
--- a/agents/archivemailagent/archivemaildialog.cpp
+++ b/agents/archivemailagent/archivemaildialog.cpp
@@ -20,7 +20,7 @@
#include "archivemailwidget.h"
#include "kdepim-version.h"
-#include <mailcommon/util/mailutil.h>
+#include <MailCommon/MailUtil>
#include <QMenu>
#include <KHelpMenu>
diff --git a/agents/archivemailagent/archivemailinfo.h b/agents/archivemailagent/archivemailinfo.h
index 3e37644..ee5c3ea 100644
--- a/agents/archivemailagent/archivemailinfo.h
+++ b/agents/archivemailagent/archivemailinfo.h
@@ -17,7 +17,7 @@
#ifndef ARCHIVEMAILINFO_H
#define ARCHIVEMAILINFO_H
-#include "mailcommon/job/backupjob.h"
+#include "MailCommon/BackupJob"
#include <KConfigGroup>
#include <Collection>
#include <QUrl>
diff --git a/agents/archivemailagent/archivemailkernel.cpp b/agents/archivemailagent/archivemailkernel.cpp
index 1005604..62df808 100644
--- a/agents/archivemailagent/archivemailkernel.cpp
+++ b/agents/archivemailagent/archivemailkernel.cpp
@@ -18,8 +18,8 @@
#include "archivemailkernel.h"
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
-#include <mailcommon/job/jobscheduler.h>
+#include <MailCommon/FolderCollectionMonitor>
+#include <MailCommon/JobScheduler>
#include <AkonadiCore/session.h>
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
diff --git a/agents/archivemailagent/archivemailkernel.h b/agents/archivemailagent/archivemailkernel.h
index 99b2f0f..c3c6a88 100644
--- a/agents/archivemailagent/archivemailkernel.h
+++ b/agents/archivemailagent/archivemailkernel.h
@@ -18,7 +18,7 @@
#ifndef ARCHIVEMAILKERNEL_H
#define ARCHIVEMAILKERNEL_H
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
namespace Akonadi
{
diff --git a/agents/archivemailagent/archivemailmanager.cpp b/agents/archivemailagent/archivemailmanager.cpp
index 19dd379..01dff26 100644
--- a/agents/archivemailagent/archivemailmanager.cpp
+++ b/agents/archivemailagent/archivemailmanager.cpp
@@ -21,8 +21,8 @@
#include "archivemailkernel.h"
#include "archivemailagentutil.h"
-#include <mailcommon/kernel/mailkernel.h>
-#include <mailcommon/util/mailutil.h>
+#include <MailCommon/MailKernel>
+#include <MailCommon/MailUtil>
#include <KConfigGroup>
#include <KSharedConfig>
diff --git a/agents/archivemailagent/archivemailwidget.cpp b/agents/archivemailagent/archivemailwidget.cpp
index 3800adc..823e0f2 100644
--- a/agents/archivemailagent/archivemailwidget.cpp
+++ b/agents/archivemailagent/archivemailwidget.cpp
@@ -21,7 +21,7 @@
#include "kdepim-version.h"
-#include <mailcommon/util/mailutil.h>
+#include <MailCommon/MailUtil>
#include <QLocale>
#include <KLocalizedString>
diff --git a/agents/archivemailagent/autotests/CMakeLists.txt b/agents/archivemailagent/autotests/CMakeLists.txt
index a60838a..8d8ab57 100644
--- a/agents/archivemailagent/autotests/CMakeLists.txt
+++ b/agents/archivemailagent/autotests/CMakeLists.txt
@@ -11,7 +11,7 @@ macro( archivemail_agent _source)
add_executable( ${_name} ${_test} )
add_test( ${_name} ${_name} )
ecm_mark_as_test(archivemailagent-${_name})
- target_link_libraries( ${_name} Qt5::Test Qt5::Core mailcommon KF5::AkonadiCore KF5::XmlGui KF5::KIOWidgets KF5::Libkdepim)
+ target_link_libraries( ${_name} Qt5::Test Qt5::Core KF5::MailCommon KF5::AkonadiCore KF5::XmlGui KF5::KIOWidgets KF5::Libkdepim)
endmacro()
archivemail_agent(archivemailinfotest.cpp )
diff --git a/agents/archivemailagent/job/archivejob.cpp b/agents/archivemailagent/job/archivejob.cpp
index 685c411..374c499 100644
--- a/agents/archivemailagent/job/archivejob.cpp
+++ b/agents/archivemailagent/job/archivejob.cpp
@@ -19,9 +19,9 @@
#include "archivemailinfo.h"
#include "archivemailmanager.h"
#include "archivemailagent_debug.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
-#include <mailcommon/job/backupjob.h>
+#include <MailCommon/BackupJob>
#include <KNotification>
#include <KLocalizedString>
diff --git a/agents/archivemailagent/job/archivejob.h b/agents/archivemailagent/job/archivejob.h
index f5744a3..087b507 100644
--- a/agents/archivemailagent/job/archivejob.h
+++ b/agents/archivemailagent/job/archivejob.h
@@ -18,7 +18,7 @@
#ifndef ARCHIVEJOB_H
#define ARCHIVEJOB_H
-#include <mailcommon/job/jobscheduler.h>
+#include <MailCommon/JobScheduler>
#include <Collection>
#include <QPixmap>
class ArchiveMailInfo;
diff --git a/agents/archivemailagent/widgets/formatcombobox.h b/agents/archivemailagent/widgets/formatcombobox.h
index a396bea..55c9a65 100644
--- a/agents/archivemailagent/widgets/formatcombobox.h
+++ b/agents/archivemailagent/widgets/formatcombobox.h
@@ -17,7 +17,7 @@
#ifndef FORMATCOMBOBOX_H
#define FORMATCOMBOBOX_H
-#include "mailcommon/job/backupjob.h"
+#include "MailCommon/BackupJob"
#include <KComboBox>
diff --git a/agents/mailfilteragent/CMakeLists.txt b/agents/mailfilteragent/CMakeLists.txt
index eb5366e..e83ba19 100644
--- a/agents/mailfilteragent/CMakeLists.txt
+++ b/agents/mailfilteragent/CMakeLists.txt
@@ -25,7 +25,7 @@ endif ()
target_link_libraries(akonadi_mailfilter_agent
- mailcommon
+ KF5::MailCommon
messagecomposer
pimcommon
KF5::AkonadiCore
diff --git a/agents/mailfilteragent/dummykernel.cpp b/agents/mailfilteragent/dummykernel.cpp
index d890f1a..498261c 100644
--- a/agents/mailfilteragent/dummykernel.cpp
+++ b/agents/mailfilteragent/dummykernel.cpp
@@ -2,7 +2,7 @@
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <messagecomposer/sender/akonadisender.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <MailCommon/FolderCollectionMonitor>
#include <AkonadiCore/session.h>
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
diff --git a/agents/mailfilteragent/dummykernel.h b/agents/mailfilteragent/dummykernel.h
index 6f831a6..27e3f1b 100644
--- a/agents/mailfilteragent/dummykernel.h
+++ b/agents/mailfilteragent/dummykernel.h
@@ -1,7 +1,7 @@
#ifndef DUMMYKERNEL_H
#define DUMMYKERNEL_H
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
namespace Akonadi
{
diff --git a/agents/mailfilteragent/filterlogdialog.cpp b/agents/mailfilteragent/filterlogdialog.cpp
index 984c5b2..2bb9d6e 100644
--- a/agents/mailfilteragent/filterlogdialog.cpp
+++ b/agents/mailfilteragent/filterlogdialog.cpp
@@ -28,7 +28,7 @@
*/
#include "filterlogdialog.h"
-#include <mailcommon/filter/filterlog.h>
+#include <MailCommon/FilterLog>
#include <utils/autoqpointer.h>
#include "pimcommon/texteditor/plaintexteditor/plaintexteditorwidget.h"
#include "pimcommon/texteditor/plaintexteditor/plaintexteditor.h"
diff --git a/agents/mailfilteragent/filtermanager.cpp b/agents/mailfilteragent/filtermanager.cpp
index e401c4f..1fdba24 100644
--- a/agents/mailfilteragent/filtermanager.cpp
+++ b/agents/mailfilteragent/filtermanager.cpp
@@ -37,10 +37,10 @@
#include <QIcon>
#include <KIconLoader>
#include <kmime/kmime_message.h>
-#include <mailcommon/filter/filterimporterexporter.h>
-#include <mailcommon/filter/filterlog.h>
-#include <mailcommon/filter/mailfilter.h>
-#include <mailcommon/util/mailutil.h>
+#include <MailCommon/FilterImporterExporter>
+#include <MailCommon/FilterLog>
+#include <MailCommon/MailFilter>
+#include <MailCommon/MailUtil>
#include <QTimer>
diff --git a/agents/mailfilteragent/filtermanager.h b/agents/mailfilteragent/filtermanager.h
index c708332..25b698a 100644
--- a/agents/mailfilteragent/filtermanager.h
+++ b/agents/mailfilteragent/filtermanager.h
@@ -23,7 +23,7 @@
#include <AkonadiCore/collection.h>
#include <AkonadiCore/item.h>
-#include "mailcommon/search/searchpattern.h"
+#include "MailCommon/SearchPattern"
namespace MailCommon
{
diff --git a/agents/mailfilteragent/mailfilteragent.cpp b/agents/mailfilteragent/mailfilteragent.cpp
index 1334f19..7bb1e39 100644
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@@ -34,7 +34,7 @@
#include <Akonadi/KMime/MessageParts>
#include <Akonadi/KMime/MessageStatus>
#include <AkonadiCore/session.h>
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
#include <KLocalizedString>
#include <QIcon>
#include "mailfilteragent_debug.h"
diff --git a/agents/mailfilteragent/mailfilteragent.h b/agents/mailfilteragent/mailfilteragent.h
index 0dbafae..da6cb98 100644
--- a/agents/mailfilteragent/mailfilteragent.h
+++ b/agents/mailfilteragent/mailfilteragent.h
@@ -22,7 +22,7 @@
#include <AkonadiAgentBase/agentbase.h>
-#include "mailcommon/search/searchpattern.h"
+#include "MailCommon/SearchPattern"
#include <Collection>
#include <AkonadiCore/item.h>
diff --git a/calendarsupport/src/CMakeLists.txt b/calendarsupport/src/CMakeLists.txt
index dd95165..db5b7fd 100644
--- a/calendarsupport/src/CMakeLists.txt
+++ b/calendarsupport/src/CMakeLists.txt
@@ -148,13 +148,13 @@ set(calendarsupportcollectionpage_LIB_SRCS
)
add_library(calendarsupportcollectionpage ${calendarsupportcollectionpage_LIB_SRCS})
-add_dependencies(calendarsupportcollectionpage mailcommon)
+add_dependencies(calendarsupportcollectionpage KF5::MailCommon)
generate_export_header(calendarsupportcollectionpage BASE_NAME calendarsupportcollectionpage)
target_link_libraries(
calendarsupportcollectionpage
PUBLIC
KF5::AkonadiCore
- mailcommon
+ KF5::MailCommon
PRIVATE
KF5::CalendarCore
pimcommon
diff --git a/calendarsupport/src/collectiongeneralpage.cpp b/calendarsupport/src/collectiongeneralpage.cpp
index 9fa4ad3..01e8a7a 100644
--- a/calendarsupport/src/collectiongeneralpage.cpp
+++ b/calendarsupport/src/collectiongeneralpage.cpp
@@ -39,9 +39,9 @@
#include <QVBoxLayout>
#include <KConfigGroup>
-#include <mailcommon/collectionpage/attributes/collectionannotationsattribute.h>
-#include <mailcommon/collectionpage/collectiontypeutil.h>
-#include <mailcommon/collectionpage/incidencesforwidget.h>
+#include <MailCommon/CollectionAnnotationsAttribute>
+#include <MailCommon/CollectionTypeUtil>
+#include <MailCommon/IncidencesForWidget>
using namespace Akonadi;
using namespace CalendarSupport;
diff --git a/importwizard/CMakeLists.txt b/importwizard/CMakeLists.txt
index 241b49c..dfaf5f4 100644
--- a/importwizard/CMakeLists.txt
+++ b/importwizard/CMakeLists.txt
@@ -100,7 +100,7 @@ target_link_libraries(importwizard
KF5::XmlGui
KF5::MailImporter
pimcommon
- mailcommon
+ KF5::MailCommon
KF5::Libkdepim
messagecomposer
KF5::MessageViewer
diff --git a/importwizard/autodetect/abstractimporter.cpp b/importwizard/autodetect/abstractimporter.cpp
index 5d00719..42a8260 100644
--- a/importwizard/autodetect/abstractimporter.cpp
+++ b/importwizard/autodetect/abstractimporter.cpp
@@ -24,7 +24,7 @@
#include "importcalendarpage.h"
#include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filtermanager.h"
+#include "MailCommon/FilterManager"
#include <QFile>
diff --git a/importwizard/autodetect/abstractimporter.h b/importwizard/autodetect/abstractimporter.h
index d674e09..e53e789 100644
--- a/importwizard/autodetect/abstractimporter.h
+++ b/importwizard/autodetect/abstractimporter.h
@@ -17,7 +17,7 @@
#ifndef AbstractImporter_H
#define AbstractImporter_H
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
class ImportWizard;
diff --git a/importwizard/autodetect/balsa/balsaimportdata.cpp b/importwizard/autodetect/balsa/balsaimportdata.cpp
index f7fd7da..bfbf0cd 100644
--- a/importwizard/autodetect/balsa/balsaimportdata.cpp
+++ b/importwizard/autodetect/balsa/balsaimportdata.cpp
@@ -20,7 +20,7 @@
#include "balsa/balsaaddressbook.h"
#include "mailimporter/filterbalsa.h"
#include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filterimporter/filterimporterbalsa.h"
+#include "MailCommon/FilterImporterBalsa"
#include "importfilterinfogui.h"
#include "importwizard.h"
diff --git a/importwizard/autodetect/balsa/balsasettings.cpp b/importwizard/autodetect/balsa/balsasettings.cpp
index d67d9be..454fe00 100644
--- a/importwizard/autodetect/balsa/balsasettings.cpp
+++ b/importwizard/autodetect/balsa/balsasettings.cpp
@@ -18,7 +18,7 @@
#include "balsasettings.h"
#include "importwizard_debug.h"
#include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "header/kxface.h"
#include <KIdentityManagement/kidentitymanagement/identity.h>
diff --git a/importwizard/autodetect/claws-mail/clawsmailimportdata.cpp b/importwizard/autodetect/claws-mail/clawsmailimportdata.cpp
index d47d250..57bb0fe 100644
--- a/importwizard/autodetect/claws-mail/clawsmailimportdata.cpp
+++ b/importwizard/autodetect/claws-mail/clawsmailimportdata.cpp
@@ -19,7 +19,7 @@
#include "claws-mail/clawsmailsettings.h"
#include "claws-mail/clawsmailaddressbook.h"
#include "mailimporter/filterclawsmail.h"
-#include "mailcommon/filter/filterimporter/filterimporterclawsmail.h"
+#include "MailCommon/FilterImporterClawsMail"
#include "mailimporter/filterinfo.h"
#include "importfilterinfogui.h"
#include "importwizard.h"
diff --git a/importwizard/autodetect/claws-mail/clawsmailsettings.cpp b/importwizard/autodetect/claws-mail/clawsmailsettings.cpp
index 6c6ab4c..016e695 100644
--- a/importwizard/autodetect/claws-mail/clawsmailsettings.cpp
+++ b/importwizard/autodetect/claws-mail/clawsmailsettings.cpp
@@ -19,7 +19,7 @@
#include "importwizardutil.h"
#include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff --git a/importwizard/autodetect/evolutionv3/evolutionsettings.cpp b/importwizard/autodetect/evolutionv3/evolutionsettings.cpp
index b46efe2..8a7d65e 100644
--- a/importwizard/autodetect/evolutionv3/evolutionsettings.cpp
+++ b/importwizard/autodetect/evolutionv3/evolutionsettings.cpp
@@ -17,7 +17,7 @@
#include "evolutionsettings.h"
#include "evolutionutil.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "importwizardutil.h"
#include <KIdentityManagement/kidentitymanagement/identity.h>
diff --git a/importwizard/autodetect/evolutionv3/evolutionv3importdata.cpp b/importwizard/autodetect/evolutionv3/evolutionv3importdata.cpp
index 185d631..dc84f84 100644
--- a/importwizard/autodetect/evolutionv3/evolutionv3importdata.cpp
+++ b/importwizard/autodetect/evolutionv3/evolutionv3importdata.cpp
@@ -22,7 +22,7 @@
#include "mailimporter/filterevolution_v3.h"
#include "mailimporter/filterinfo.h"
#include "importfilterinfogui.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
#include "importwizard.h"
diff --git a/importwizard/autodetect/icedove/icedoveimportdata.cpp b/importwizard/autodetect/icedove/icedoveimportdata.cpp
index 89edc4b..fa24795 100644
--- a/importwizard/autodetect/icedove/icedoveimportdata.cpp
+++ b/importwizard/autodetect/icedove/icedoveimportdata.cpp
@@ -22,7 +22,7 @@
#include "mailimporter/filtericedove.h"
#include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
#include "importwizard.h"
#include <KLocalizedString>
diff --git a/importwizard/autodetect/opera/operasettings.cpp b/importwizard/autodetect/opera/operasettings.cpp
index 4ccdf8a..7e6010a 100644
--- a/importwizard/autodetect/opera/operasettings.cpp
+++ b/importwizard/autodetect/opera/operasettings.cpp
@@ -20,7 +20,7 @@
#include "mailimporter/filteropera.h"
#include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff --git a/importwizard/autodetect/pmail/pmailsettings.cpp b/importwizard/autodetect/pmail/pmailsettings.cpp
index db87db3..7537525 100644
--- a/importwizard/autodetect/pmail/pmailsettings.cpp
+++ b/importwizard/autodetect/pmail/pmailsettings.cpp
@@ -19,7 +19,7 @@
#include "importwizardutil.h"
#include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff --git a/importwizard/autodetect/sylpheed/sylpheedimportdata.cpp b/importwizard/autodetect/sylpheed/sylpheedimportdata.cpp
index 89cb1ca..4b9749e 100644
--- a/importwizard/autodetect/sylpheed/sylpheedimportdata.cpp
+++ b/importwizard/autodetect/sylpheed/sylpheedimportdata.cpp
@@ -19,7 +19,7 @@
#include "mailimporter/filtersylpheed.h"
#include "mailimporter/filterinfo.h"
#include "importfilterinfogui.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
#include "importwizard.h"
#include "sylpheed/sylpheedsettings.h"
#include "sylpheed/sylpheedaddressbook.h"
diff --git a/importwizard/autodetect/sylpheed/sylpheedsettings.cpp b/importwizard/autodetect/sylpheed/sylpheedsettings.cpp
index 7e7f882..c0eefc9 100644
--- a/importwizard/autodetect/sylpheed/sylpheedsettings.cpp
+++ b/importwizard/autodetect/sylpheed/sylpheedsettings.cpp
@@ -18,7 +18,7 @@
#include "sylpheedsettings.h"
#include "sylpheedsettingsutils.h"
#include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff --git a/importwizard/autodetect/thunderbird/thunderbirdimportdata.cpp b/importwizard/autodetect/thunderbird/thunderbirdimportdata.cpp
index 81a0ffd..d582d95 100644
--- a/importwizard/autodetect/thunderbird/thunderbirdimportdata.cpp
+++ b/importwizard/autodetect/thunderbird/thunderbirdimportdata.cpp
@@ -22,7 +22,7 @@
#include "mailimporter/filterthunderbird.h"
#include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
#include "importwizard.h"
#include <KLocalizedString>
diff --git a/importwizard/autodetect/thunderbird/thunderbirdsettings.cpp b/importwizard/autodetect/thunderbird/thunderbirdsettings.cpp
index da46958..28416c2 100644
--- a/importwizard/autodetect/thunderbird/thunderbirdsettings.cpp
+++ b/importwizard/autodetect/thunderbird/thunderbirdsettings.cpp
@@ -17,7 +17,7 @@
#include "thunderbirdsettings.h"
#include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "importwizardutil.h"
#include <KIdentityManagement/kidentitymanagement/identity.h>
diff --git a/importwizard/importwizard.cpp b/importwizard/importwizard.cpp
index 2eed725..a290c8b 100644
--- a/importwizard/importwizard.cpp
+++ b/importwizard/importwizard.cpp
@@ -54,7 +54,7 @@
#include <KMessageBox>
#include <KHelpMenu>
#include <AkonadiWidgets/controlgui.h>
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
#include <QPushButton>
ImportWizard::ImportWizard(WizardMode mode, QWidget *parent)
diff --git a/importwizard/importwizardkernel.cpp b/importwizard/importwizardkernel.cpp
index b4a3573..142e552 100644
--- a/importwizard/importwizardkernel.cpp
+++ b/importwizard/importwizardkernel.cpp
@@ -19,7 +19,7 @@
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <messagecomposer/sender/akonadisender.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <MailCommon/FolderCollectionMonitor>
#include <AkonadiCore/session.h>
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
diff --git a/importwizard/importwizardkernel.h b/importwizard/importwizardkernel.h
index bced43e..16c16ac 100644
--- a/importwizard/importwizardkernel.h
+++ b/importwizard/importwizardkernel.h
@@ -17,7 +17,7 @@
#ifndef IMPORTWIZARDKERNEL_H
#define IMPORTWIZARDKERNEL_H
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
namespace Akonadi
{
diff --git a/importwizard/ui/autodetect/importmailpage.ui b/importwizard/ui/autodetect/importmailpage.ui
index 247b442..b5b3082 100644
--- a/importwizard/ui/autodetect/importmailpage.ui
+++ b/importwizard/ui/autodetect/importmailpage.ui
@@ -63,7 +63,7 @@
<customwidget>
<class>MailCommon::FolderRequester</class>
<extends>QWidget</extends>
- <header location="global">mailcommon/folder/folderrequester.h</header>
+ <header location="global">MailCommon/FolderRequester</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/importwizard/ui/manual/manualselectfilterpage.ui b/importwizard/ui/manual/manualselectfilterpage.ui
index a3547f3..6597759 100644
--- a/importwizard/ui/manual/manualselectfilterpage.ui
+++ b/importwizard/ui/manual/manualselectfilterpage.ui
@@ -137,7 +137,7 @@ p, li { white-space: pre-wrap; }
<customwidget>
<class>MailCommon::FolderRequester</class>
<extends>QWidget</extends>
- <header location="global">mailcommon/folder/folderrequester.h</header>
+ <header location="global">MailCommon/FolderRequester</header>
<container>1</container>
</customwidget>
<customwidget>
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 05d9538..94d5e4e 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -17,9 +17,6 @@ add_custom_target(kmail_xml ALL
include_directories(
${CMAKE_SOURCE_DIR}/libksieve/ksieveui/
- ${CMAKE_SOURCE_DIR}/mailcommon/folder
- ${CMAKE_SOURCE_DIR}/mailcommon/tag
- ${CMAKE_SOURCE_DIR}/mailcommon/kernel
${CMAKE_SOURCE_DIR}/pimcommon/util/
${CMAKE_SOURCE_DIR}/messagecomposer/utils/
${CMAKE_CURRENT_BINARY_DIR}
@@ -283,7 +280,7 @@ target_link_libraries(kmailprivate
messagecomposer
KF5::MessageList
pimcommon
- mailcommon
+ KF5::MailCommon
KF5::TemplateParser
KF5::IdentityManagement
KF5::WindowSystem
@@ -312,7 +309,7 @@ target_link_libraries(kmailprivate
)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MessageList,INTERFACE_INCLUDE_DIRECTORIES>)
target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5MessageViewer,INTERFACE_INCLUDE_DIRECTORIES>)
-target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:mailcommon,INTERFACE_INCLUDE_DIRECTORIES>)
+target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KF5::MailCommon,INTERFACE_INCLUDE_DIRECTORIES>)
set_target_properties(kmailprivate
PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
diff --git a/kmail/antispam-virus/antispamwizard.cpp b/kmail/antispam-virus/antispamwizard.cpp
index 9510776..f7fbc3c 100644
--- a/kmail/antispam-virus/antispamwizard.cpp
+++ b/kmail/antispam-virus/antispamwizard.cpp
@@ -29,22 +29,22 @@
#include "antispamwizard.h"
#ifndef QT_NO_CURSOR
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#endif
#include "kmkernel.h"
#include "kmmainwin.h"
-#include "folderrequester.h"
-#include "foldertreewidget.h"
-#include "foldertreeview.h"
-#include "foldertreewidgetproxymodel.h"
+#include "MailCommon/FolderRequester"
+#include "MailCommon/FolderTreeWidget"
+#include "MailCommon/FolderTreeView"
+#include "MailCommon/FolderTreeWidgetProxyModel"
#include "mailcommon/pop3settings.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "pimcommon/imapresourcesettings.h"
-#include "mailcommon/kernel/mailkernel.h"
-#include "mailcommon/filter/mailfilter.h"
-#include "mailcommon/filter/filteractions/filteraction.h"
-#include "mailcommon/filter/filteractions/filteractiondict.h"
-#include "mailcommon/filter/filtermanager.h"
+#include "MailCommon/MailKernel"
+#include "MailCommon/MailFilter"
+#include "MailCommon/FilterAction"
+#include "MailCommon/FilterActionDict"
+#include "MailCommon/FilterManager"
#include "pimcommon/util/pimutil.h"
diff --git a/kmail/autotests/CMakeLists.txt b/kmail/autotests/CMakeLists.txt
index 6698279..1399ec4 100644
--- a/kmail/autotests/CMakeLists.txt
+++ b/kmail/autotests/CMakeLists.txt
@@ -59,5 +59,5 @@ target_link_libraries( configureagentitemtest Qt5::Test Qt5::Widgets KF5::ItemVi
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
-add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp "../tag/tagselectdialog.cpp;../kmail_debug.cpp" "${KDEPIMLIBS_AKONADI_LIBS};kmailprivate;mailcommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion")
+add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp "../tag/tagselectdialog.cpp;../kmail_debug.cpp" "${KDEPIMLIBS_AKONADI_LIBS};kmailprivate;KF5::MailCommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion")
diff --git a/kmail/collectionpage/collectionmailinglistpage.h b/kmail/collectionpage/collectionmailinglistpage.h
index 1ccdecc..a43a17f 100644
--- a/kmail/collectionpage/collectionmailinglistpage.h
+++ b/kmail/collectionpage/collectionmailinglistpage.h
@@ -22,7 +22,7 @@
#define COLLECTIONMAILINGLISTPAGE_H
#include "MessageCore/MailingList"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include <AkonadiWidgets/collectionpropertiespage.h>
#include <AkonadiCore/collection.h>
diff --git a/kmail/collectionpage/collectionshortcutpage.h b/kmail/collectionpage/collectionshortcutpage.h
index 75dc71b..0d3ae8a 100644
--- a/kmail/collectionpage/collectionshortcutpage.h
+++ b/kmail/collectionpage/collectionshortcutpage.h
@@ -20,7 +20,7 @@
#ifndef COLLECTIONSHORTCUTPAGE_H
#define COLLECTIONSHORTCUTPAGE_H
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include <AkonadiWidgets/collectionpropertiespage.h>
diff --git a/kmail/collectionpage/collectiontemplatespage.cpp b/kmail/collectionpage/collectiontemplatespage.cpp
index 8a0fb5e..33d5289 100644
--- a/kmail/collectionpage/collectiontemplatespage.cpp
+++ b/kmail/collectionpage/collectiontemplatespage.cpp
@@ -20,7 +20,7 @@
#include "kmkernel.h"
#include "kernel/mailkernel.h"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include "TemplateParser/TemplatesConfiguration"
#include "templatesconfiguration_kfg.h"
#include <AkonadiCore/collection.h>
diff --git a/kmail/collectionpage/collectionviewpage.cpp b/kmail/collectionpage/collectionviewpage.cpp
index 3433772..f15c022 100644
--- a/kmail/collectionpage/collectionviewpage.cpp
+++ b/kmail/collectionpage/collectionviewpage.cpp
@@ -40,7 +40,7 @@
#include "messagelist/themecombobox.h"
#include "messagelist/themeconfigbutton.h"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
using namespace MailCommon;
diff --git a/kmail/configuredialog/configureaccountpage.cpp b/kmail/configuredialog/configureaccountpage.cpp
index c40610c..492fdc2 100644
--- a/kmail/configuredialog/configureaccountpage.cpp
+++ b/kmail/configuredialog/configureaccountpage.cpp
@@ -22,13 +22,13 @@
#include "settings/kmailsettings.h"
#include "configagentdelegate.h"
#include "messagecomposer/settings/messagecomposersettings.h"
-#include "mailcommon/folder/accountconfigorderdialog.h"
+#include "MailCommon/AccountConfigOrderDialog"
#include "pimcommon/widgets/configureimmutablewidgetutils.h"
using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include <MailTransport/mailtransport/transportmanagementwidget.h>
using MailTransport::TransportManagementWidget;
#include "ui_accountspagereceivingtab.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include <AkonadiCore/agentfilterproxymodel.h>
#include <AkonadiCore/agentinstancemodel.h>
diff --git a/kmail/configuredialog/configureappearancepage.cpp b/kmail/configuredialog/configureappearancepage.cpp
index 220b8c2..30fe401 100644
--- a/kmail/configuredialog/configureappearancepage.cpp
+++ b/kmail/configuredialog/configureappearancepage.cpp
@@ -24,11 +24,11 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "messagelist/themecombobox.h"
#include "messagelist/themeconfigbutton.h"
#include "core/settings.h"
-#include "mailcommon/tag/tagwidget.h"
-#include "mailcommon/tag/tag.h"
+#include "MailCommon/TagWidget"
+#include "MailCommon/Tag"
#include "kmkernel.h"
#include "util.h"
-#include "foldertreewidget.h"
+#include "MailCommon/FolderTreeWidget"
#include "kmmainwidget.h"
@@ -42,7 +42,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "messagecoreutil.h"
#include "settings/kmailsettings.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include <AkonadiCore/Tag>
#include <AkonadiCore/TagFetchJob>
diff --git a/kmail/configuredialog/configureappearancepage.h b/kmail/configuredialog/configureappearancepage.h
index 2915d1b..71c88db 100644
--- a/kmail/configuredialog/configureappearancepage.h
+++ b/kmail/configuredialog/configureappearancepage.h
@@ -19,7 +19,7 @@
#include "kmail_export.h"
#include "configuredialog_p.h"
-#include "tag.h"
+#include "MailCommon/Tag"
#include <QListWidgetItem>
class QPushButton;
diff --git a/kmail/configuredialog/configuremiscpage.cpp b/kmail/configuredialog/configuremiscpage.cpp
index 4397217..2cd2f34 100644
--- a/kmail/configuredialog/configuremiscpage.cpp
+++ b/kmail/configuredialog/configuremiscpage.cpp
@@ -21,7 +21,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "configureagentswidget.h"
#include "settings/kmailsettings.h"
-#include <mailcommon/folder/folderrequester.h>
+#include <MailCommon/FolderRequester>
#include "widgets/invitationsettings.h"
#include "widgets/printingsettings.h"
#include "settings/messageviewersettings.h"
diff --git a/kmail/configuredialog/configuresecuritypage.cpp b/kmail/configuredialog/configuresecuritypage.cpp
index 6269ff8..856a435 100644
--- a/kmail/configuredialog/configuresecuritypage.cpp
+++ b/kmail/configuredialog/configuresecuritypage.cpp
@@ -21,7 +21,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include "settings/messageviewersettings.h"
#include "messagecomposer/settings/messagecomposersettings.h"
#include "adblock/adblocksettingwidget.h"
-#include "mailcommon/folder/foldercollection.h"
+#include "MailCommon/FolderCollection"
#include "settings/kmailsettings.h"
#include "kmkernel.h"
diff --git a/kmail/dialog/archivefolderdialog.cpp b/kmail/dialog/archivefolderdialog.cpp
index a38393d..895757f 100644
--- a/kmail/dialog/archivefolderdialog.cpp
+++ b/kmail/dialog/archivefolderdialog.cpp
@@ -18,10 +18,10 @@
*/
#include "archivefolderdialog.h"
-#include "mailcommon/job/backupjob.h"
+#include "MailCommon/BackupJob"
#include "kmkernel.h"
#include "kmmainwidget.h"
-#include "folderrequester.h"
+#include "MailCommon/FolderRequester"
#include "utils/messageviewerutil.h"
#include <AkonadiCore/Collection>
diff --git a/kmail/editor/attachment/attachmentcontroller.cpp b/kmail/editor/attachment/attachmentcontroller.cpp
index cacb2e6..8508825 100644
--- a/kmail/editor/attachment/attachmentcontroller.cpp
+++ b/kmail/editor/attachment/attachmentcontroller.cpp
@@ -24,7 +24,7 @@
#include "attachmentview.h"
#include "messagecomposer/job/attachmentfrompublickeyjob.h"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include "settings/kmailsettings.h"
#include "kmcommands.h"
#include "editor/kmcomposewin.h"
diff --git a/kmail/editor/kmcomposewin.cpp b/kmail/editor/kmcomposewin.cpp
index 32c79b4..347c23a 100644
--- a/kmail/editor/kmcomposewin.cpp
+++ b/kmail/editor/kmcomposewin.cpp
@@ -50,7 +50,7 @@
#include "util.h"
#include "editor/widgets/snippetwidget.h"
#include "templatesconfiguration_kfg.h"
-#include "foldercollectionmonitor.h"
+#include "mailcommon/foldercollectionmonitor.h"
#include "kernel/mailkernel.h"
#include "custommimeheader.h"
#include "pimcommon/autocorrection/widgets/lineeditwithautocorrection.h"
@@ -95,7 +95,7 @@
#include <viewer/objecttreeemptysource.h>
#ifndef QT_NO_CURSOR
-#include <mailcommon/util/kcursorsaver.h>
+#include <MailCommon/KCursorSaver>
#endif
#include <viewer/objecttreeparser.h>
@@ -117,8 +117,8 @@
#include "helpers/nodehelper.h"
#include <Akonadi/KMime/MessageStatus>
#include "helpers/messagehelpers.h"
-#include "mailcommon/folder/folderrequester.h"
-#include "mailcommon/folder/foldercollection.h"
+#include "MailCommon/FolderRequester"
+#include "MailCommon/FolderCollection"
#include "widgets/statusbarlabeltoggledstate.h"
diff --git a/kmail/editor/widgets/snippetwidget.cpp b/kmail/editor/widgets/snippetwidget.cpp
index 3c40e50..456d903 100644
--- a/kmail/editor/widgets/snippetwidget.cpp
+++ b/kmail/editor/widgets/snippetwidget.cpp
@@ -15,7 +15,7 @@
#include "editor/kmcomposereditorng.h"
-#include <mailcommon/snippets/snippetsmanager.h>
+#include <MailCommon/SnippetsManager>
#include <kactioncollection.h>
#include <KLocalizedString>
diff --git a/kmail/foldershortcutactionmanager.cpp b/kmail/foldershortcutactionmanager.cpp
index ef67206..84143f7 100644
--- a/kmail/foldershortcutactionmanager.cpp
+++ b/kmail/foldershortcutactionmanager.cpp
@@ -18,7 +18,7 @@
*/
#include "foldershortcutactionmanager.h"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include "kernel/mailkernel.h"
#include <AkonadiCore/ChangeRecorder>
diff --git a/kmail/identity/identitydialog.cpp b/kmail/identity/identitydialog.cpp
index e7a647e..68566cf 100644
--- a/kmail/identity/identitydialog.cpp
+++ b/kmail/identity/identitydialog.cpp
@@ -41,7 +41,7 @@
// other KMail headers:
#include "xfaceconfigurator.h"
#include "pimcommon/widgets/simplestringlisteditor.h"
-#include "folderrequester.h"
+#include "mailcommon/folderrequester.h"
#ifndef KCM_KPIMIDENTITIES_STANDALONE
#include "settings/kmailsettings.h"
#include "kmkernel.h"
diff --git a/kmail/identity/identitypage.cpp b/kmail/identity/identitypage.cpp
index 8f9c0a4..b5cf35a 100644
--- a/kmail/identity/identitypage.cpp
+++ b/kmail/identity/identitypage.cpp
@@ -30,7 +30,7 @@
#include "settings/kmailsettings.h"
#endif
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
#include <utils/autoqpointer.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
diff --git a/kmail/job/removecollectionjob.cpp b/kmail/job/removecollectionjob.cpp
index c2b951c..6f26686 100644
--- a/kmail/job/removecollectionjob.cpp
+++ b/kmail/job/removecollectionjob.cpp
@@ -22,8 +22,8 @@
#include <KMessageBox>
#include <KGuiItem>
#include "kmmainwidget.h"
-#include "mailcommon/util/mailutil.h"
-#include "mailcommon/kernel/mailkernel.h"
+#include "MailCommon/MailUtil"
+#include "MailCommon/MailKernel"
#include "kmkernel.h"
RemoveCollectionJob::RemoveCollectionJob(QObject *parent)
diff --git a/kmail/kcm_kpimidentities/CMakeLists.txt b/kmail/kcm_kpimidentities/CMakeLists.txt
index 8b61bc5..86db853 100644
--- a/kmail/kcm_kpimidentities/CMakeLists.txt
+++ b/kmail/kcm_kpimidentities/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(kcm_kpimidentities
KF5::KIOCore
KF5::KIOWidgets
KF5::IconThemes
- mailcommon
+ KF5::MailCommon
messagecomposer
KF5::MessageViewer
KF5::TemplateParser
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 916d1a1..c75fb2f 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -44,7 +44,7 @@
#include <AkonadiCore/collection.h>
#include <AkonadiCore/entitydisplayattribute.h>
#include <AkonadiCore/changerecorder.h>
-#include "foldertreeview.h"
+#include "MailCommon/FolderTreeView"
#include "tag/tagactionmanager.h"
#include "foldershortcutactionmanager.h"
#include "kmmigrateapplication.h"
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index beec12d..4c6430e 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -69,18 +69,18 @@
#include <AkonadiCore/itemmodifyjob.h>
#include <AkonadiCore/itemfetchjob.h>
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include "MessageCore/MailingList"
#include "editor/composer.h"
-#include "mailcommon/filter/filteractions/filteraction.h"
-#include "mailcommon/filter/filtermanager.h"
-#include "mailcommon/filter/mailfilter.h"
-#include "mailcommon/widgets/redirectdialog.h"
+#include "MailCommon/FilterAction"
+#include "MailCommon/FilterManager"
+#include "MailCommon/MailFilter"
+#include "MailCommon/RedirectDialog"
#include "kmmainwidget.h"
#include "undostack.h"
#ifndef QT_NO_CURSOR
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#endif
#include "viewer/objecttreeparser.h"
#include "viewer/csshelper.h"
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index b74e378..973f3f0 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -20,8 +20,8 @@ using KPIM::RecentAddresses;
#include "utils/stringutil.h"
#include "util/mailutil.h"
#include "mailcommon/pop3settings.h"
-#include "mailcommon/folder/foldertreeview.h"
-#include "mailcommon/filter/kmfilterdialog.h"
+#include "MailCommon/FolderTreeView"
+#include "MailCommon/KMFilterDialog"
#include "mailcommon/mailcommonsettings_base.h"
#include "pimcommon/util/pimutil.h"
#include "folderarchive/folderarchivemanager.h"
@@ -60,7 +60,7 @@ using KMail::MailServiceImpl;
#include "globalsettings_templateparser.h"
#include "TemplateParser/TemplatesUtil"
-#include "foldercollection.h"
+#include "mailcommon/foldercollection.h"
#include "editor/codec/codecmanager.h"
#include <kmessagebox.h>
@@ -109,10 +109,10 @@ using KMail::MailServiceImpl;
#include <KLocalizedString>
#include <QStandardPaths>
#include "kmailinterface.h"
-#include "foldercollectionmonitor.h"
+#include "mailcommon/foldercollectionmonitor.h"
#include "imapresourcesettings.h"
#include "util.h"
-#include "mailcommon/kernel/mailkernel.h"
+#include "MailCommon/MailKernel"
#include "searchdialog/searchdescriptionattribute.h"
#include "kmail_options.h"
diff --git a/kmail/kmlaunchexternalcomponent.cpp b/kmail/kmlaunchexternalcomponent.cpp
index 5062a6d..a7adf83 100644
--- a/kmail/kmlaunchexternalcomponent.cpp
+++ b/kmail/kmlaunchexternalcomponent.cpp
@@ -24,7 +24,7 @@
#include "archivemailagentinterface.h"
#include "sendlateragentinterface.h"
#include "followupreminderinterface.h"
-#include "mailcommon/filter/filtermanager.h"
+#include "MailCommon/FilterManager"
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index cbefe8b..0bc5217 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -30,14 +30,14 @@
#include "kmmainwin.h"
#include "kmsystemtray.h"
#include <TemplateParser/CustomTemplatesMenu>
-#include "folderselectiondialog.h"
-#include "foldertreewidget.h"
+#include "MailCommon/FolderSelectionDialog"
+#include "MailCommon/FolderTreeWidget"
#include "util.h"
#include "util/mailutil.h"
#include "kernel/mailkernel.h"
#include "dialog/archivefolderdialog.h"
#include "settings/kmailsettings.h"
-#include "foldertreeview.h"
+#include "MailCommon/FolderTreeView"
#include "tag/tagactionmanager.h"
#include "foldershortcutactionmanager.h"
#include "widgets/collectionpane.h"
@@ -65,14 +65,14 @@ using KSieveUi::SieveDebugDialog;
#include "pimcommon/acl/collectionaclpage.h"
#include "pimcommon/util/pimutil.h"
-#include "mailcommon/collectionpage/collectiongeneralpage.h"
-#include "mailcommon/collectionpage/collectionexpirypage.h"
-#include "mailcommon/collectionpage/attributes/expirecollectionattribute.h"
-#include "mailcommon/filter/filtermanager.h"
-#include "mailcommon/filter/mailfilter.h"
-#include "mailcommon/widgets/favoritecollectionwidget.h"
-#include "mailcommon/folder/foldertreewidget.h"
-#include "mailcommon/folder/foldertreeview.h"
+#include "MailCommon/CollectionGeneralPage"
+#include "MailCommon/CollectionExpiryPage"
+#include "MailCommon/ExpireCollectionAttribute"
+#include "MailCommon/FilterManager"
+#include "MailCommon/MailFilter"
+#include "MailCommon/FavoriteCollectionWidget"
+#include "MailCommon/FolderTreeWidget"
+#include "MailCommon/FolderTreeView"
#include "mailcommon/mailcommonsettings_base.h"
#include "kmmainwidget.h"
@@ -86,7 +86,7 @@ using KSieveUi::SieveDebugDialog;
#include "header/headerstrategy.h"
#include "header/headerstyle.h"
#ifndef QT_NO_CURSOR
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#endif
#include "messagecomposer/sender/messagesender.h"
diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h
index 2890f83..80f73b8 100644
--- a/kmail/kmmainwidget.h
+++ b/kmail/kmmainwidget.h
@@ -25,12 +25,12 @@
#include "kmreaderwin.h" //for inline actions
#include "kmkernel.h" // for access to config
-#include "foldertreewidget.h"
+#include "mailcommon/foldertreewidget.h"
#include <kxmlguiclient.h>
#include "messageactions.h"
#include <kactioncollection.h>
-#include <foldercollection.h>
+#include <mailcommon/foldercollection.h>
#include <QPointer>
#include <QTimer>
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 2f3af52..4546b8a 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -51,7 +51,7 @@
#include "messageactions.h"
#include "util.h"
#include "kernel/mailkernel.h"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include <KActionCollection>
#include <Akonadi/Contact/ContactSearchJob>
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 1aab192..63cff85 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -36,7 +36,7 @@
#include <Libkdepim/AddEmailDisplayJob>
#include <Libkdepim/BroadcastStatus>
#include "kmcommands.h"
-#include "mailcommon/mdn/sendmdnhandler.h"
+#include "MailCommon/SendMdnHandler"
#include <QVBoxLayout>
#include "header/headerstrategy.h"
#include "header/headerstyle.h"
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 23fe0b2..eeb7513 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -22,8 +22,8 @@
#include "kmmainwidget.h"
#include "settings/kmailsettings.h"
#include "util/mailutil.h"
-#include "mailcommon/kernel/mailkernel.h"
-#include "mailcommon/folder/foldertreeview.h"
+#include "MailCommon/MailKernel"
+#include "MailCommon/FolderTreeView"
#include <AkonadiCore/NewMailNotifierAttribute>
#include <kiconloader.h>
diff --git a/kmail/manageshowcollectionproperties.h b/kmail/manageshowcollectionproperties.h
index ee20b8c..30bec5c 100644
--- a/kmail/manageshowcollectionproperties.h
+++ b/kmail/manageshowcollectionproperties.h
@@ -20,7 +20,7 @@
#include <QObject>
#include <QPointer>
-#include <foldercollection.h>
+#include <MailCommon/FolderCollection>
#include <progresswidget/progressmanager.h>
diff --git a/kmail/searchdialog/kmailsearchpatternedit.h b/kmail/searchdialog/kmailsearchpatternedit.h
index faac08d..2fec0c2 100644
--- a/kmail/searchdialog/kmailsearchpatternedit.h
+++ b/kmail/searchdialog/kmailsearchpatternedit.h
@@ -18,7 +18,7 @@
#ifndef KMailSearchPatternEdit_H
#define KMailSearchPatternEdit_H
-#include <mailcommon/search/searchpatternedit.h>
+#include <MailCommon/SearchPatternEdit>
namespace KMail
{
diff --git a/kmail/searchdialog/kmsearchmessagemodel.cpp b/kmail/searchdialog/kmsearchmessagemodel.cpp
index 50651e1..334cb96 100644
--- a/kmail/searchdialog/kmsearchmessagemodel.cpp
+++ b/kmail/searchdialog/kmsearchmessagemodel.cpp
@@ -26,7 +26,7 @@
* your version.
*/
#include "kmsearchmessagemodel.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "messagelist/messagelistutil.h"
#include "utils/stringutil.h"
diff --git a/kmail/searchdialog/searchwindow.cpp b/kmail/searchdialog/searchwindow.cpp
index a06c368..fe0584b 100644
--- a/kmail/searchdialog/searchwindow.cpp
+++ b/kmail/searchdialog/searchwindow.cpp
@@ -23,13 +23,13 @@
#include "searchwindow.h"
-#include "folderrequester.h"
+#include "MailCommon/FolderRequester"
#include "kmcommands.h"
#include "kmmainwidget.h"
-#include "mailcommon/kernel/mailkernel.h"
-#include "mailcommon/search/searchpatternedit.h"
+#include "MailCommon/MailKernel"
+#include "MailCommon/SearchPatternEdit"
#include "searchdescriptionattribute.h"
-#include "foldertreeview.h"
+#include "MailCommon/FolderTreeView"
#include "kmsearchmessagemodel.h"
#include "kmsearchfilterproxymodel.h"
#include "searchpatternwarning.h"
diff --git a/kmail/searchdialog/searchwindow.h b/kmail/searchdialog/searchwindow.h
index 36f783b..dae0c59 100644
--- a/kmail/searchdialog/searchwindow.h
+++ b/kmail/searchdialog/searchwindow.h
@@ -22,7 +22,7 @@
#ifndef KMAIL_SEARCHWINDOW_H
#define KMAIL_SEARCHWINDOW_H
-#include "mailcommon/search/searchpattern.h"
+#include "MailCommon/SearchPattern"
#include "ui_searchwindow.h"
#include <AkonadiCore/collection.h>
diff --git a/kmail/settings/globalsettings_kmail.kcfgc b/kmail/settings/globalsettings_kmail.kcfgc
index 60b4122..085244d 100644
--- a/kmail/settings/globalsettings_kmail.kcfgc
+++ b/kmail/settings/globalsettings_kmail.kcfgc
@@ -4,7 +4,7 @@ Mutators=true
Singleton=true
ItemAccessors=true
SetUserTexts=true
-IncludeFiles=qapplication.h,defaulttemplates.h,mailkernel.h,kdepim-version.h,kmail_debug.h
+IncludeFiles=qapplication.h,defaulttemplates.h,kernel/mailkernel.h,kdepim-version.h,kmail_debug.h
CategoryLoggingName=KMAIL_LOG
TranslationDomain=kmail
TranslationSystem=kde
diff --git a/kmail/tag/tagactionmanager.cpp b/kmail/tag/tagactionmanager.cpp
index de49c78..28806bf 100644
--- a/kmail/tag/tagactionmanager.cpp
+++ b/kmail/tag/tagactionmanager.cpp
@@ -21,7 +21,7 @@
#include "messageactions.h"
-#include "mailcommon/tag/addtagdialog.h"
+#include "MailCommon/AddTagDialog"
#include <QAction>
#include <KActionCollection>
diff --git a/kmail/tag/tagactionmanager.h b/kmail/tag/tagactionmanager.h
index 2aef4b9..77ec29b 100644
--- a/kmail/tag/tagactionmanager.h
+++ b/kmail/tag/tagactionmanager.h
@@ -22,7 +22,7 @@
#define TAGACTIONMANAGER_H
#include "kmail_export.h"
-#include "tag.h"
+#include "mailcommon/tag.h"
#include <QMap>
class KJob;
diff --git a/kmail/tag/tagselectdialog.cpp b/kmail/tag/tagselectdialog.cpp
index 74b18b9..168fe9e 100644
--- a/kmail/tag/tagselectdialog.cpp
+++ b/kmail/tag/tagselectdialog.cpp
@@ -30,7 +30,7 @@
#include "tag.h"
#include "kmkernel.h"
-#include <mailcommon/tag/addtagdialog.h>
+#include <MailCommon/AddTagDialog>
#include <KListWidgetSearchLine>
#include <KLocalizedString>
diff --git a/kmail/tag/tagselectdialog.h b/kmail/tag/tagselectdialog.h
index 1886d0b..813b4f9 100644
--- a/kmail/tag/tagselectdialog.h
+++ b/kmail/tag/tagselectdialog.h
@@ -32,7 +32,7 @@
#include <QDialog>
#include <AkonadiCore/Item>
#include <AkonadiCore/Tag>
-#include "tag.h"
+#include "MailCommon/Tag"
class QListWidget;
class KActionCollection;
diff --git a/kmail/ui/searchwindow.ui b/kmail/ui/searchwindow.ui
index 350fc84..2f95f6f 100644
--- a/kmail/ui/searchwindow.ui
+++ b/kmail/ui/searchwindow.ui
@@ -196,7 +196,7 @@
<customwidget>
<class>MailCommon::FolderRequester</class>
<extends>QWidget</extends>
- <header location="global">mailcommon/folder/folderrequester.h</header>
+ <header location="global">MailCommon/FolderRequester</header>
<container>1</container>
</customwidget>
<customwidget>
diff --git a/kmail/util.cpp b/kmail/util.cpp
index dbcf3ed..f5e6b9b 100644
--- a/kmail/util.cpp
+++ b/kmail/util.cpp
@@ -54,7 +54,7 @@
#include <QAction>
#include <QStandardPaths>
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
using namespace MailCommon;
diff --git a/kmail/util.h b/kmail/util.h
index e2acc93..c955e24 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -41,7 +41,7 @@
#include <QWidget>
#include <AkonadiCore/item.h>
#include <AkonadiCore/Collection>
-#include "mailcommon/folder/foldercollection.h"
+#include "MailCommon/FolderCollection"
namespace KMail
{
diff --git a/kmail/widgets/collectionpane.cpp b/kmail/widgets/collectionpane.cpp
index d6d6b97..6c1bc6c 100644
--- a/kmail/widgets/collectionpane.cpp
+++ b/kmail/widgets/collectionpane.cpp
@@ -20,7 +20,7 @@
#include "kmkernel.h"
#include "kernel/mailkernel.h"
-#include "foldercollection.h"
+#include "MailCommon/FolderCollection"
#include "pimcommon/util/pimutil.h"
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
diff --git a/kmail/widgets/kactionmenuaccount.cpp b/kmail/widgets/kactionmenuaccount.cpp
index 20d682a..9bd2003 100644
--- a/kmail/widgets/kactionmenuaccount.cpp
+++ b/kmail/widgets/kactionmenuaccount.cpp
@@ -18,7 +18,7 @@
#include "kactionmenuaccount.h"
#include <AkonadiCore/AgentInstance>
#include <AkonadiCore/AgentManager>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "kmail_debug.h"
#include <QMenu>
diff --git a/mailcommon/CMakeLists.txt b/mailcommon/CMakeLists.txt
index dd38394..8083a53 100644
--- a/mailcommon/CMakeLists.txt
+++ b/mailcommon/CMakeLists.txt
@@ -1,266 +1,79 @@
+cmake_minimum_required(VERSION 2.8.12)
+
project(mailcommon)
-add_definitions(-DTRANSLATION_DOMAIN=\"libmailcommon\")
+if(${CMAKE_SOURCE_DIR} STREQUAL ${mailcommon_SOURCE_DIR})
+# ECM setup
+find_package(ECM 5.14.0 CONFIG REQUIRED)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-#add_definitions( -DQT_NO_CAST_FROM_ASCII )
-#add_definitions( -DQT_NO_CAST_TO_ASCII )
+include(GenerateExportHeader)
+include(ECMSetupVersion)
+include(ECMGenerateHeaders)
+include(ECMGeneratePriFile)
+include(ECMPackageConfigHelpers)
+include(ECMSetupVersion)
+include(FeatureSummary)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDEFrameworkCompilerSettings)
+include(ECMQtDeclareLoggingCategory)
+include(ECMAddTests)
-set(libmailcommon_filter_SRCS
- filter/kmfilteraccountlist.cpp
- filter/kmfilterlistbox.cpp
- filter/filterselectiondialog.cpp
- filter/filterconverter/filterconverttosieve.cpp
- filter/filterconverter/filterconverttosieveresultdialog.cpp
- filter/filteractions/filteraction.cpp
- filter/filteractions/filteractionaddheader.cpp
- filter/filteractions/filteractionaddtag.cpp
- filter/filteractions/filteractionaddtoaddressbook.cpp
- filter/filteractions/filteractioncopy.cpp
- filter/filteractions/filteractiondelete.cpp
- filter/filteractions/filteractiondict.cpp
- filter/filteractions/filteractionexec.cpp
- filter/filteractions/filteractionforward.cpp
- filter/dialog/filteractionmissingargumentdialog.cpp
- filter/filteractions/filteractionmove.cpp
- filter/filteractions/filteractionpipethrough.cpp
- filter/filteractions/filteractionplaysound.cpp
- filter/filteractions/filteractionredirect.cpp
- filter/filteractions/filteractionremoveheader.cpp
- filter/filteractions/filteractionreplyto.cpp
- filter/filteractions/filteractionrewriteheader.cpp
- filter/filteractions/filteractionsendfakedisposition.cpp
- filter/filteractions/filteractionsendreceipt.cpp
- filter/filteractions/filteractionsetidentity.cpp
- filter/filteractions/filteractionsetstatus.cpp
- filter/filteractions/filteractionstatus.cpp
- filter/filteractions/filteractionunsetstatus.cpp
- filter/filteractions/filteractionsettransport.cpp
- filter/filteractions/filteractionwidget.cpp
- filter/filteractions/filteractionwithaddress.cpp
- filter/filteractions/filteractionwithcommand.cpp
- filter/filteractions/filteractionwithfolder.cpp
- filter/filteractions/filteractionwithnone.cpp
- filter/filteractions/filteractionwithstring.cpp
- filter/filteractions/filteractionwithstringlist.cpp
- filter/filteractions/filteractionwithtest.cpp
- filter/filteractions/filteractionwithuoid.cpp
- filter/filteractions/filteractionwithurl.cpp
- filter/filtereditdialog.cpp
- filter/filterimporterexporter.cpp
- filter/filterimporter/filterimporterabstract.cpp
- filter/filterimporter/filterimporterevolution.cpp
- filter/filterimporter/filterimportersylpheed.cpp
- filter/filterimporter/filterimporterthunderbird.cpp
- filter/filterimporter/filterimporterprocmail.cpp
- filter/filterimporter/filterimporterbalsa.cpp
- filter/filterimporter/filterimporterclawsmail.cpp
- filter/filterimporter/filterimportergmail.cpp
- filter/filterlog.cpp
- filter/filtermanager.cpp
- filter/itemcontext.cpp
- filter/kmfilterdialog.cpp
- filter/mailfilter.cpp
- filter/dialog/selectthunderbirdfilterfilesdialog.cpp
- filter/dialog/selectthunderbirdfilterfileswidget.cpp
- filter/mdnadvicedialog.cpp
-)
+set(KF5_VERSION "5.14.0")
+set(KDEPIMLIBS_LIB_VERSION "5.0.42")
+set(KDEPIM_LIB_VERSION "5.43.0")
+set(QT_REQUIRED_VERSION "5.4.0")
+set(KMIME_LIB_VERSION "4.87.0")
-set(libmailcommon_invalidfilters
- filter/invalidfilters/invalidfilterdialog.cpp
- filter/invalidfilters/invalidfilterlistview.cpp
- filter/invalidfilters/invalidfilterwidget.cpp
- filter/invalidfilters/invalidfilterinfo.cpp
- filter/invalidfilters/invalidfilterlistitemdelegate.cpp
- filter/invalidfilters/invalidfilterlistmodel.cpp
- filter/invalidfilters/invalidfilterinfowidget.cpp
-)
+find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
+find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
-set(libmailcommon_collection_SRCS
- collectionpage/collectiontypeutil.cpp
- collectionpage/attributeregistrar.cpp
- collectionpage/attributes/collectionannotationsattribute.cpp
- collectionpage/collectiongeneralpage.cpp
- collectionpage/collectionexpirypage.cpp
- collectionpage/attributes/expirecollectionattribute.cpp
- collectionpage/incidencesforwidget.cpp
- collectionpage/contenttypewidget.cpp
+ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX MAILCOMMON
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailcommon_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MailCommonConfigVersion.cmake"
+ SOVERSION 5
)
-set(libmailcommon_folder_SRCS
- folder/foldercollection.cpp
- folder/foldercollectionmonitor.cpp
- folder/folderrequester.cpp
- folder/folderselectiondialog.cpp
- folder/foldertreeview.cpp
- folder/foldertreewidget.cpp
- folder/foldertreewidgetproxymodel.cpp
- folder/entitycollectionorderproxymodel.cpp
- folder/accountconfigorderdialog.cpp
-)
+########### Targets ###########
-set(libmailcommon_job_SRCS
- job/jobscheduler.cpp
- job/folderjob.cpp
- job/expirejob.cpp
- job/backupjob.cpp
-)
+add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
-set(libmailcommon_search_SRCS
- search/widgethandler/rulewidgethandlermanager.cpp
- search/searchpattern.cpp
- search/searchpatternedit.cpp
- search/widgethandler/textrulerwidgethandler.cpp
- search/widgethandler/statusrulewidgethandler.cpp
- search/widgethandler/messagerulewidgethandler.cpp
- search/widgethandler/tagrulewidgethandler.cpp
- search/widgethandler/numericrulewidgethandler.cpp
- search/widgethandler/daterulewidgethandler.cpp
- search/widgethandler/numericdoublerulewidgethandler.cpp
- search/widgethandler/headersrulerwidgethandler.cpp
- search/searchrule/searchrulenumerical.cpp
- search/searchrule/searchruledate.cpp
- search/searchrule/searchrulestring.cpp
- search/searchrule/searchrulestatus.cpp
- search/searchrule/searchrule.cpp
-)
+########### CMake Config Files ###########
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailCommon")
-set(libmailcommon_snippets_SRCS
- snippets/snippetdialog.cpp
- snippets/snippetsmanager.cpp
- snippets/snippetsmodel.cpp
- snippets/snippetvariabledialog.cpp
+ecm_configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KF5MailCommonConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5MailCommonConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
-set(libmailcommon_tag_SRCS
- tag/tagwidget.cpp
- tag/tag.cpp
- tag/addtagdialog.cpp
+install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5MailCommonConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5MailCommonConfigVersion.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ COMPONENT Devel
)
-set(libmailcommon_widget_SRCS
- widgets/redirectdialog.cpp
- widgets/redirectwidget.cpp
- widgets/favoritecollectionwidget.cpp
-)
+install(EXPORT KF5MailCommonTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5MailCommonTargets.cmake NAMESPACE KF5::)
-set(libmailcommon_mdn_SRCS
- mdn/sendmdnhandler.cpp
+install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/mailcommon_version.h
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
-set(libmailcommon_util_SRCS
- util/mailutil.cpp
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+else()
+ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX MAILCOMMON
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailcommon_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MailCommonConfigVersion.cmake"
+ SOVERSION 5
)
-
-set(libmailcommon_SRCS
- kernel/mailkernel.cpp
- ${libmailcommon_util_SRCS}
- ${libmailcommon_mdn_SRCS}
- ${libmailcommon_invalidfilters}
- ${libmailcommon_widget_SRCS}
- ${libmailcommon_tag_SRCS}
- ${libmailcommon_snippets_SRCS}
- ${libmailcommon_search_SRCS}
- ${libmailcommon_job_SRCS}
- ${libmailcommon_collection_SRCS}
- ${libmailcommon_folder_SRCS}
- ${libmailcommon_filter_SRCS}
-)
-kconfig_add_kcfg_files(libmailcommon_SRCS
- settings/mailcommonsettings_base.kcfgc
-)
-
-ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME log_mailcommon)
-
-set_source_files_properties(${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml PROPERTIES INCLUDE "dbusoperators.h")
-
-qt5_add_dbus_interfaces(libmailcommon_SRCS
- ${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
-)
-
-ki18n_wrap_ui(libmailcommon_SRCS filter/ui/filterconfigwidget.ui snippets/ui/snippetdialog.ui filter/ui/selectthunderbirdfilterfileswidget.ui)
-
-set(libmailcommon_SRCS ${libmailcommon_SRCS} filter/soundtestwidget.cpp)
-
-macro(add_resource_iface _kcfgFile _ifaceName _className)
- kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${_ifaceName})
- string(TOLOWER ${_className} _codeFile)
- set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml PROPERTIES INCLUDE "metatype.h")
- qt5_add_dbus_interface(libmailcommon_SRCS
- ${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml ${_codeFile} ${_className}
- )
-endmacro()
-
-add_resource_iface(settings.kcfg org.kde.Akonadi.POP3.Settings Pop3Settings)
-
-qt5_add_dbus_interfaces(libmailcommon_SRCS
- ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.Korganizer.Calendar.xml
-)
-
-add_library(mailcommon ${libmailcommon_SRCS})
-generate_export_header(mailcommon BASE_NAME mailcommon)
-
-target_link_libraries(mailcommon
-PUBLIC
- KF5::AkonadiCore
- KF5::AkonadiMime
- messagecomposer
- pimcommon
-PRIVATE
- KF5::Libkdepim
- KF5::MessageViewer
- KF5::MailImporter
- KF5::MessageCore
- KF5::TemplateParser
- KF5::Mime
- KF5::Codecs
- KF5::MailTransport
- Phonon::phonon4qt5
- KF5::XmlGui
- KF5::KIOWidgets
- KF5::WindowSystem
- KF5::IconThemes
- KF5::Archive
- KF5::ItemViews
- KF5::Ldap
-)
-
-target_include_directories(mailcommon PUBLIC "$<BUILD_INTERFACE:${mailcommon_SOURCE_DIR};${mailcommon_BINARY_DIR}>")
-target_include_directories(mailcommon PUBLIC "$<BUILD_INTERFACE:${mailcommon_SOURCE_DIR}/search;>")
-
-set_target_properties(mailcommon PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
-install(TARGETS mailcommon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-if (BUILD_TESTING)
- add_subdirectory(filter/filterimporter/autotests)
- add_subdirectory(collectionpage/autotests)
- add_subdirectory(filter/autotests)
- add_subdirectory(snippets/autotests)
- add_subdirectory(filter/tests)
- add_subdirectory(search/autotests)
endif()
-
-if (Qt5Designer_FOUND)
- kf5designerplugin_add_plugin(mailcommonwidgets ${CMAKE_CURRENT_SOURCE_DIR}/designer/mailcommon.widgets)
-
- target_link_libraries(mailcommonwidgets
- mailcommon
- KF5::Libkdepim
- )
- if(NOT WIN32)
- # Since there are no libraries provided by this module,
- # there is no point including the build tree in RPath,
- # and then having to edit it at install time.
- set_target_properties(mailcommonwidgets PROPERTIES
- SKIP_BUILD_RPATH TRUE
- BUILD_WITH_INSTALL_RPATH TRUE
- )
- endif()
-
- install(TARGETS
- mailcommonwidgets
- DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer
- )
-endif()
+add_subdirectory(src)
diff --git a/mailcommon/src/CMakeLists.txt b/mailcommon/src/CMakeLists.txt
new file mode 100644
index 0000000..018c8e9
--- /dev/null
+++ b/mailcommon/src/CMakeLists.txt
@@ -0,0 +1,446 @@
+
+add_definitions(-DTRANSLATION_DOMAIN=\"libmailcommon\")
+
+#add_definitions( -DQT_NO_CAST_FROM_ASCII )
+#add_definitions( -DQT_NO_CAST_TO_ASCII )
+
+
+set(libmailcommon_filter_SRCS
+ filter/kmfilteraccountlist.cpp
+ filter/kmfilterlistbox.cpp
+ filter/filterselectiondialog.cpp
+ filter/filterconverter/filterconverttosieve.cpp
+ filter/filterconverter/filterconverttosieveresultdialog.cpp
+ filter/filteractions/filteraction.cpp
+ filter/filteractions/filteractionaddheader.cpp
+ filter/filteractions/filteractionaddtag.cpp
+ filter/filteractions/filteractionaddtoaddressbook.cpp
+ filter/filteractions/filteractioncopy.cpp
+ filter/filteractions/filteractiondelete.cpp
+ filter/filteractions/filteractiondict.cpp
+ filter/filteractions/filteractionexec.cpp
+ filter/filteractions/filteractionforward.cpp
+ filter/dialog/filteractionmissingargumentdialog.cpp
+ filter/filteractions/filteractionmove.cpp
+ filter/filteractions/filteractionpipethrough.cpp
+ filter/filteractions/filteractionplaysound.cpp
+ filter/filteractions/filteractionredirect.cpp
+ filter/filteractions/filteractionremoveheader.cpp
+ filter/filteractions/filteractionreplyto.cpp
+ filter/filteractions/filteractionrewriteheader.cpp
+ filter/filteractions/filteractionsendfakedisposition.cpp
+ filter/filteractions/filteractionsendreceipt.cpp
+ filter/filteractions/filteractionsetidentity.cpp
+ filter/filteractions/filteractionsetstatus.cpp
+ filter/filteractions/filteractionstatus.cpp
+ filter/filteractions/filteractionunsetstatus.cpp
+ filter/filteractions/filteractionsettransport.cpp
+ filter/filteractions/filteractionwidget.cpp
+ filter/filteractions/filteractionwithaddress.cpp
+ filter/filteractions/filteractionwithcommand.cpp
+ filter/filteractions/filteractionwithfolder.cpp
+ filter/filteractions/filteractionwithnone.cpp
+ filter/filteractions/filteractionwithstring.cpp
+ filter/filteractions/filteractionwithstringlist.cpp
+ filter/filteractions/filteractionwithtest.cpp
+ filter/filteractions/filteractionwithuoid.cpp
+ filter/filteractions/filteractionwithurl.cpp
+ filter/filtereditdialog.cpp
+ filter/filterimporterexporter.cpp
+ filter/filterimporter/filterimporterabstract.cpp
+ filter/filterimporter/filterimporterevolution.cpp
+ filter/filterimporter/filterimportersylpheed.cpp
+ filter/filterimporter/filterimporterthunderbird.cpp
+ filter/filterimporter/filterimporterprocmail.cpp
+ filter/filterimporter/filterimporterbalsa.cpp
+ filter/filterimporter/filterimporterclawsmail.cpp
+ filter/filterimporter/filterimportergmail.cpp
+ filter/filterlog.cpp
+ filter/filtermanager.cpp
+ filter/itemcontext.cpp
+ filter/kmfilterdialog.cpp
+ filter/mailfilter.cpp
+ filter/dialog/selectthunderbirdfilterfilesdialog.cpp
+ filter/dialog/selectthunderbirdfilterfileswidget.cpp
+ filter/mdnadvicedialog.cpp
+)
+
+set(libmailcommon_invalidfilters
+ filter/invalidfilters/invalidfilterdialog.cpp
+ filter/invalidfilters/invalidfilterlistview.cpp
+ filter/invalidfilters/invalidfilterwidget.cpp
+ filter/invalidfilters/invalidfilterinfo.cpp
+ filter/invalidfilters/invalidfilterlistitemdelegate.cpp
+ filter/invalidfilters/invalidfilterlistmodel.cpp
+ filter/invalidfilters/invalidfilterinfowidget.cpp
+)
+
+set(libmailcommon_collection_SRCS
+ collectionpage/collectiontypeutil.cpp
+ collectionpage/attributeregistrar.cpp
+ collectionpage/attributes/collectionannotationsattribute.cpp
+ collectionpage/collectiongeneralpage.cpp
+ collectionpage/collectionexpirypage.cpp
+ collectionpage/attributes/expirecollectionattribute.cpp
+ collectionpage/incidencesforwidget.cpp
+ collectionpage/contenttypewidget.cpp
+)
+
+set(libmailcommon_folder_SRCS
+ folder/foldercollection.cpp
+ folder/foldercollectionmonitor.cpp
+ folder/folderrequester.cpp
+ folder/folderselectiondialog.cpp
+ folder/foldertreeview.cpp
+ folder/foldertreewidget.cpp
+ folder/foldertreewidgetproxymodel.cpp
+ folder/entitycollectionorderproxymodel.cpp
+ folder/accountconfigorderdialog.cpp
+)
+
+set(libmailcommon_job_SRCS
+ job/jobscheduler.cpp
+ job/folderjob.cpp
+ job/expirejob.cpp
+ job/backupjob.cpp
+)
+
+set(libmailcommon_search_SRCS
+ search/widgethandler/rulewidgethandlermanager.cpp
+ search/searchpattern.cpp
+ search/searchpatternedit.cpp
+ search/widgethandler/textrulerwidgethandler.cpp
+ search/widgethandler/statusrulewidgethandler.cpp
+ search/widgethandler/messagerulewidgethandler.cpp
+ search/widgethandler/tagrulewidgethandler.cpp
+ search/widgethandler/numericrulewidgethandler.cpp
+ search/widgethandler/daterulewidgethandler.cpp
+ search/widgethandler/numericdoublerulewidgethandler.cpp
+ search/widgethandler/headersrulerwidgethandler.cpp
+ search/searchrule/searchrulenumerical.cpp
+ search/searchrule/searchruledate.cpp
+ search/searchrule/searchrulestring.cpp
+ search/searchrule/searchrulestatus.cpp
+ search/searchrule/searchrule.cpp
+)
+
+set(libmailcommon_snippets_SRCS
+ snippets/snippetdialog.cpp
+ snippets/snippetsmanager.cpp
+ snippets/snippetsmodel.cpp
+ snippets/snippetvariabledialog.cpp
+)
+
+set(libmailcommon_tag_SRCS
+ tag/tagwidget.cpp
+ tag/tag.cpp
+ tag/addtagdialog.cpp
+)
+
+set(libmailcommon_widget_SRCS
+ widgets/redirectdialog.cpp
+ widgets/redirectwidget.cpp
+ widgets/favoritecollectionwidget.cpp
+)
+
+set(libmailcommon_mdn_SRCS
+ mdn/sendmdnhandler.cpp
+)
+
+set(libmailcommon_util_SRCS
+ util/mailutil.cpp
+)
+
+set(libmailcommon_SRCS
+ kernel/mailkernel.cpp
+ ${libmailcommon_util_SRCS}
+ ${libmailcommon_mdn_SRCS}
+ ${libmailcommon_invalidfilters}
+ ${libmailcommon_widget_SRCS}
+ ${libmailcommon_tag_SRCS}
+ ${libmailcommon_snippets_SRCS}
+ ${libmailcommon_search_SRCS}
+ ${libmailcommon_job_SRCS}
+ ${libmailcommon_collection_SRCS}
+ ${libmailcommon_folder_SRCS}
+ ${libmailcommon_filter_SRCS}
+)
+kconfig_add_kcfg_files(libmailcommon_SRCS
+ settings/mailcommonsettings_base.kcfgc
+)
+
+ecm_qt_declare_logging_category(libmailcommon_SRCS HEADER mailcommon_debug.h IDENTIFIER MAILCOMMON_LOG CATEGORY_NAME log_mailcommon)
+
+set_source_files_properties(${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml PROPERTIES INCLUDE "dbusoperators.h")
+
+qt5_add_dbus_interfaces(libmailcommon_SRCS
+ ${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
+)
+
+ki18n_wrap_ui(libmailcommon_SRCS filter/ui/filterconfigwidget.ui snippets/ui/snippetdialog.ui filter/ui/selectthunderbirdfilterfileswidget.ui)
+
+set(libmailcommon_SRCS ${libmailcommon_SRCS} filter/soundtestwidget.cpp)
+
+macro(add_resource_iface _kcfgFile _ifaceName _className)
+ kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${_ifaceName})
+ string(TOLOWER ${_className} _codeFile)
+ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml PROPERTIES INCLUDE "metatype.h")
+ qt5_add_dbus_interface(libmailcommon_SRCS
+ ${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml ${_codeFile} ${_className}
+ )
+endmacro()
+
+add_resource_iface(settings.kcfg org.kde.Akonadi.POP3.Settings Pop3Settings)
+
+qt5_add_dbus_interfaces(libmailcommon_SRCS
+ ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.Korganizer.Calendar.xml
+)
+
+add_library(KF5MailCommon ${libmailcommon_SRCS})
+generate_export_header(KF5MailCommon BASE_NAME mailcommon)
+
+
+add_library(KF5::MailCommon ALIAS KF5MailCommon)
+
+target_link_libraries(KF5MailCommon
+PUBLIC
+ KF5::AkonadiCore
+ KF5::AkonadiMime
+ messagecomposer
+ pimcommon
+PRIVATE
+ KF5::Libkdepim
+ KF5::MessageViewer
+ KF5::MailImporter
+ KF5::MessageCore
+ KF5::TemplateParser
+ KF5::Mime
+ KF5::Codecs
+ KF5::MailTransport
+ Phonon::phonon4qt5
+ KF5::XmlGui
+ KF5::KIOWidgets
+ KF5::WindowSystem
+ KF5::IconThemes
+ KF5::Archive
+ KF5::ItemViews
+ KF5::Ldap
+)
+target_include_directories(KF5MailCommon INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/MailCommon/;${KDE_INSTALL_INCLUDEDIR_KF5}/mailcommon>")
+target_include_directories(KF5MailCommon PUBLIC "$<BUILD_INTERFACE:${mailcommon_SOURCE_DIR}/src;${mailcommon_BINARY_DIR}/src;${mailcommon_SOURCE_DIR}/src/search>")
+
+
+set_target_properties(KF5MailCommon PROPERTIES
+ VERSION ${MAILCOMMON_VERSION_STRING}
+ SOVERSION ${MAILCOMMON_SOVERSION}
+ EXPORT_NAME MailCommon
+)
+
+install(TARGETS
+ KF5MailCommon
+ EXPORT KF5MailCommonTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+if (BUILD_TESTING)
+ add_subdirectory(filter/filterimporter/autotests)
+ add_subdirectory(collectionpage/autotests)
+ add_subdirectory(filter/autotests)
+ add_subdirectory(snippets/autotests)
+ add_subdirectory(filter/tests)
+ add_subdirectory(search/autotests)
+endif()
+
+ecm_generate_headers(MailCommon_CamelCase_HEADERS
+ HEADER_NAMES
+ KCursorSaver
+ MailUtil
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE util
+)
+
+ecm_generate_headers(MailCommon_top_HEADERS
+ HEADER_NAMES
+ DBusOperators
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+)
+
+ecm_generate_headers(MailCommon_tag_HEADERS
+ HEADER_NAMES
+ TagWidget
+ Tag
+ AddTagDialog
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE tag
+)
+
+ecm_generate_headers(MailCommon_folder_HEADERS
+ HEADER_NAMES
+ FolderCollection
+ FolderRequester
+ FolderCollectionMonitor
+ AccountConfigOrderDialog
+ FolderTreeView
+ FolderTreeWidget
+ FolderSelectionDialog
+ FolderTreeWidgetProxyModel
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE folder
+)
+
+ecm_generate_headers(MailCommon_kernel_HEADERS
+ HEADER_NAMES
+ MailKernel
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE kernel
+)
+
+ecm_generate_headers(MailCommon_interfaces_HEADERS
+ HEADER_NAMES
+ MailInterfaces
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE interfaces
+)
+
+
+ecm_generate_headers(MailCommon_filter_HEADERS
+ HEADER_NAMES
+ FilterLog
+ MailFilter
+ FilterImporterExporter
+ FilterManager
+ KMFilterDialog
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE filter
+)
+
+ecm_generate_headers(MailCommon_job_HEADERS
+ HEADER_NAMES
+ BackupJob
+ JobScheduler
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE job
+)
+
+ecm_generate_headers(MailCommon_filteraction_HEADERS
+ HEADER_NAMES
+ FilterAction
+ FilterActionDict
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE filter/filteractions/
+)
+
+ecm_generate_headers(MailCommon_mdn_HEADERS
+ HEADER_NAMES
+ SendMdnHandler
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE mdn
+)
+
+
+ecm_generate_headers(MailCommon_collectionpage_HEADERS
+ HEADER_NAMES
+ IncidencesForWidget
+ CollectionTypeUtil
+ CollectionGeneralPage
+ CollectionExpiryPage
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE collectionpage
+)
+
+ecm_generate_headers(MailCommon_collectionpageattributes_HEADERS
+ HEADER_NAMES
+ CollectionAnnotationsAttribute
+ ExpireCollectionAttribute
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE collectionpage/attributes
+)
+
+ecm_generate_headers(MailCommon_filterimporter_HEADERS
+ HEADER_NAMES
+ FilterImporterBalsa
+ FilterImporterClawsMail
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE filter/filterimporter/
+)
+
+ecm_generate_headers(MailCommon_snippets_HEADERS
+ HEADER_NAMES
+ SnippetsManager
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE snippets
+)
+
+ecm_generate_headers(MailCommon_kernel_HEADERS
+ HEADER_NAMES
+ SearchPattern
+ SearchPatternEdit
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE search
+)
+
+ecm_generate_headers(MailCommon_widgets_HEADERS
+ HEADER_NAMES
+ RedirectDialog
+ FavoriteCollectionWidget
+ REQUIRED_HEADERS MailCommon_HEADERS
+ PREFIX MailCommon
+ RELATIVE widgets
+)
+
+
+if(${CMAKE_SOURCE_DIR} STREQUAL ${mailcommon_SOURCE_DIR})
+install(FILES
+ ${MailCommon_CamelCase_HEADERS}
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailCommon
+ COMPONENT Devel
+)
+
+install(FILES
+ ${MailCommon_HEADERS}
+ ${CMAKE_CURRENT_BINARY_DIR}/mailcommon_export.h
+ ${MailCommon_CamelCase_HEADERS}
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/mailcommon
+ COMPONENT Devel
+)
+endif()
+
+
+
+if (Qt5Designer_FOUND)
+ kf5designerplugin_add_plugin(mailcommonwidgets ${CMAKE_CURRENT_SOURCE_DIR}/designer/mailcommon.widgets)
+
+ target_link_libraries(mailcommonwidgets
+ KF5::MailCommon
+ KF5::Libkdepim
+ )
+ if(NOT WIN32)
+ # Since there are no libraries provided by this module,
+ # there is no point including the build tree in RPath,
+ # and then having to edit it at install time.
+ set_target_properties(mailcommonwidgets PROPERTIES
+ SKIP_BUILD_RPATH TRUE
+ BUILD_WITH_INSTALL_RPATH TRUE
+ )
+ endif()
+
+ install(TARGETS
+ mailcommonwidgets
+ DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer
+ )
+endif()
+
diff --git a/mailcommon/Mainpage.dox b/mailcommon/src/Mainpage.dox
index 0d1c4f6..0d1c4f6 100644
--- a/mailcommon/Mainpage.dox
+++ b/mailcommon/src/Mainpage.dox
diff --git a/mailcommon/Messages.sh b/mailcommon/src/Messages.sh
index 489b242..489b242 100644
--- a/mailcommon/Messages.sh
+++ b/mailcommon/src/Messages.sh
diff --git a/mailcommon/collectionpage/attributeregistrar.cpp b/mailcommon/src/collectionpage/attributeregistrar.cpp
index 57690f3..57690f3 100644
--- a/mailcommon/collectionpage/attributeregistrar.cpp
+++ b/mailcommon/src/collectionpage/attributeregistrar.cpp
diff --git a/mailcommon/collectionpage/attributes/collectionannotationsattribute.cpp b/mailcommon/src/collectionpage/attributes/collectionannotationsattribute.cpp
index d25dcf6..d25dcf6 100644
--- a/mailcommon/collectionpage/attributes/collectionannotationsattribute.cpp
+++ b/mailcommon/src/collectionpage/attributes/collectionannotationsattribute.cpp
diff --git a/mailcommon/collectionpage/attributes/collectionannotationsattribute.h b/mailcommon/src/collectionpage/attributes/collectionannotationsattribute.h
index 2aaf46f..2aaf46f 100644
--- a/mailcommon/collectionpage/attributes/collectionannotationsattribute.h
+++ b/mailcommon/src/collectionpage/attributes/collectionannotationsattribute.h
diff --git a/mailcommon/collectionpage/attributes/expirecollectionattribute.cpp b/mailcommon/src/collectionpage/attributes/expirecollectionattribute.cpp
index 0c97be2..0c97be2 100644
--- a/mailcommon/collectionpage/attributes/expirecollectionattribute.cpp
+++ b/mailcommon/src/collectionpage/attributes/expirecollectionattribute.cpp
diff --git a/mailcommon/collectionpage/attributes/expirecollectionattribute.h b/mailcommon/src/collectionpage/attributes/expirecollectionattribute.h
index 2adcc69..2adcc69 100644
--- a/mailcommon/collectionpage/attributes/expirecollectionattribute.h
+++ b/mailcommon/src/collectionpage/attributes/expirecollectionattribute.h
diff --git a/mailcommon/collectionpage/autotests/CMakeLists.txt b/mailcommon/src/collectionpage/autotests/CMakeLists.txt
index 622d4b8..795a517 100644
--- a/mailcommon/collectionpage/autotests/CMakeLists.txt
+++ b/mailcommon/src/collectionpage/autotests/CMakeLists.txt
@@ -2,7 +2,7 @@ macro(add_mailcommon_collectionpage_test _name)
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-collectionpage-"
- LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore mailcommon KF5::Completion
+ LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon KF5::Completion
)
endmacro()
diff --git a/mailcommon/collectionpage/autotests/collectionannotationsattributetest.cpp b/mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.cpp
index d2e9b4c..d2e9b4c 100644
--- a/mailcommon/collectionpage/autotests/collectionannotationsattributetest.cpp
+++ b/mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.cpp
diff --git a/mailcommon/collectionpage/autotests/collectionannotationsattributetest.h b/mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.h
index 2a4013a..2a4013a 100644
--- a/mailcommon/collectionpage/autotests/collectionannotationsattributetest.h
+++ b/mailcommon/src/collectionpage/autotests/collectionannotationsattributetest.h
diff --git a/mailcommon/collectionpage/autotests/contenttypewidgettest.cpp b/mailcommon/src/collectionpage/autotests/contenttypewidgettest.cpp
index b3dcc37..b3dcc37 100644
--- a/mailcommon/collectionpage/autotests/contenttypewidgettest.cpp
+++ b/mailcommon/src/collectionpage/autotests/contenttypewidgettest.cpp
diff --git a/mailcommon/collectionpage/autotests/contenttypewidgettest.h b/mailcommon/src/collectionpage/autotests/contenttypewidgettest.h
index 00e88e2..00e88e2 100644
--- a/mailcommon/collectionpage/autotests/contenttypewidgettest.h
+++ b/mailcommon/src/collectionpage/autotests/contenttypewidgettest.h
diff --git a/mailcommon/collectionpage/autotests/expirecollectionattributetest.cpp b/mailcommon/src/collectionpage/autotests/expirecollectionattributetest.cpp
index 6252e3b..6252e3b 100644
--- a/mailcommon/collectionpage/autotests/expirecollectionattributetest.cpp
+++ b/mailcommon/src/collectionpage/autotests/expirecollectionattributetest.cpp
diff --git a/mailcommon/collectionpage/autotests/expirecollectionattributetest.h b/mailcommon/src/collectionpage/autotests/expirecollectionattributetest.h
index fee23c6..fee23c6 100644
--- a/mailcommon/collectionpage/autotests/expirecollectionattributetest.h
+++ b/mailcommon/src/collectionpage/autotests/expirecollectionattributetest.h
diff --git a/mailcommon/collectionpage/autotests/incidencesforwidgettest.cpp b/mailcommon/src/collectionpage/autotests/incidencesforwidgettest.cpp
index 2c5a06e..2c5a06e 100644
--- a/mailcommon/collectionpage/autotests/incidencesforwidgettest.cpp
+++ b/mailcommon/src/collectionpage/autotests/incidencesforwidgettest.cpp
diff --git a/mailcommon/collectionpage/autotests/incidencesforwidgettest.h b/mailcommon/src/collectionpage/autotests/incidencesforwidgettest.h
index c05f41f..c05f41f 100644
--- a/mailcommon/collectionpage/autotests/incidencesforwidgettest.h
+++ b/mailcommon/src/collectionpage/autotests/incidencesforwidgettest.h
diff --git a/mailcommon/collectionpage/collectionexpirypage.cpp b/mailcommon/src/collectionpage/collectionexpirypage.cpp
index 34257fd..34257fd 100644
--- a/mailcommon/collectionpage/collectionexpirypage.cpp
+++ b/mailcommon/src/collectionpage/collectionexpirypage.cpp
diff --git a/mailcommon/collectionpage/collectionexpirypage.h b/mailcommon/src/collectionpage/collectionexpirypage.h
index e302b27..e302b27 100644
--- a/mailcommon/collectionpage/collectionexpirypage.h
+++ b/mailcommon/src/collectionpage/collectionexpirypage.h
diff --git a/mailcommon/collectionpage/collectiongeneralpage.cpp b/mailcommon/src/collectionpage/collectiongeneralpage.cpp
index 915990c..915990c 100644
--- a/mailcommon/collectionpage/collectiongeneralpage.cpp
+++ b/mailcommon/src/collectionpage/collectiongeneralpage.cpp
diff --git a/mailcommon/collectionpage/collectiongeneralpage.h b/mailcommon/src/collectionpage/collectiongeneralpage.h
index 8c78ad9..8c78ad9 100644
--- a/mailcommon/collectionpage/collectiongeneralpage.h
+++ b/mailcommon/src/collectionpage/collectiongeneralpage.h
diff --git a/mailcommon/collectionpage/collectiontypeutil.cpp b/mailcommon/src/collectionpage/collectiontypeutil.cpp
index ad276e0..ad276e0 100644
--- a/mailcommon/collectionpage/collectiontypeutil.cpp
+++ b/mailcommon/src/collectionpage/collectiontypeutil.cpp
diff --git a/mailcommon/collectionpage/collectiontypeutil.h b/mailcommon/src/collectionpage/collectiontypeutil.h
index e87c570..e87c570 100644
--- a/mailcommon/collectionpage/collectiontypeutil.h
+++ b/mailcommon/src/collectionpage/collectiontypeutil.h
diff --git a/mailcommon/collectionpage/contenttypewidget.cpp b/mailcommon/src/collectionpage/contenttypewidget.cpp
index 65ee5fa..65ee5fa 100644
--- a/mailcommon/collectionpage/contenttypewidget.cpp
+++ b/mailcommon/src/collectionpage/contenttypewidget.cpp
diff --git a/mailcommon/collectionpage/contenttypewidget.h b/mailcommon/src/collectionpage/contenttypewidget.h
index 5714c64..5714c64 100644
--- a/mailcommon/collectionpage/contenttypewidget.h
+++ b/mailcommon/src/collectionpage/contenttypewidget.h
diff --git a/mailcommon/collectionpage/incidencesforwidget.cpp b/mailcommon/src/collectionpage/incidencesforwidget.cpp
index 9a9a2f5..9a9a2f5 100644
--- a/mailcommon/collectionpage/incidencesforwidget.cpp
+++ b/mailcommon/src/collectionpage/incidencesforwidget.cpp
diff --git a/mailcommon/collectionpage/incidencesforwidget.h b/mailcommon/src/collectionpage/incidencesforwidget.h
index 4d70f90..4d70f90 100644
--- a/mailcommon/collectionpage/incidencesforwidget.h
+++ b/mailcommon/src/collectionpage/incidencesforwidget.h
diff --git a/mailcommon/dbusoperators.h b/mailcommon/src/dbusoperators.h
index ecef56f..ecef56f 100644
--- a/mailcommon/dbusoperators.h
+++ b/mailcommon/src/dbusoperators.h
diff --git a/mailcommon/designer/mailcommon.widgets b/mailcommon/src/designer/mailcommon.widgets
index 8fe2a88..8fe2a88 100644
--- a/mailcommon/designer/mailcommon.widgets
+++ b/mailcommon/src/designer/mailcommon.widgets
diff --git a/mailcommon/filter/TODO b/mailcommon/src/filter/TODO
index 7f8a47d..7f8a47d 100644
--- a/mailcommon/filter/TODO
+++ b/mailcommon/src/filter/TODO
diff --git a/mailcommon/filter/autotests/CMakeLists.txt b/mailcommon/src/filter/autotests/CMakeLists.txt
index 808e1e4..0f7fb83 100644
--- a/mailcommon/filter/autotests/CMakeLists.txt
+++ b/mailcommon/src/filter/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@ macro(add_mailcommon_filter_test _name)
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-filter-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::AkonadiMime
- KF5::Libkdepim mailcommon pimcommon Phonon::phonon4qt5 KF5::KIOWidgets KF5::IconThemes KF5::TemplateParser KF5::MailTransport
+ KF5::Libkdepim KF5::MailCommon pimcommon Phonon::phonon4qt5 KF5::KIOWidgets KF5::IconThemes KF5::TemplateParser KF5::MailTransport
)
endmacro()
diff --git a/mailcommon/filter/autotests/filteractionaddheadertest.cpp b/mailcommon/src/filter/autotests/filteractionaddheadertest.cpp
index e27286a..e27286a 100644
--- a/mailcommon/filter/autotests/filteractionaddheadertest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionaddheadertest.cpp
diff --git a/mailcommon/filter/autotests/filteractionaddheadertest.h b/mailcommon/src/filter/autotests/filteractionaddheadertest.h
index 8a72674..8a72674 100644
--- a/mailcommon/filter/autotests/filteractionaddheadertest.h
+++ b/mailcommon/src/filter/autotests/filteractionaddheadertest.h
diff --git a/mailcommon/filter/autotests/filteractionaddtoaddressbooktest.cpp b/mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
index 3f0bbd6..3f0bbd6 100644
--- a/mailcommon/filter/autotests/filteractionaddtoaddressbooktest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
diff --git a/mailcommon/filter/autotests/filteractionaddtoaddressbooktest.h b/mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.h
index 19feb47..19feb47 100644
--- a/mailcommon/filter/autotests/filteractionaddtoaddressbooktest.h
+++ b/mailcommon/src/filter/autotests/filteractionaddtoaddressbooktest.h
diff --git a/mailcommon/filter/autotests/filteractioncopytest.cpp b/mailcommon/src/filter/autotests/filteractioncopytest.cpp
index 7488d72..7488d72 100644
--- a/mailcommon/filter/autotests/filteractioncopytest.cpp
+++ b/mailcommon/src/filter/autotests/filteractioncopytest.cpp
diff --git a/mailcommon/filter/autotests/filteractioncopytest.h b/mailcommon/src/filter/autotests/filteractioncopytest.h
index 0d10e72..0d10e72 100644
--- a/mailcommon/filter/autotests/filteractioncopytest.h
+++ b/mailcommon/src/filter/autotests/filteractioncopytest.h
diff --git a/mailcommon/filter/autotests/filteractiondeletetest.cpp b/mailcommon/src/filter/autotests/filteractiondeletetest.cpp
index 44df428..44df428 100644
--- a/mailcommon/filter/autotests/filteractiondeletetest.cpp
+++ b/mailcommon/src/filter/autotests/filteractiondeletetest.cpp
diff --git a/mailcommon/filter/autotests/filteractiondeletetest.h b/mailcommon/src/filter/autotests/filteractiondeletetest.h
index f604700..f604700 100644
--- a/mailcommon/filter/autotests/filteractiondeletetest.h
+++ b/mailcommon/src/filter/autotests/filteractiondeletetest.h
diff --git a/mailcommon/filter/autotests/filteractionexectest.cpp b/mailcommon/src/filter/autotests/filteractionexectest.cpp
index 9f7b34d..9f7b34d 100644
--- a/mailcommon/filter/autotests/filteractionexectest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionexectest.cpp
diff --git a/mailcommon/filter/autotests/filteractionexectest.h b/mailcommon/src/filter/autotests/filteractionexectest.h
index 47a92b4..47a92b4 100644
--- a/mailcommon/filter/autotests/filteractionexectest.h
+++ b/mailcommon/src/filter/autotests/filteractionexectest.h
diff --git a/mailcommon/filter/autotests/filteractionforwardtest.cpp b/mailcommon/src/filter/autotests/filteractionforwardtest.cpp
index 3a37db9..3a37db9 100644
--- a/mailcommon/filter/autotests/filteractionforwardtest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionforwardtest.cpp
diff --git a/mailcommon/filter/autotests/filteractionforwardtest.h b/mailcommon/src/filter/autotests/filteractionforwardtest.h
index 00e7465..00e7465 100644
--- a/mailcommon/filter/autotests/filteractionforwardtest.h
+++ b/mailcommon/src/filter/autotests/filteractionforwardtest.h
diff --git a/mailcommon/filter/autotests/filteractionmovetest.cpp b/mailcommon/src/filter/autotests/filteractionmovetest.cpp
index 890fef2..890fef2 100644
--- a/mailcommon/filter/autotests/filteractionmovetest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionmovetest.cpp
diff --git a/mailcommon/filter/autotests/filteractionmovetest.h b/mailcommon/src/filter/autotests/filteractionmovetest.h
index bc624a6..bc624a6 100644
--- a/mailcommon/filter/autotests/filteractionmovetest.h
+++ b/mailcommon/src/filter/autotests/filteractionmovetest.h
diff --git a/mailcommon/filter/autotests/filteractionpipethroughtest.cpp b/mailcommon/src/filter/autotests/filteractionpipethroughtest.cpp
index ff898c9..ff898c9 100644
--- a/mailcommon/filter/autotests/filteractionpipethroughtest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionpipethroughtest.cpp
diff --git a/mailcommon/filter/autotests/filteractionpipethroughtest.h b/mailcommon/src/filter/autotests/filteractionpipethroughtest.h
index 5a92860..5a92860 100644
--- a/mailcommon/filter/autotests/filteractionpipethroughtest.h
+++ b/mailcommon/src/filter/autotests/filteractionpipethroughtest.h
diff --git a/mailcommon/filter/autotests/filteractionplaysoundtest.cpp b/mailcommon/src/filter/autotests/filteractionplaysoundtest.cpp
index ecb9791..ecb9791 100644
--- a/mailcommon/filter/autotests/filteractionplaysoundtest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionplaysoundtest.cpp
diff --git a/mailcommon/filter/autotests/filteractionplaysoundtest.h b/mailcommon/src/filter/autotests/filteractionplaysoundtest.h
index 5869675..5869675 100644
--- a/mailcommon/filter/autotests/filteractionplaysoundtest.h
+++ b/mailcommon/src/filter/autotests/filteractionplaysoundtest.h
diff --git a/mailcommon/filter/autotests/filteractionredirecttest.cpp b/mailcommon/src/filter/autotests/filteractionredirecttest.cpp
index ebde03b..ebde03b 100644
--- a/mailcommon/filter/autotests/filteractionredirecttest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionredirecttest.cpp
diff --git a/mailcommon/filter/autotests/filteractionredirecttest.h b/mailcommon/src/filter/autotests/filteractionredirecttest.h
index 9a703b5..9a703b5 100644
--- a/mailcommon/filter/autotests/filteractionredirecttest.h
+++ b/mailcommon/src/filter/autotests/filteractionredirecttest.h
diff --git a/mailcommon/filter/autotests/filteractionremoveheadertest.cpp b/mailcommon/src/filter/autotests/filteractionremoveheadertest.cpp
index c4c2f44..c4c2f44 100644
--- a/mailcommon/filter/autotests/filteractionremoveheadertest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionremoveheadertest.cpp
diff --git a/mailcommon/filter/autotests/filteractionremoveheadertest.h b/mailcommon/src/filter/autotests/filteractionremoveheadertest.h
index a760769..a760769 100644
--- a/mailcommon/filter/autotests/filteractionremoveheadertest.h
+++ b/mailcommon/src/filter/autotests/filteractionremoveheadertest.h
diff --git a/mailcommon/filter/autotests/filteractionreplytotest.cpp b/mailcommon/src/filter/autotests/filteractionreplytotest.cpp
index 8e54f5f..8e54f5f 100644
--- a/mailcommon/filter/autotests/filteractionreplytotest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionreplytotest.cpp
diff --git a/mailcommon/filter/autotests/filteractionreplytotest.h b/mailcommon/src/filter/autotests/filteractionreplytotest.h
index 2449010..2449010 100644
--- a/mailcommon/filter/autotests/filteractionreplytotest.h
+++ b/mailcommon/src/filter/autotests/filteractionreplytotest.h
diff --git a/mailcommon/filter/autotests/filteractionrewriteheadertest.cpp b/mailcommon/src/filter/autotests/filteractionrewriteheadertest.cpp
index 8bb7bbe..8bb7bbe 100644
--- a/mailcommon/filter/autotests/filteractionrewriteheadertest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionrewriteheadertest.cpp
diff --git a/mailcommon/filter/autotests/filteractionrewriteheadertest.h b/mailcommon/src/filter/autotests/filteractionrewriteheadertest.h
index 423c3c0..423c3c0 100644
--- a/mailcommon/filter/autotests/filteractionrewriteheadertest.h
+++ b/mailcommon/src/filter/autotests/filteractionrewriteheadertest.h
diff --git a/mailcommon/filter/autotests/filteractionsendfakedispositiontest.cpp b/mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.cpp
index 82be5fb..82be5fb 100644
--- a/mailcommon/filter/autotests/filteractionsendfakedispositiontest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.cpp
diff --git a/mailcommon/filter/autotests/filteractionsendfakedispositiontest.h b/mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.h
index ef4d023..ef4d023 100644
--- a/mailcommon/filter/autotests/filteractionsendfakedispositiontest.h
+++ b/mailcommon/src/filter/autotests/filteractionsendfakedispositiontest.h
diff --git a/mailcommon/filter/autotests/filteractionsendreceipttest.cpp b/mailcommon/src/filter/autotests/filteractionsendreceipttest.cpp
index f9922b2..f9922b2 100644
--- a/mailcommon/filter/autotests/filteractionsendreceipttest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionsendreceipttest.cpp
diff --git a/mailcommon/filter/autotests/filteractionsendreceipttest.h b/mailcommon/src/filter/autotests/filteractionsendreceipttest.h
index 0548a1f..0548a1f 100644
--- a/mailcommon/filter/autotests/filteractionsendreceipttest.h
+++ b/mailcommon/src/filter/autotests/filteractionsendreceipttest.h
diff --git a/mailcommon/filter/autotests/filteractionsetstatustest.cpp b/mailcommon/src/filter/autotests/filteractionsetstatustest.cpp
index b65506e..b65506e 100644
--- a/mailcommon/filter/autotests/filteractionsetstatustest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionsetstatustest.cpp
diff --git a/mailcommon/filter/autotests/filteractionsetstatustest.h b/mailcommon/src/filter/autotests/filteractionsetstatustest.h
index fb6da12..fb6da12 100644
--- a/mailcommon/filter/autotests/filteractionsetstatustest.h
+++ b/mailcommon/src/filter/autotests/filteractionsetstatustest.h
diff --git a/mailcommon/filter/autotests/filteractionsettransporttest.cpp b/mailcommon/src/filter/autotests/filteractionsettransporttest.cpp
index 78c7737..78c7737 100644
--- a/mailcommon/filter/autotests/filteractionsettransporttest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionsettransporttest.cpp
diff --git a/mailcommon/filter/autotests/filteractionsettransporttest.h b/mailcommon/src/filter/autotests/filteractionsettransporttest.h
index cf6b3e3..cf6b3e3 100644
--- a/mailcommon/filter/autotests/filteractionsettransporttest.h
+++ b/mailcommon/src/filter/autotests/filteractionsettransporttest.h
diff --git a/mailcommon/filter/autotests/filteractionunsetstatustest.cpp b/mailcommon/src/filter/autotests/filteractionunsetstatustest.cpp
index 6f60438..6f60438 100644
--- a/mailcommon/filter/autotests/filteractionunsetstatustest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionunsetstatustest.cpp
diff --git a/mailcommon/filter/autotests/filteractionunsetstatustest.h b/mailcommon/src/filter/autotests/filteractionunsetstatustest.h
index 75f382c..75f382c 100644
--- a/mailcommon/filter/autotests/filteractionunsetstatustest.h
+++ b/mailcommon/src/filter/autotests/filteractionunsetstatustest.h
diff --git a/mailcommon/filter/autotests/filteractionwithaddresstest.cpp b/mailcommon/src/filter/autotests/filteractionwithaddresstest.cpp
index 76f698e..76f698e 100644
--- a/mailcommon/filter/autotests/filteractionwithaddresstest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionwithaddresstest.cpp
diff --git a/mailcommon/filter/autotests/filteractionwithaddresstest.h b/mailcommon/src/filter/autotests/filteractionwithaddresstest.h
index 1967a39..1967a39 100644
--- a/mailcommon/filter/autotests/filteractionwithaddresstest.h
+++ b/mailcommon/src/filter/autotests/filteractionwithaddresstest.h
diff --git a/mailcommon/filter/autotests/filteractionwithurltest.cpp b/mailcommon/src/filter/autotests/filteractionwithurltest.cpp
index 147a463..147a463 100644
--- a/mailcommon/filter/autotests/filteractionwithurltest.cpp
+++ b/mailcommon/src/filter/autotests/filteractionwithurltest.cpp
diff --git a/mailcommon/filter/autotests/filteractionwithurltest.h b/mailcommon/src/filter/autotests/filteractionwithurltest.h
index 0b78e07..0b78e07 100644
--- a/mailcommon/filter/autotests/filteractionwithurltest.h
+++ b/mailcommon/src/filter/autotests/filteractionwithurltest.h
diff --git a/mailcommon/filter/autotests/filterconverttosieveresultdialogtest.cpp b/mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.cpp
index ee5ca18..ee5ca18 100644
--- a/mailcommon/filter/autotests/filterconverttosieveresultdialogtest.cpp
+++ b/mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.cpp
diff --git a/mailcommon/filter/autotests/filterconverttosieveresultdialogtest.h b/mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.h
index 0ecc963..0ecc963 100644
--- a/mailcommon/filter/autotests/filterconverttosieveresultdialogtest.h
+++ b/mailcommon/src/filter/autotests/filterconverttosieveresultdialogtest.h
diff --git a/mailcommon/filter/autotests/invalidfilterdialogtest.cpp b/mailcommon/src/filter/autotests/invalidfilterdialogtest.cpp
index 5e087e9..5e087e9 100644
--- a/mailcommon/filter/autotests/invalidfilterdialogtest.cpp
+++ b/mailcommon/src/filter/autotests/invalidfilterdialogtest.cpp
diff --git a/mailcommon/filter/autotests/invalidfilterdialogtest.h b/mailcommon/src/filter/autotests/invalidfilterdialogtest.h
index 6f979f9..6f979f9 100644
--- a/mailcommon/filter/autotests/invalidfilterdialogtest.h
+++ b/mailcommon/src/filter/autotests/invalidfilterdialogtest.h
diff --git a/mailcommon/filter/autotests/invalidfilterinfotest.cpp b/mailcommon/src/filter/autotests/invalidfilterinfotest.cpp
index 3d9469c..3d9469c 100644
--- a/mailcommon/filter/autotests/invalidfilterinfotest.cpp
+++ b/mailcommon/src/filter/autotests/invalidfilterinfotest.cpp
diff --git a/mailcommon/filter/autotests/invalidfilterinfotest.h b/mailcommon/src/filter/autotests/invalidfilterinfotest.h
index 679d4b6..679d4b6 100644
--- a/mailcommon/filter/autotests/invalidfilterinfotest.h
+++ b/mailcommon/src/filter/autotests/invalidfilterinfotest.h
diff --git a/mailcommon/filter/autotests/invalidfilterinfowidgettest.cpp b/mailcommon/src/filter/autotests/invalidfilterinfowidgettest.cpp
index 029ca00..029ca00 100644
--- a/mailcommon/filter/autotests/invalidfilterinfowidgettest.cpp
+++ b/mailcommon/src/filter/autotests/invalidfilterinfowidgettest.cpp
diff --git a/mailcommon/filter/autotests/invalidfilterinfowidgettest.h b/mailcommon/src/filter/autotests/invalidfilterinfowidgettest.h
index 4803bcb..4803bcb 100644
--- a/mailcommon/filter/autotests/invalidfilterinfowidgettest.h
+++ b/mailcommon/src/filter/autotests/invalidfilterinfowidgettest.h
diff --git a/mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp b/mailcommon/src/filter/autotests/invalidfilterlistwidgettest.cpp
index a70e1e0..a70e1e0 100644
--- a/mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp
+++ b/mailcommon/src/filter/autotests/invalidfilterlistwidgettest.cpp
diff --git a/mailcommon/filter/autotests/invalidfilterlistwidgettest.h b/mailcommon/src/filter/autotests/invalidfilterlistwidgettest.h
index 7d10e1e..7d10e1e 100644
--- a/mailcommon/filter/autotests/invalidfilterlistwidgettest.h
+++ b/mailcommon/src/filter/autotests/invalidfilterlistwidgettest.h
diff --git a/mailcommon/filter/autotests/invalidfilterwidgettest.cpp b/mailcommon/src/filter/autotests/invalidfilterwidgettest.cpp
index eecd14d..eecd14d 100644
--- a/mailcommon/filter/autotests/invalidfilterwidgettest.cpp
+++ b/mailcommon/src/filter/autotests/invalidfilterwidgettest.cpp
diff --git a/mailcommon/filter/autotests/invalidfilterwidgettest.h b/mailcommon/src/filter/autotests/invalidfilterwidgettest.h
index 04118fa..04118fa 100644
--- a/mailcommon/filter/autotests/invalidfilterwidgettest.h
+++ b/mailcommon/src/filter/autotests/invalidfilterwidgettest.h
diff --git a/mailcommon/filter/autotests/itemcontexttest.cpp b/mailcommon/src/filter/autotests/itemcontexttest.cpp
index f43ba8c..f43ba8c 100644
--- a/mailcommon/filter/autotests/itemcontexttest.cpp
+++ b/mailcommon/src/filter/autotests/itemcontexttest.cpp
diff --git a/mailcommon/filter/autotests/itemcontexttest.h b/mailcommon/src/filter/autotests/itemcontexttest.h
index 3c9ac5c..3c9ac5c 100644
--- a/mailcommon/filter/autotests/itemcontexttest.h
+++ b/mailcommon/src/filter/autotests/itemcontexttest.h
diff --git a/mailcommon/filter/autotests/mailfiltertest.cpp b/mailcommon/src/filter/autotests/mailfiltertest.cpp
index 24e22ef..24e22ef 100644
--- a/mailcommon/filter/autotests/mailfiltertest.cpp
+++ b/mailcommon/src/filter/autotests/mailfiltertest.cpp
diff --git a/mailcommon/filter/autotests/mailfiltertest.h b/mailcommon/src/filter/autotests/mailfiltertest.h
index 629d519..629d519 100644
--- a/mailcommon/filter/autotests/mailfiltertest.h
+++ b/mailcommon/src/filter/autotests/mailfiltertest.h
diff --git a/mailcommon/filter/dialog/filteractionmissingargumentdialog.cpp b/mailcommon/src/filter/dialog/filteractionmissingargumentdialog.cpp
index 9a93e91..9a93e91 100644
--- a/mailcommon/filter/dialog/filteractionmissingargumentdialog.cpp
+++ b/mailcommon/src/filter/dialog/filteractionmissingargumentdialog.cpp
diff --git a/mailcommon/filter/dialog/filteractionmissingargumentdialog.h b/mailcommon/src/filter/dialog/filteractionmissingargumentdialog.h
index f8b5346..f8b5346 100644
--- a/mailcommon/filter/dialog/filteractionmissingargumentdialog.h
+++ b/mailcommon/src/filter/dialog/filteractionmissingargumentdialog.h
diff --git a/mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.cpp b/mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
index d7f0ac8..d7f0ac8 100644
--- a/mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
+++ b/mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
diff --git a/mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.h b/mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.h
index ae3aa27..ae3aa27 100644
--- a/mailcommon/filter/dialog/selectthunderbirdfilterfilesdialog.h
+++ b/mailcommon/src/filter/dialog/selectthunderbirdfilterfilesdialog.h
diff --git a/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.cpp b/mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp
index a1e6ceb..a1e6ceb 100644
--- a/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.cpp
+++ b/mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp
diff --git a/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h b/mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.h
index e3f0762..e3f0762 100644
--- a/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h
+++ b/mailcommon/src/filter/dialog/selectthunderbirdfilterfileswidget.h
diff --git a/mailcommon/filter/filteractions/filteraction.cpp b/mailcommon/src/filter/filteractions/filteraction.cpp
index e0407b0..e0407b0 100644
--- a/mailcommon/filter/filteractions/filteraction.cpp
+++ b/mailcommon/src/filter/filteractions/filteraction.cpp
diff --git a/mailcommon/filter/filteractions/filteraction.h b/mailcommon/src/filter/filteractions/filteraction.h
index 86598b4..86598b4 100644
--- a/mailcommon/filter/filteractions/filteraction.h
+++ b/mailcommon/src/filter/filteractions/filteraction.h
diff --git a/mailcommon/filter/filteractions/filteractionaddheader.cpp b/mailcommon/src/filter/filteractions/filteractionaddheader.cpp
index 23aff9c..23aff9c 100644
--- a/mailcommon/filter/filteractions/filteractionaddheader.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionaddheader.cpp
diff --git a/mailcommon/filter/filteractions/filteractionaddheader.h b/mailcommon/src/filter/filteractions/filteractionaddheader.h
index a6cf07e..a6cf07e 100644
--- a/mailcommon/filter/filteractions/filteractionaddheader.h
+++ b/mailcommon/src/filter/filteractions/filteractionaddheader.h
diff --git a/mailcommon/filter/filteractions/filteractionaddtag.cpp b/mailcommon/src/filter/filteractions/filteractionaddtag.cpp
index 648aadb..648aadb 100644
--- a/mailcommon/filter/filteractions/filteractionaddtag.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionaddtag.cpp
diff --git a/mailcommon/filter/filteractions/filteractionaddtag.h b/mailcommon/src/filter/filteractions/filteractionaddtag.h
index aec746d..aec746d 100644
--- a/mailcommon/filter/filteractions/filteractionaddtag.h
+++ b/mailcommon/src/filter/filteractions/filteractionaddtag.h
diff --git a/mailcommon/filter/filteractions/filteractionaddtoaddressbook.cpp b/mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.cpp
index c5ee689..c5ee689 100644
--- a/mailcommon/filter/filteractions/filteractionaddtoaddressbook.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.cpp
diff --git a/mailcommon/filter/filteractions/filteractionaddtoaddressbook.h b/mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.h
index 4499f69..4499f69 100644
--- a/mailcommon/filter/filteractions/filteractionaddtoaddressbook.h
+++ b/mailcommon/src/filter/filteractions/filteractionaddtoaddressbook.h
diff --git a/mailcommon/filter/filteractions/filteractioncopy.cpp b/mailcommon/src/filter/filteractions/filteractioncopy.cpp
index 049e302..c0ca797 100644
--- a/mailcommon/filter/filteractions/filteractioncopy.cpp
+++ b/mailcommon/src/filter/filteractions/filteractioncopy.cpp
@@ -20,7 +20,7 @@
#include "filteractioncopy.h"
#include "kernel/mailkernel.h"
-#include "mailcommon/util/mailutil.h"
+#include "util/mailutil.h"
#include <ItemCopyJob>
#include <KLocalizedString>
diff --git a/mailcommon/filter/filteractions/filteractioncopy.h b/mailcommon/src/filter/filteractions/filteractioncopy.h
index cbd02f9..cbd02f9 100644
--- a/mailcommon/filter/filteractions/filteractioncopy.h
+++ b/mailcommon/src/filter/filteractions/filteractioncopy.h
diff --git a/mailcommon/filter/filteractions/filteractiondelete.cpp b/mailcommon/src/filter/filteractions/filteractiondelete.cpp
index 79892ad..79892ad 100644
--- a/mailcommon/filter/filteractions/filteractiondelete.cpp
+++ b/mailcommon/src/filter/filteractions/filteractiondelete.cpp
diff --git a/mailcommon/filter/filteractions/filteractiondelete.h b/mailcommon/src/filter/filteractions/filteractiondelete.h
index af569d0..af569d0 100644
--- a/mailcommon/filter/filteractions/filteractiondelete.h
+++ b/mailcommon/src/filter/filteractions/filteractiondelete.h
diff --git a/mailcommon/filter/filteractions/filteractiondict.cpp b/mailcommon/src/filter/filteractions/filteractiondict.cpp
index e73547c..e73547c 100644
--- a/mailcommon/filter/filteractions/filteractiondict.cpp
+++ b/mailcommon/src/filter/filteractions/filteractiondict.cpp
diff --git a/mailcommon/filter/filteractions/filteractiondict.h b/mailcommon/src/filter/filteractions/filteractiondict.h
index 8087a6a..8087a6a 100644
--- a/mailcommon/filter/filteractions/filteractiondict.h
+++ b/mailcommon/src/filter/filteractions/filteractiondict.h
diff --git a/mailcommon/filter/filteractions/filteractionexec.cpp b/mailcommon/src/filter/filteractions/filteractionexec.cpp
index dfe1be5..dfe1be5 100644
--- a/mailcommon/filter/filteractions/filteractionexec.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionexec.cpp
diff --git a/mailcommon/filter/filteractions/filteractionexec.h b/mailcommon/src/filter/filteractions/filteractionexec.h
index 9ab58d1..9ab58d1 100644
--- a/mailcommon/filter/filteractions/filteractionexec.h
+++ b/mailcommon/src/filter/filteractions/filteractionexec.h
diff --git a/mailcommon/filter/filteractions/filteractionforward.cpp b/mailcommon/src/filter/filteractions/filteractionforward.cpp
index 77cd091..77cd091 100644
--- a/mailcommon/filter/filteractions/filteractionforward.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionforward.cpp
diff --git a/mailcommon/filter/filteractions/filteractionforward.h b/mailcommon/src/filter/filteractions/filteractionforward.h
index 37723be..37723be 100644
--- a/mailcommon/filter/filteractions/filteractionforward.h
+++ b/mailcommon/src/filter/filteractions/filteractionforward.h
diff --git a/mailcommon/filter/filteractions/filteractionmove.cpp b/mailcommon/src/filter/filteractions/filteractionmove.cpp
index 5d5a343..d84d778 100644
--- a/mailcommon/filter/filteractions/filteractionmove.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionmove.cpp
@@ -18,7 +18,7 @@
*/
#include "filteractionmove.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "kernel/mailkernel.h"
diff --git a/mailcommon/filter/filteractions/filteractionmove.h b/mailcommon/src/filter/filteractions/filteractionmove.h
index 0610702..0610702 100644
--- a/mailcommon/filter/filteractions/filteractionmove.h
+++ b/mailcommon/src/filter/filteractions/filteractionmove.h
diff --git a/mailcommon/filter/filteractions/filteractionpipethrough.cpp b/mailcommon/src/filter/filteractions/filteractionpipethrough.cpp
index 258c8cd..258c8cd 100644
--- a/mailcommon/filter/filteractions/filteractionpipethrough.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionpipethrough.cpp
diff --git a/mailcommon/filter/filteractions/filteractionpipethrough.h b/mailcommon/src/filter/filteractions/filteractionpipethrough.h
index 8eac35d..8eac35d 100644
--- a/mailcommon/filter/filteractions/filteractionpipethrough.h
+++ b/mailcommon/src/filter/filteractions/filteractionpipethrough.h
diff --git a/mailcommon/filter/filteractions/filteractionplaysound.cpp b/mailcommon/src/filter/filteractions/filteractionplaysound.cpp
index 67ab467..67ab467 100644
--- a/mailcommon/filter/filteractions/filteractionplaysound.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionplaysound.cpp
diff --git a/mailcommon/filter/filteractions/filteractionplaysound.h b/mailcommon/src/filter/filteractions/filteractionplaysound.h
index 102aab3..102aab3 100644
--- a/mailcommon/filter/filteractions/filteractionplaysound.h
+++ b/mailcommon/src/filter/filteractions/filteractionplaysound.h
diff --git a/mailcommon/filter/filteractions/filteractionredirect.cpp b/mailcommon/src/filter/filteractions/filteractionredirect.cpp
index ee3c49e..ee3c49e 100644
--- a/mailcommon/filter/filteractions/filteractionredirect.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionredirect.cpp
diff --git a/mailcommon/filter/filteractions/filteractionredirect.h b/mailcommon/src/filter/filteractions/filteractionredirect.h
index f77f0f6..f77f0f6 100644
--- a/mailcommon/filter/filteractions/filteractionredirect.h
+++ b/mailcommon/src/filter/filteractions/filteractionredirect.h
diff --git a/mailcommon/filter/filteractions/filteractionremoveheader.cpp b/mailcommon/src/filter/filteractions/filteractionremoveheader.cpp
index cf0af45..cf0af45 100644
--- a/mailcommon/filter/filteractions/filteractionremoveheader.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionremoveheader.cpp
diff --git a/mailcommon/filter/filteractions/filteractionremoveheader.h b/mailcommon/src/filter/filteractions/filteractionremoveheader.h
index 14ff613..14ff613 100644
--- a/mailcommon/filter/filteractions/filteractionremoveheader.h
+++ b/mailcommon/src/filter/filteractions/filteractionremoveheader.h
diff --git a/mailcommon/filter/filteractions/filteractionreplyto.cpp b/mailcommon/src/filter/filteractions/filteractionreplyto.cpp
index 0fe090c..0fe090c 100644
--- a/mailcommon/filter/filteractions/filteractionreplyto.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionreplyto.cpp
diff --git a/mailcommon/filter/filteractions/filteractionreplyto.h b/mailcommon/src/filter/filteractions/filteractionreplyto.h
index eb7e85e..eb7e85e 100644
--- a/mailcommon/filter/filteractions/filteractionreplyto.h
+++ b/mailcommon/src/filter/filteractions/filteractionreplyto.h
diff --git a/mailcommon/filter/filteractions/filteractionrewriteheader.cpp b/mailcommon/src/filter/filteractions/filteractionrewriteheader.cpp
index 31949b8..31949b8 100644
--- a/mailcommon/filter/filteractions/filteractionrewriteheader.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionrewriteheader.cpp
diff --git a/mailcommon/filter/filteractions/filteractionrewriteheader.h b/mailcommon/src/filter/filteractions/filteractionrewriteheader.h
index 534fa89..534fa89 100644
--- a/mailcommon/filter/filteractions/filteractionrewriteheader.h
+++ b/mailcommon/src/filter/filteractions/filteractionrewriteheader.h
diff --git a/mailcommon/filter/filteractions/filteractionsendfakedisposition.cpp b/mailcommon/src/filter/filteractions/filteractionsendfakedisposition.cpp
index 3008beb..3008beb 100644
--- a/mailcommon/filter/filteractions/filteractionsendfakedisposition.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionsendfakedisposition.cpp
diff --git a/mailcommon/filter/filteractions/filteractionsendfakedisposition.h b/mailcommon/src/filter/filteractions/filteractionsendfakedisposition.h
index 845399c..845399c 100644
--- a/mailcommon/filter/filteractions/filteractionsendfakedisposition.h
+++ b/mailcommon/src/filter/filteractions/filteractionsendfakedisposition.h
diff --git a/mailcommon/filter/filteractions/filteractionsendreceipt.cpp b/mailcommon/src/filter/filteractions/filteractionsendreceipt.cpp
index 22a0cf1..22a0cf1 100644
--- a/mailcommon/filter/filteractions/filteractionsendreceipt.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionsendreceipt.cpp
diff --git a/mailcommon/filter/filteractions/filteractionsendreceipt.h b/mailcommon/src/filter/filteractions/filteractionsendreceipt.h
index 32bccaa..32bccaa 100644
--- a/mailcommon/filter/filteractions/filteractionsendreceipt.h
+++ b/mailcommon/src/filter/filteractions/filteractionsendreceipt.h
diff --git a/mailcommon/filter/filteractions/filteractionsetidentity.cpp b/mailcommon/src/filter/filteractions/filteractionsetidentity.cpp
index 9526785..9526785 100644
--- a/mailcommon/filter/filteractions/filteractionsetidentity.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionsetidentity.cpp
diff --git a/mailcommon/filter/filteractions/filteractionsetidentity.h b/mailcommon/src/filter/filteractions/filteractionsetidentity.h
index e1ead79..e1ead79 100644
--- a/mailcommon/filter/filteractions/filteractionsetidentity.h
+++ b/mailcommon/src/filter/filteractions/filteractionsetidentity.h
diff --git a/mailcommon/filter/filteractions/filteractionsetstatus.cpp b/mailcommon/src/filter/filteractions/filteractionsetstatus.cpp
index 3df58e7..3df58e7 100644
--- a/mailcommon/filter/filteractions/filteractionsetstatus.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionsetstatus.cpp
diff --git a/mailcommon/filter/filteractions/filteractionsetstatus.h b/mailcommon/src/filter/filteractions/filteractionsetstatus.h
index c6809d5..c6809d5 100644
--- a/mailcommon/filter/filteractions/filteractionsetstatus.h
+++ b/mailcommon/src/filter/filteractions/filteractionsetstatus.h
diff --git a/mailcommon/filter/filteractions/filteractionsettransport.cpp b/mailcommon/src/filter/filteractions/filteractionsettransport.cpp
index 5d74160..5d74160 100644
--- a/mailcommon/filter/filteractions/filteractionsettransport.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionsettransport.cpp
diff --git a/mailcommon/filter/filteractions/filteractionsettransport.h b/mailcommon/src/filter/filteractions/filteractionsettransport.h
index f2738b3..f2738b3 100644
--- a/mailcommon/filter/filteractions/filteractionsettransport.h
+++ b/mailcommon/src/filter/filteractions/filteractionsettransport.h
diff --git a/mailcommon/filter/filteractions/filteractionstatus.cpp b/mailcommon/src/filter/filteractions/filteractionstatus.cpp
index 5302a95..5302a95 100644
--- a/mailcommon/filter/filteractions/filteractionstatus.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionstatus.cpp
diff --git a/mailcommon/filter/filteractions/filteractionstatus.h b/mailcommon/src/filter/filteractions/filteractionstatus.h
index e239b30..e239b30 100644
--- a/mailcommon/filter/filteractions/filteractionstatus.h
+++ b/mailcommon/src/filter/filteractions/filteractionstatus.h
diff --git a/mailcommon/filter/filteractions/filteractionunsetstatus.cpp b/mailcommon/src/filter/filteractions/filteractionunsetstatus.cpp
index 9287885..9287885 100644
--- a/mailcommon/filter/filteractions/filteractionunsetstatus.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionunsetstatus.cpp
diff --git a/mailcommon/filter/filteractions/filteractionunsetstatus.h b/mailcommon/src/filter/filteractions/filteractionunsetstatus.h
index 0979fe4..0979fe4 100644
--- a/mailcommon/filter/filteractions/filteractionunsetstatus.h
+++ b/mailcommon/src/filter/filteractions/filteractionunsetstatus.h
diff --git a/mailcommon/filter/filteractions/filteractionwidget.cpp b/mailcommon/src/filter/filteractions/filteractionwidget.cpp
index 4b0cc8b..4b0cc8b 100644
--- a/mailcommon/filter/filteractions/filteractionwidget.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwidget.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwidget.h b/mailcommon/src/filter/filteractions/filteractionwidget.h
index bdcca5b..bdcca5b 100644
--- a/mailcommon/filter/filteractions/filteractionwidget.h
+++ b/mailcommon/src/filter/filteractions/filteractionwidget.h
diff --git a/mailcommon/filter/filteractions/filteractionwithaddress.cpp b/mailcommon/src/filter/filteractions/filteractionwithaddress.cpp
index f0549a3..f0549a3 100644
--- a/mailcommon/filter/filteractions/filteractionwithaddress.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithaddress.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithaddress.h b/mailcommon/src/filter/filteractions/filteractionwithaddress.h
index e6fc236..e6fc236 100644
--- a/mailcommon/filter/filteractions/filteractionwithaddress.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithaddress.h
diff --git a/mailcommon/filter/filteractions/filteractionwithcommand.cpp b/mailcommon/src/filter/filteractions/filteractionwithcommand.cpp
index 3e9dd5e..3e9dd5e 100644
--- a/mailcommon/filter/filteractions/filteractionwithcommand.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithcommand.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithcommand.h b/mailcommon/src/filter/filteractions/filteractionwithcommand.h
index 0e3960f..0e3960f 100644
--- a/mailcommon/filter/filteractions/filteractionwithcommand.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithcommand.h
diff --git a/mailcommon/filter/filteractions/filteractionwithfolder.cpp b/mailcommon/src/filter/filteractions/filteractionwithfolder.cpp
index 422b250..422b250 100644
--- a/mailcommon/filter/filteractions/filteractionwithfolder.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithfolder.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithfolder.h b/mailcommon/src/filter/filteractions/filteractionwithfolder.h
index 239fb30..239fb30 100644
--- a/mailcommon/filter/filteractions/filteractionwithfolder.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithfolder.h
diff --git a/mailcommon/filter/filteractions/filteractionwithnone.cpp b/mailcommon/src/filter/filteractions/filteractionwithnone.cpp
index c0a96f7..c0a96f7 100644
--- a/mailcommon/filter/filteractions/filteractionwithnone.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithnone.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithnone.h b/mailcommon/src/filter/filteractions/filteractionwithnone.h
index 65c11aa..65c11aa 100644
--- a/mailcommon/filter/filteractions/filteractionwithnone.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithnone.h
diff --git a/mailcommon/filter/filteractions/filteractionwithstring.cpp b/mailcommon/src/filter/filteractions/filteractionwithstring.cpp
index 0a73768..0a73768 100644
--- a/mailcommon/filter/filteractions/filteractionwithstring.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithstring.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithstring.h b/mailcommon/src/filter/filteractions/filteractionwithstring.h
index b3d8a44..b3d8a44 100644
--- a/mailcommon/filter/filteractions/filteractionwithstring.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithstring.h
diff --git a/mailcommon/filter/filteractions/filteractionwithstringlist.cpp b/mailcommon/src/filter/filteractions/filteractionwithstringlist.cpp
index fb203e2..fb203e2 100644
--- a/mailcommon/filter/filteractions/filteractionwithstringlist.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithstringlist.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithstringlist.h b/mailcommon/src/filter/filteractions/filteractionwithstringlist.h
index 3026c24..3026c24 100644
--- a/mailcommon/filter/filteractions/filteractionwithstringlist.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithstringlist.h
diff --git a/mailcommon/filter/filteractions/filteractionwithtest.cpp b/mailcommon/src/filter/filteractions/filteractionwithtest.cpp
index 2552b4c..2552b4c 100644
--- a/mailcommon/filter/filteractions/filteractionwithtest.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithtest.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithtest.h b/mailcommon/src/filter/filteractions/filteractionwithtest.h
index d2dc5e7..d2dc5e7 100644
--- a/mailcommon/filter/filteractions/filteractionwithtest.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithtest.h
diff --git a/mailcommon/filter/filteractions/filteractionwithuoid.cpp b/mailcommon/src/filter/filteractions/filteractionwithuoid.cpp
index 2b77b46..2b77b46 100644
--- a/mailcommon/filter/filteractions/filteractionwithuoid.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithuoid.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithuoid.h b/mailcommon/src/filter/filteractions/filteractionwithuoid.h
index 3ce85fa..3ce85fa 100644
--- a/mailcommon/filter/filteractions/filteractionwithuoid.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithuoid.h
diff --git a/mailcommon/filter/filteractions/filteractionwithurl.cpp b/mailcommon/src/filter/filteractions/filteractionwithurl.cpp
index 89a2e6f..89a2e6f 100644
--- a/mailcommon/filter/filteractions/filteractionwithurl.cpp
+++ b/mailcommon/src/filter/filteractions/filteractionwithurl.cpp
diff --git a/mailcommon/filter/filteractions/filteractionwithurl.h b/mailcommon/src/filter/filteractions/filteractionwithurl.h
index ed058ea..ed058ea 100644
--- a/mailcommon/filter/filteractions/filteractionwithurl.h
+++ b/mailcommon/src/filter/filteractions/filteractionwithurl.h
diff --git a/mailcommon/filter/filterconverter/filterconverttosieve.cpp b/mailcommon/src/filter/filterconverter/filterconverttosieve.cpp
index 8eb0e43..8eb0e43 100644
--- a/mailcommon/filter/filterconverter/filterconverttosieve.cpp
+++ b/mailcommon/src/filter/filterconverter/filterconverttosieve.cpp
diff --git a/mailcommon/filter/filterconverter/filterconverttosieve.h b/mailcommon/src/filter/filterconverter/filterconverttosieve.h
index 4f2c627..4f2c627 100644
--- a/mailcommon/filter/filterconverter/filterconverttosieve.h
+++ b/mailcommon/src/filter/filterconverter/filterconverttosieve.h
diff --git a/mailcommon/filter/filterconverter/filterconverttosieveresultdialog.cpp b/mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.cpp
index 46bd585..46bd585 100644
--- a/mailcommon/filter/filterconverter/filterconverttosieveresultdialog.cpp
+++ b/mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.cpp
diff --git a/mailcommon/filter/filterconverter/filterconverttosieveresultdialog.h b/mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.h
index 1fd0869..1fd0869 100644
--- a/mailcommon/filter/filterconverter/filterconverttosieveresultdialog.h
+++ b/mailcommon/src/filter/filterconverter/filterconverttosieveresultdialog.h
diff --git a/mailcommon/filter/filtereditdialog.cpp b/mailcommon/src/filter/filtereditdialog.cpp
index 6e3f1a1..6e3f1a1 100644
--- a/mailcommon/filter/filtereditdialog.cpp
+++ b/mailcommon/src/filter/filtereditdialog.cpp
diff --git a/mailcommon/filter/filtereditdialog_p.h b/mailcommon/src/filter/filtereditdialog_p.h
index 937404f..937404f 100644
--- a/mailcommon/filter/filtereditdialog_p.h
+++ b/mailcommon/src/filter/filtereditdialog_p.h
diff --git a/mailcommon/filter/filterimporter/autotests/CMakeLists.txt b/mailcommon/src/filter/filterimporter/autotests/CMakeLists.txt
index a0ecc72..c1042ca 100644
--- a/mailcommon/filter/filterimporter/autotests/CMakeLists.txt
+++ b/mailcommon/src/filter/filterimporter/autotests/CMakeLists.txt
@@ -3,10 +3,10 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
-add_akonadi_isolated_test_advanced(filterimportclawmailtest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
-add_akonadi_isolated_test_advanced(filterimportthunderbirdtest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
-add_akonadi_isolated_test_advanced(filterimportbalsatest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
-add_akonadi_isolated_test_advanced(filterimportevolutiontest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
-add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
-add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
-add_akonadi_isolated_test_advanced(filterimportergmailtest.cpp filtertestkernel.cpp "mailcommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportclawmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportthunderbirdtest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportbalsatest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportevolutiontest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportprocmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportsylpheedtest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
+add_akonadi_isolated_test_advanced(filterimportergmailtest.cpp filtertestkernel.cpp "KF5::MailCommon;messagecomposer")
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
index 2ff83e5..d642db5 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.cpp
@@ -17,7 +17,7 @@
#include "filterimportbalsatest.h"
#include "filter/mailfilter.h"
#include "filtertestkernel.h"
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
#include <AkonadiCore/qtest_akonadi.h>
void FilterImportBalsatest::initTestCase()
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.h
index 0224907..0224907 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportbalsatest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportbalsatest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
index 4cebb61..b521aa0 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.cpp
@@ -19,7 +19,7 @@
#include "filter/mailfilter.h"
#include <AkonadiCore/qtest_akonadi.h>
#include "filtertestkernel.h"
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
void FilterImportClawMailtest::initTestCase()
{
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.h
index 6630ec0..6630ec0 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportclawmailtest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportclawmailtest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportergmailtest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
index dc12e7e..81b2f9b 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportergmailtest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.cpp
@@ -18,7 +18,7 @@
#include "filter/mailfilter.h"
#include <AkonadiCore/qtest_akonadi.h>
#include "filtertestkernel.h"
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
FilterImporterGmailTest::FilterImporterGmailTest(QObject *parent)
: QObject(parent)
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportergmailtest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.h
index 6a0d968..6a0d968 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportergmailtest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportergmailtest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
index dcef6d1..50e73f9 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.cpp
@@ -18,7 +18,7 @@
#include "filter/mailfilter.h"
#include <AkonadiCore/qtest_akonadi.h>
#include "filtertestkernel.h"
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
void FilterImportEvolutiontest::initTestCase()
{
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.h
index 5526bce..5526bce 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportevolutiontest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportevolutiontest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
index 6673b31..12f6f2b 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.cpp
@@ -19,7 +19,7 @@
#include "filter/mailfilter.h"
#include <AkonadiCore/qtest_akonadi.h>
#include "filtertestkernel.h"
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
void FilterImportProcmailtest::initTestCase()
{
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.h
index 72dedd4..72dedd4 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportprocmailtest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportprocmailtest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
index e9dd2cc..1373735 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.cpp
@@ -18,7 +18,7 @@
#include "filter/mailfilter.h"
#include <AkonadiCore/qtest_akonadi.h>
#include "filtertestkernel.h"
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
void FilterImportSylpheedtest::initTestCase()
{
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.h
index db0cd57..db0cd57 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportsylpheedtest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportsylpheedtest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp b/mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
index c983ea3..b37de87 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.cpp
@@ -19,7 +19,7 @@
#include "filtertestkernel.h"
#include "filter/mailfilter.h"
#include <AkonadiCore/qtest_akonadi.h>
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
void FilterImportThunderbirdtest::initTestCase()
{
diff --git a/mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.h b/mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.h
index 21af3ea..21af3ea 100644
--- a/mailcommon/filter/filterimporter/autotests/filterimportthunderbirdtest.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filterimportthunderbirdtest.h
diff --git a/mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp b/mailcommon/src/filter/filterimporter/autotests/filtertestkernel.cpp
index 538908c..8cc24af 100644
--- a/mailcommon/filter/filterimporter/autotests/filtertestkernel.cpp
+++ b/mailcommon/src/filter/filterimporter/autotests/filtertestkernel.cpp
@@ -19,7 +19,7 @@
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <messagecomposer/sender/akonadisender.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <mailcommon/foldercollectionmonitor.h>
#include <AkonadiCore/session.h>
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
diff --git a/mailcommon/filter/filterimporter/autotests/filtertestkernel.h b/mailcommon/src/filter/filterimporter/autotests/filtertestkernel.h
index 702125e..194dd6e 100644
--- a/mailcommon/filter/filterimporter/autotests/filtertestkernel.h
+++ b/mailcommon/src/filter/filterimporter/autotests/filtertestkernel.h
@@ -17,7 +17,7 @@
#ifndef FILTERTESTKERNEL_H
#define FILTERTESTKERNEL_H
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
namespace Akonadi
{
diff --git a/mailcommon/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml b/mailcommon/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
index 860ba45..860ba45 100644
--- a/mailcommon/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
+++ b/mailcommon/src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
diff --git a/mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc b/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
index c5e90d8..c5e90d8 100644
--- a/mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
+++ b/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
diff --git a/mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc b/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc
index a8438b9..a8438b9 100755
--- a/mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc
+++ b/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdebugrc
diff --git a/mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc b/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc
index 41d1781..41d1781 100644
--- a/mailcommon/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc
+++ b/mailcommon/src/filter/filterimporter/autotests/unittestenv/kdehome/share/config/kdedrc
diff --git a/mailcommon/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc b/mailcommon/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
index 33e7f81..33e7f81 100644
--- a/mailcommon/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
+++ b/mailcommon/src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
diff --git a/mailcommon/filter/filterimporter/filterimporterabstract.cpp b/mailcommon/src/filter/filterimporter/filterimporterabstract.cpp
index 389f960..389f960 100644
--- a/mailcommon/filter/filterimporter/filterimporterabstract.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimporterabstract.cpp
diff --git a/mailcommon/filter/filterimporter/filterimporterabstract.h b/mailcommon/src/filter/filterimporter/filterimporterabstract.h
index 0ea7c54..0ea7c54 100644
--- a/mailcommon/filter/filterimporter/filterimporterabstract.h
+++ b/mailcommon/src/filter/filterimporter/filterimporterabstract.h
diff --git a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp b/mailcommon/src/filter/filterimporter/filterimporterbalsa.cpp
index b54bcda..b54bcda 100644
--- a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimporterbalsa.cpp
diff --git a/mailcommon/filter/filterimporter/filterimporterbalsa.h b/mailcommon/src/filter/filterimporter/filterimporterbalsa.h
index d70c05b..d70c05b 100644
--- a/mailcommon/filter/filterimporter/filterimporterbalsa.h
+++ b/mailcommon/src/filter/filterimporter/filterimporterbalsa.h
diff --git a/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp b/mailcommon/src/filter/filterimporter/filterimporterclawsmail.cpp
index 07d33f8..07d33f8 100644
--- a/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimporterclawsmail.cpp
diff --git a/mailcommon/filter/filterimporter/filterimporterclawsmail.h b/mailcommon/src/filter/filterimporter/filterimporterclawsmail.h
index d81452e..d81452e 100644
--- a/mailcommon/filter/filterimporter/filterimporterclawsmail.h
+++ b/mailcommon/src/filter/filterimporter/filterimporterclawsmail.h
diff --git a/mailcommon/filter/filterimporter/filterimporterevolution.cpp b/mailcommon/src/filter/filterimporter/filterimporterevolution.cpp
index f511c84..f511c84 100644
--- a/mailcommon/filter/filterimporter/filterimporterevolution.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimporterevolution.cpp
diff --git a/mailcommon/filter/filterimporter/filterimporterevolution.h b/mailcommon/src/filter/filterimporter/filterimporterevolution.h
index 88af301..88af301 100644
--- a/mailcommon/filter/filterimporter/filterimporterevolution.h
+++ b/mailcommon/src/filter/filterimporter/filterimporterevolution.h
diff --git a/mailcommon/filter/filterimporter/filterimportergmail.cpp b/mailcommon/src/filter/filterimporter/filterimportergmail.cpp
index 6bd186c..6bd186c 100644
--- a/mailcommon/filter/filterimporter/filterimportergmail.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimportergmail.cpp
diff --git a/mailcommon/filter/filterimporter/filterimportergmail.h b/mailcommon/src/filter/filterimporter/filterimportergmail.h
index 8938fcf..8938fcf 100644
--- a/mailcommon/filter/filterimporter/filterimportergmail.h
+++ b/mailcommon/src/filter/filterimporter/filterimportergmail.h
diff --git a/mailcommon/filter/filterimporter/filterimporterprocmail.cpp b/mailcommon/src/filter/filterimporter/filterimporterprocmail.cpp
index 1effe48..1effe48 100644
--- a/mailcommon/filter/filterimporter/filterimporterprocmail.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimporterprocmail.cpp
diff --git a/mailcommon/filter/filterimporter/filterimporterprocmail.h b/mailcommon/src/filter/filterimporter/filterimporterprocmail.h
index 89cc90c..89cc90c 100644
--- a/mailcommon/filter/filterimporter/filterimporterprocmail.h
+++ b/mailcommon/src/filter/filterimporter/filterimporterprocmail.h
diff --git a/mailcommon/filter/filterimporter/filterimportersylpheed.cpp b/mailcommon/src/filter/filterimporter/filterimportersylpheed.cpp
index 48ef424..48ef424 100644
--- a/mailcommon/filter/filterimporter/filterimportersylpheed.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimportersylpheed.cpp
diff --git a/mailcommon/filter/filterimporter/filterimportersylpheed.h b/mailcommon/src/filter/filterimporter/filterimportersylpheed.h
index 2a1b166..2a1b166 100644
--- a/mailcommon/filter/filterimporter/filterimportersylpheed.h
+++ b/mailcommon/src/filter/filterimporter/filterimportersylpheed.h
diff --git a/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp b/mailcommon/src/filter/filterimporter/filterimporterthunderbird.cpp
index ffe5218..ffe5218 100644
--- a/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
+++ b/mailcommon/src/filter/filterimporter/filterimporterthunderbird.cpp
diff --git a/mailcommon/filter/filterimporter/filterimporterthunderbird.h b/mailcommon/src/filter/filterimporter/filterimporterthunderbird.h
index b53ff7a..b53ff7a 100644
--- a/mailcommon/filter/filterimporter/filterimporterthunderbird.h
+++ b/mailcommon/src/filter/filterimporter/filterimporterthunderbird.h
diff --git a/mailcommon/filter/filterimporterexporter.cpp b/mailcommon/src/filter/filterimporterexporter.cpp
index 4a6a2bf..4a6a2bf 100644
--- a/mailcommon/filter/filterimporterexporter.cpp
+++ b/mailcommon/src/filter/filterimporterexporter.cpp
diff --git a/mailcommon/filter/filterimporterexporter.h b/mailcommon/src/filter/filterimporterexporter.h
index 2931948..2931948 100644
--- a/mailcommon/filter/filterimporterexporter.h
+++ b/mailcommon/src/filter/filterimporterexporter.h
diff --git a/mailcommon/filter/filterlog.cpp b/mailcommon/src/filter/filterlog.cpp
index 700963e..700963e 100644
--- a/mailcommon/filter/filterlog.cpp
+++ b/mailcommon/src/filter/filterlog.cpp
diff --git a/mailcommon/filter/filterlog.h b/mailcommon/src/filter/filterlog.h
index a9cf621..a9cf621 100644
--- a/mailcommon/filter/filterlog.h
+++ b/mailcommon/src/filter/filterlog.h
diff --git a/mailcommon/filter/filtermanager.cpp b/mailcommon/src/filter/filtermanager.cpp
index c5dce74..c5dce74 100644
--- a/mailcommon/filter/filtermanager.cpp
+++ b/mailcommon/src/filter/filtermanager.cpp
diff --git a/mailcommon/filter/filtermanager.h b/mailcommon/src/filter/filtermanager.h
index ff85820..ff85820 100644
--- a/mailcommon/filter/filtermanager.h
+++ b/mailcommon/src/filter/filtermanager.h
diff --git a/mailcommon/filter/filterselectiondialog.cpp b/mailcommon/src/filter/filterselectiondialog.cpp
index 8a7dbc71..8a7dbc71 100644
--- a/mailcommon/filter/filterselectiondialog.cpp
+++ b/mailcommon/src/filter/filterselectiondialog.cpp
diff --git a/mailcommon/filter/filterselectiondialog.h b/mailcommon/src/filter/filterselectiondialog.h
index 641000a..641000a 100644
--- a/mailcommon/filter/filterselectiondialog.h
+++ b/mailcommon/src/filter/filterselectiondialog.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterdialog.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterdialog.cpp
index ddddce1..ddddce1 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterdialog.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterdialog.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterdialog.h b/mailcommon/src/filter/invalidfilters/invalidfilterdialog.h
index aee3456..aee3456 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterdialog.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterdialog.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterinfo.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterinfo.cpp
index 2a1d75d..2a1d75d 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterinfo.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterinfo.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterinfo.h b/mailcommon/src/filter/invalidfilters/invalidfilterinfo.h
index d7ee14e..d7ee14e 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterinfo.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterinfo.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterinfowidget.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.cpp
index cda9d6a..cda9d6a 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterinfowidget.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterinfowidget.h b/mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.h
index 5486de1..5486de1 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterinfowidget.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterinfowidget.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistitemdelegate.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp
index e233650..e233650 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistitemdelegate.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistitemdelegate.h b/mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.h
index 721df41..721df41 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistitemdelegate.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterlistitemdelegate.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistmodel.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.cpp
index 58670fb..58670fb 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistmodel.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistmodel.h b/mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.h
index 8a4fd11..8a4fd11 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistmodel.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterlistmodel.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistview.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterlistview.cpp
index 8e585d3..8e585d3 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistview.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterlistview.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistview.h b/mailcommon/src/filter/invalidfilters/invalidfilterlistview.h
index f34d518..f34d518 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistview.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterlistview.h
diff --git a/mailcommon/filter/invalidfilters/invalidfilterwidget.cpp b/mailcommon/src/filter/invalidfilters/invalidfilterwidget.cpp
index b3b5df2..b3b5df2 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterwidget.cpp
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterwidget.cpp
diff --git a/mailcommon/filter/invalidfilters/invalidfilterwidget.h b/mailcommon/src/filter/invalidfilters/invalidfilterwidget.h
index 309b01f..309b01f 100644
--- a/mailcommon/filter/invalidfilters/invalidfilterwidget.h
+++ b/mailcommon/src/filter/invalidfilters/invalidfilterwidget.h
diff --git a/mailcommon/filter/itemcontext.cpp b/mailcommon/src/filter/itemcontext.cpp
index 034fa18..034fa18 100644
--- a/mailcommon/filter/itemcontext.cpp
+++ b/mailcommon/src/filter/itemcontext.cpp
diff --git a/mailcommon/filter/itemcontext.h b/mailcommon/src/filter/itemcontext.h
index aafde54..aafde54 100644
--- a/mailcommon/filter/itemcontext.h
+++ b/mailcommon/src/filter/itemcontext.h
diff --git a/mailcommon/filter/kmfilteraccountlist.cpp b/mailcommon/src/filter/kmfilteraccountlist.cpp
index 51959a6..51959a6 100644
--- a/mailcommon/filter/kmfilteraccountlist.cpp
+++ b/mailcommon/src/filter/kmfilteraccountlist.cpp
diff --git a/mailcommon/filter/kmfilteraccountlist.h b/mailcommon/src/filter/kmfilteraccountlist.h
index 0908b0d..0908b0d 100644
--- a/mailcommon/filter/kmfilteraccountlist.h
+++ b/mailcommon/src/filter/kmfilteraccountlist.h
diff --git a/mailcommon/filter/kmfilterdialog.cpp b/mailcommon/src/filter/kmfilterdialog.cpp
index 119310e..119310e 100644
--- a/mailcommon/filter/kmfilterdialog.cpp
+++ b/mailcommon/src/filter/kmfilterdialog.cpp
diff --git a/mailcommon/filter/kmfilterdialog.h b/mailcommon/src/filter/kmfilterdialog.h
index 972286e..972286e 100644
--- a/mailcommon/filter/kmfilterdialog.h
+++ b/mailcommon/src/filter/kmfilterdialog.h
diff --git a/mailcommon/filter/kmfilterlistbox.cpp b/mailcommon/src/filter/kmfilterlistbox.cpp
index 1c1c74b..1c1c74b 100644
--- a/mailcommon/filter/kmfilterlistbox.cpp
+++ b/mailcommon/src/filter/kmfilterlistbox.cpp
diff --git a/mailcommon/filter/kmfilterlistbox.h b/mailcommon/src/filter/kmfilterlistbox.h
index 30f7bf4..30f7bf4 100644
--- a/mailcommon/filter/kmfilterlistbox.h
+++ b/mailcommon/src/filter/kmfilterlistbox.h
diff --git a/mailcommon/filter/mailfilter.cpp b/mailcommon/src/filter/mailfilter.cpp
index 363fb4a..363fb4a 100644
--- a/mailcommon/filter/mailfilter.cpp
+++ b/mailcommon/src/filter/mailfilter.cpp
diff --git a/mailcommon/filter/mailfilter.h b/mailcommon/src/filter/mailfilter.h
index ba423f7..ba423f7 100644
--- a/mailcommon/filter/mailfilter.h
+++ b/mailcommon/src/filter/mailfilter.h
diff --git a/mailcommon/filter/mdnadvicedialog.cpp b/mailcommon/src/filter/mdnadvicedialog.cpp
index d7f7356..f1388f0 100644
--- a/mailcommon/filter/mdnadvicedialog.cpp
+++ b/mailcommon/src/filter/mdnadvicedialog.cpp
@@ -28,7 +28,7 @@ using MessageComposer::MessageFactory;
#include <settings/messageviewersettings.h>
#ifndef QT_NO_CURSOR
-#include <mailcommon/util/kcursorsaver.h>
+#include <util/kcursorsaver.h>
#endif
#include <viewer/objecttreeparser.h>
diff --git a/mailcommon/filter/mdnadvicedialog.h b/mailcommon/src/filter/mdnadvicedialog.h
index 54e9422..54e9422 100644
--- a/mailcommon/filter/mdnadvicedialog.h
+++ b/mailcommon/src/filter/mdnadvicedialog.h
diff --git a/mailcommon/filter/soundtestwidget.cpp b/mailcommon/src/filter/soundtestwidget.cpp
index 8a04cad..8a04cad 100644
--- a/mailcommon/filter/soundtestwidget.cpp
+++ b/mailcommon/src/filter/soundtestwidget.cpp
diff --git a/mailcommon/filter/soundtestwidget.h b/mailcommon/src/filter/soundtestwidget.h
index cf7af8f..cf7af8f 100644
--- a/mailcommon/filter/soundtestwidget.h
+++ b/mailcommon/src/filter/soundtestwidget.h
diff --git a/mailcommon/filter/tests/CMakeLists.txt b/mailcommon/src/filter/tests/CMakeLists.txt
index 307e765..550d374 100644
--- a/mailcommon/filter/tests/CMakeLists.txt
+++ b/mailcommon/src/filter/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries(filterimporterexportergui
Qt5::Test
Qt5::Core
Qt5::Gui
- mailcommon
+ KF5::MailCommon
)
set(invalidfilterdialoggui_SRCS invalidfilterdialoggui.cpp)
@@ -16,7 +16,7 @@ target_link_libraries(invalidfilterdialoggui
Qt5::Test
Qt5::Core
Qt5::Gui
- mailcommon
+ KF5::MailCommon
)
set(mndadvicedialoggui_SRCS mndadvicedialoggui.cpp)
@@ -26,6 +26,6 @@ target_link_libraries(mndadvicedialoggui
Qt5::Test
Qt5::Core
Qt5::Gui
- mailcommon
+ KF5::MailCommon
)
diff --git a/mailcommon/filter/tests/filterimporterexportergui.cpp b/mailcommon/src/filter/tests/filterimporterexportergui.cpp
index 020856e..020856e 100644
--- a/mailcommon/filter/tests/filterimporterexportergui.cpp
+++ b/mailcommon/src/filter/tests/filterimporterexportergui.cpp
diff --git a/mailcommon/filter/tests/filterimporterexportergui.h b/mailcommon/src/filter/tests/filterimporterexportergui.h
index 563f308..6e1cee8 100644
--- a/mailcommon/filter/tests/filterimporterexportergui.h
+++ b/mailcommon/src/filter/tests/filterimporterexportergui.h
@@ -19,7 +19,7 @@
#define FILTERIMPORTEREXPORTERGUI_H
#include <QWidget>
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "filter/filterimporterexporter.h"
class QTextEdit;
class FilterImporterExporterGui : public QWidget
{
diff --git a/mailcommon/filter/tests/invalidfilterdialoggui.cpp b/mailcommon/src/filter/tests/invalidfilterdialoggui.cpp
index a4fdd06..a4fdd06 100644
--- a/mailcommon/filter/tests/invalidfilterdialoggui.cpp
+++ b/mailcommon/src/filter/tests/invalidfilterdialoggui.cpp
diff --git a/mailcommon/filter/tests/mndadvicedialoggui.cpp b/mailcommon/src/filter/tests/mndadvicedialoggui.cpp
index 86ee245..86ee245 100644
--- a/mailcommon/filter/tests/mndadvicedialoggui.cpp
+++ b/mailcommon/src/filter/tests/mndadvicedialoggui.cpp
diff --git a/mailcommon/filter/ui/filterconfigwidget.ui b/mailcommon/src/filter/ui/filterconfigwidget.ui
index 74649ec..74649ec 100644
--- a/mailcommon/filter/ui/filterconfigwidget.ui
+++ b/mailcommon/src/filter/ui/filterconfigwidget.ui
diff --git a/mailcommon/filter/ui/selectthunderbirdfilterfileswidget.ui b/mailcommon/src/filter/ui/selectthunderbirdfilterfileswidget.ui
index ac3f440..ac3f440 100644
--- a/mailcommon/filter/ui/selectthunderbirdfilterfileswidget.ui
+++ b/mailcommon/src/filter/ui/selectthunderbirdfilterfileswidget.ui
diff --git a/mailcommon/folder/accountconfigorderdialog.cpp b/mailcommon/src/folder/accountconfigorderdialog.cpp
index 0661d96..481ec41 100644
--- a/mailcommon/folder/accountconfigorderdialog.cpp
+++ b/mailcommon/src/folder/accountconfigorderdialog.cpp
@@ -18,7 +18,7 @@
#include "accountconfigorderdialog.h"
#include "mailcommon/mailcommonsettings_base.h"
#include "pimcommon/util/pimutil.h"
-#include "mailcommon/util/mailutil.h"
+#include "util/mailutil.h"
#include "mailcommon_debug.h"
#include <KLocalizedString>
#include <QPushButton>
diff --git a/mailcommon/folder/accountconfigorderdialog.h b/mailcommon/src/folder/accountconfigorderdialog.h
index 7be2c8d..7be2c8d 100644
--- a/mailcommon/folder/accountconfigorderdialog.h
+++ b/mailcommon/src/folder/accountconfigorderdialog.h
diff --git a/mailcommon/folder/entitycollectionorderproxymodel.cpp b/mailcommon/src/folder/entitycollectionorderproxymodel.cpp
index 0babf9b..0babf9b 100644
--- a/mailcommon/folder/entitycollectionorderproxymodel.cpp
+++ b/mailcommon/src/folder/entitycollectionorderproxymodel.cpp
diff --git a/mailcommon/folder/entitycollectionorderproxymodel.h b/mailcommon/src/folder/entitycollectionorderproxymodel.h
index 62d1ede..62d1ede 100644
--- a/mailcommon/folder/entitycollectionorderproxymodel.h
+++ b/mailcommon/src/folder/entitycollectionorderproxymodel.h
diff --git a/mailcommon/folder/foldercollection.cpp b/mailcommon/src/folder/foldercollection.cpp
index 14d04bc..14d04bc 100644
--- a/mailcommon/folder/foldercollection.cpp
+++ b/mailcommon/src/folder/foldercollection.cpp
diff --git a/mailcommon/folder/foldercollection.h b/mailcommon/src/folder/foldercollection.h
index 293a6bb..293a6bb 100644
--- a/mailcommon/folder/foldercollection.h
+++ b/mailcommon/src/folder/foldercollection.h
diff --git a/mailcommon/folder/foldercollectionmonitor.cpp b/mailcommon/src/folder/foldercollectionmonitor.cpp
index e177b13..e177b13 100644
--- a/mailcommon/folder/foldercollectionmonitor.cpp
+++ b/mailcommon/src/folder/foldercollectionmonitor.cpp
diff --git a/mailcommon/folder/foldercollectionmonitor.h b/mailcommon/src/folder/foldercollectionmonitor.h
index d4f05d8..d4f05d8 100644
--- a/mailcommon/folder/foldercollectionmonitor.h
+++ b/mailcommon/src/folder/foldercollectionmonitor.h
diff --git a/mailcommon/folder/folderrequester.cpp b/mailcommon/src/folder/folderrequester.cpp
index 72de889..72de889 100644
--- a/mailcommon/folder/folderrequester.cpp
+++ b/mailcommon/src/folder/folderrequester.cpp
diff --git a/mailcommon/folder/folderrequester.h b/mailcommon/src/folder/folderrequester.h
index 1628e3f..1628e3f 100644
--- a/mailcommon/folder/folderrequester.h
+++ b/mailcommon/src/folder/folderrequester.h
diff --git a/mailcommon/folder/folderselectiondialog.cpp b/mailcommon/src/folder/folderselectiondialog.cpp
index 827a285..827a285 100644
--- a/mailcommon/folder/folderselectiondialog.cpp
+++ b/mailcommon/src/folder/folderselectiondialog.cpp
diff --git a/mailcommon/folder/folderselectiondialog.h b/mailcommon/src/folder/folderselectiondialog.h
index 327a9b3..327a9b3 100644
--- a/mailcommon/folder/folderselectiondialog.h
+++ b/mailcommon/src/folder/folderselectiondialog.h
diff --git a/mailcommon/folder/foldertreeview.cpp b/mailcommon/src/folder/foldertreeview.cpp
index 9b933dd..9b933dd 100644
--- a/mailcommon/folder/foldertreeview.cpp
+++ b/mailcommon/src/folder/foldertreeview.cpp
diff --git a/mailcommon/folder/foldertreeview.h b/mailcommon/src/folder/foldertreeview.h
index a1b891a..a1b891a 100644
--- a/mailcommon/folder/foldertreeview.h
+++ b/mailcommon/src/folder/foldertreeview.h
diff --git a/mailcommon/folder/foldertreewidget.cpp b/mailcommon/src/folder/foldertreewidget.cpp
index 47b66c5..47b66c5 100644
--- a/mailcommon/folder/foldertreewidget.cpp
+++ b/mailcommon/src/folder/foldertreewidget.cpp
diff --git a/mailcommon/folder/foldertreewidget.h b/mailcommon/src/folder/foldertreewidget.h
index 372de05..372de05 100644
--- a/mailcommon/folder/foldertreewidget.h
+++ b/mailcommon/src/folder/foldertreewidget.h
diff --git a/mailcommon/folder/foldertreewidgetproxymodel.cpp b/mailcommon/src/folder/foldertreewidgetproxymodel.cpp
index d6f4078..d6f4078 100644
--- a/mailcommon/folder/foldertreewidgetproxymodel.cpp
+++ b/mailcommon/src/folder/foldertreewidgetproxymodel.cpp
diff --git a/mailcommon/folder/foldertreewidgetproxymodel.h b/mailcommon/src/folder/foldertreewidgetproxymodel.h
index 6d19c93..6d19c93 100644
--- a/mailcommon/folder/foldertreewidgetproxymodel.h
+++ b/mailcommon/src/folder/foldertreewidgetproxymodel.h
diff --git a/mailcommon/interfaces/mailinterfaces.h b/mailcommon/src/interfaces/mailinterfaces.h
index e57a957..e57a957 100644
--- a/mailcommon/interfaces/mailinterfaces.h
+++ b/mailcommon/src/interfaces/mailinterfaces.h
diff --git a/mailcommon/interfaces/rulewidgethandler.h b/mailcommon/src/interfaces/rulewidgethandler.h
index e336083..e336083 100644
--- a/mailcommon/interfaces/rulewidgethandler.h
+++ b/mailcommon/src/interfaces/rulewidgethandler.h
diff --git a/mailcommon/job/backupjob.cpp b/mailcommon/src/job/backupjob.cpp
index 37c9059..37c9059 100644
--- a/mailcommon/job/backupjob.cpp
+++ b/mailcommon/src/job/backupjob.cpp
diff --git a/mailcommon/job/backupjob.h b/mailcommon/src/job/backupjob.h
index 5049d79..5049d79 100644
--- a/mailcommon/job/backupjob.h
+++ b/mailcommon/src/job/backupjob.h
diff --git a/mailcommon/job/expirejob.cpp b/mailcommon/src/job/expirejob.cpp
index d7fef43..d7fef43 100644
--- a/mailcommon/job/expirejob.cpp
+++ b/mailcommon/src/job/expirejob.cpp
diff --git a/mailcommon/job/expirejob.h b/mailcommon/src/job/expirejob.h
index 4e9dfe1..4e9dfe1 100644
--- a/mailcommon/job/expirejob.h
+++ b/mailcommon/src/job/expirejob.h
diff --git a/mailcommon/job/folderjob.cpp b/mailcommon/src/job/folderjob.cpp
index 5337e96..5337e96 100644
--- a/mailcommon/job/folderjob.cpp
+++ b/mailcommon/src/job/folderjob.cpp
diff --git a/mailcommon/job/folderjob.h b/mailcommon/src/job/folderjob.h
index de3efa4..de3efa4 100644
--- a/mailcommon/job/folderjob.h
+++ b/mailcommon/src/job/folderjob.h
diff --git a/mailcommon/job/jobscheduler.cpp b/mailcommon/src/job/jobscheduler.cpp
index 522e1f3..522e1f3 100644
--- a/mailcommon/job/jobscheduler.cpp
+++ b/mailcommon/src/job/jobscheduler.cpp
diff --git a/mailcommon/job/jobscheduler.h b/mailcommon/src/job/jobscheduler.h
index e606a40..e606a40 100644
--- a/mailcommon/job/jobscheduler.h
+++ b/mailcommon/src/job/jobscheduler.h
diff --git a/mailcommon/kernel/mailkernel.cpp b/mailcommon/src/kernel/mailkernel.cpp
index 2659278..2659278 100644
--- a/mailcommon/kernel/mailkernel.cpp
+++ b/mailcommon/src/kernel/mailkernel.cpp
diff --git a/mailcommon/kernel/mailkernel.h b/mailcommon/src/kernel/mailkernel.h
index 36e0f07..36e0f07 100644
--- a/mailcommon/kernel/mailkernel.h
+++ b/mailcommon/src/kernel/mailkernel.h
diff --git a/mailcommon/mdn/sendmdnhandler.cpp b/mailcommon/src/mdn/sendmdnhandler.cpp
index 455fce3..455fce3 100644
--- a/mailcommon/mdn/sendmdnhandler.cpp
+++ b/mailcommon/src/mdn/sendmdnhandler.cpp
diff --git a/mailcommon/mdn/sendmdnhandler.h b/mailcommon/src/mdn/sendmdnhandler.h
index 52c70ed..52c70ed 100644
--- a/mailcommon/mdn/sendmdnhandler.h
+++ b/mailcommon/src/mdn/sendmdnhandler.h
diff --git a/mailcommon/search/autotests/CMakeLists.txt b/mailcommon/src/search/autotests/CMakeLists.txt
index 8099521..972e7f8 100644
--- a/mailcommon/search/autotests/CMakeLists.txt
+++ b/mailcommon/src/search/autotests/CMakeLists.txt
@@ -2,7 +2,7 @@ macro(add_search_autotest _name)
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-search-"
- LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::Mime KF5::AkonadiCore KF5::AkonadiMime mailcommon
+ LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::Mime KF5::AkonadiCore KF5::AkonadiMime KF5::MailCommon
)
endmacro()
diff --git a/mailcommon/search/autotests/searchpatterntest.cpp b/mailcommon/src/search/autotests/searchpatterntest.cpp
index a04e3a9..a04e3a9 100644
--- a/mailcommon/search/autotests/searchpatterntest.cpp
+++ b/mailcommon/src/search/autotests/searchpatterntest.cpp
diff --git a/mailcommon/search/autotests/searchpatterntest.h b/mailcommon/src/search/autotests/searchpatterntest.h
index d14ef58..d14ef58 100644
--- a/mailcommon/search/autotests/searchpatterntest.h
+++ b/mailcommon/src/search/autotests/searchpatterntest.h
diff --git a/mailcommon/search/autotests/searchruledatetest.cpp b/mailcommon/src/search/autotests/searchruledatetest.cpp
index 0f9c02b..0f9c02b 100644
--- a/mailcommon/search/autotests/searchruledatetest.cpp
+++ b/mailcommon/src/search/autotests/searchruledatetest.cpp
diff --git a/mailcommon/search/autotests/searchruledatetest.h b/mailcommon/src/search/autotests/searchruledatetest.h
index 0b8db87..0b8db87 100644
--- a/mailcommon/search/autotests/searchruledatetest.h
+++ b/mailcommon/src/search/autotests/searchruledatetest.h
diff --git a/mailcommon/search/autotests/searchrulenumericaltest.cpp b/mailcommon/src/search/autotests/searchrulenumericaltest.cpp
index a444686..a444686 100644
--- a/mailcommon/search/autotests/searchrulenumericaltest.cpp
+++ b/mailcommon/src/search/autotests/searchrulenumericaltest.cpp
diff --git a/mailcommon/search/autotests/searchrulenumericaltest.h b/mailcommon/src/search/autotests/searchrulenumericaltest.h
index be83da0..be83da0 100644
--- a/mailcommon/search/autotests/searchrulenumericaltest.h
+++ b/mailcommon/src/search/autotests/searchrulenumericaltest.h
diff --git a/mailcommon/search/autotests/searchrulestatustest.cpp b/mailcommon/src/search/autotests/searchrulestatustest.cpp
index 2dffe1d..2dffe1d 100644
--- a/mailcommon/search/autotests/searchrulestatustest.cpp
+++ b/mailcommon/src/search/autotests/searchrulestatustest.cpp
diff --git a/mailcommon/search/autotests/searchrulestatustest.h b/mailcommon/src/search/autotests/searchrulestatustest.h
index 523f0d0..523f0d0 100644
--- a/mailcommon/search/autotests/searchrulestatustest.h
+++ b/mailcommon/src/search/autotests/searchrulestatustest.h
diff --git a/mailcommon/search/autotests/searchrulestringtest.cpp b/mailcommon/src/search/autotests/searchrulestringtest.cpp
index 19c7376..19c7376 100644
--- a/mailcommon/search/autotests/searchrulestringtest.cpp
+++ b/mailcommon/src/search/autotests/searchrulestringtest.cpp
diff --git a/mailcommon/search/autotests/searchrulestringtest.h b/mailcommon/src/search/autotests/searchrulestringtest.h
index f25f9c4..f25f9c4 100644
--- a/mailcommon/search/autotests/searchrulestringtest.h
+++ b/mailcommon/src/search/autotests/searchrulestringtest.h
diff --git a/mailcommon/search/autotests/searchruletest.cpp b/mailcommon/src/search/autotests/searchruletest.cpp
index d102486..d102486 100644
--- a/mailcommon/search/autotests/searchruletest.cpp
+++ b/mailcommon/src/search/autotests/searchruletest.cpp
diff --git a/mailcommon/search/autotests/searchruletest.h b/mailcommon/src/search/autotests/searchruletest.h
index e7d9794..e7d9794 100644
--- a/mailcommon/search/autotests/searchruletest.h
+++ b/mailcommon/src/search/autotests/searchruletest.h
diff --git a/mailcommon/search/searchpattern.cpp b/mailcommon/src/search/searchpattern.cpp
index 576b08d..576b08d 100644
--- a/mailcommon/search/searchpattern.cpp
+++ b/mailcommon/src/search/searchpattern.cpp
diff --git a/mailcommon/search/searchpattern.h b/mailcommon/src/search/searchpattern.h
index 3c9b087..3c9b087 100644
--- a/mailcommon/search/searchpattern.h
+++ b/mailcommon/src/search/searchpattern.h
diff --git a/mailcommon/search/searchpatternedit.cpp b/mailcommon/src/search/searchpatternedit.cpp
index 64412a8..64412a8 100644
--- a/mailcommon/search/searchpatternedit.cpp
+++ b/mailcommon/src/search/searchpatternedit.cpp
diff --git a/mailcommon/search/searchpatternedit.h b/mailcommon/src/search/searchpatternedit.h
index 56d71a6..56d71a6 100644
--- a/mailcommon/search/searchpatternedit.h
+++ b/mailcommon/src/search/searchpatternedit.h
diff --git a/mailcommon/search/searchrule/searchrule.cpp b/mailcommon/src/search/searchrule/searchrule.cpp
index 70d667c..70d667c 100644
--- a/mailcommon/search/searchrule/searchrule.cpp
+++ b/mailcommon/src/search/searchrule/searchrule.cpp
diff --git a/mailcommon/search/searchrule/searchrule.h b/mailcommon/src/search/searchrule/searchrule.h
index ae27cf3..ae27cf3 100644
--- a/mailcommon/search/searchrule/searchrule.h
+++ b/mailcommon/src/search/searchrule/searchrule.h
diff --git a/mailcommon/search/searchrule/searchruledate.cpp b/mailcommon/src/search/searchrule/searchruledate.cpp
index 87d8dba..87d8dba 100644
--- a/mailcommon/search/searchrule/searchruledate.cpp
+++ b/mailcommon/src/search/searchrule/searchruledate.cpp
diff --git a/mailcommon/search/searchrule/searchruledate.h b/mailcommon/src/search/searchrule/searchruledate.h
index 02f7635..02f7635 100644
--- a/mailcommon/search/searchrule/searchruledate.h
+++ b/mailcommon/src/search/searchrule/searchruledate.h
diff --git a/mailcommon/search/searchrule/searchrulenumerical.cpp b/mailcommon/src/search/searchrule/searchrulenumerical.cpp
index a70cb5a..a70cb5a 100644
--- a/mailcommon/search/searchrule/searchrulenumerical.cpp
+++ b/mailcommon/src/search/searchrule/searchrulenumerical.cpp
diff --git a/mailcommon/search/searchrule/searchrulenumerical.h b/mailcommon/src/search/searchrule/searchrulenumerical.h
index c4f5687..c4f5687 100644
--- a/mailcommon/search/searchrule/searchrulenumerical.h
+++ b/mailcommon/src/search/searchrule/searchrulenumerical.h
diff --git a/mailcommon/search/searchrule/searchrulestatus.cpp b/mailcommon/src/search/searchrule/searchrulestatus.cpp
index 50e7970..50e7970 100644
--- a/mailcommon/search/searchrule/searchrulestatus.cpp
+++ b/mailcommon/src/search/searchrule/searchrulestatus.cpp
diff --git a/mailcommon/search/searchrule/searchrulestatus.h b/mailcommon/src/search/searchrule/searchrulestatus.h
index a48ad35..a48ad35 100644
--- a/mailcommon/search/searchrule/searchrulestatus.h
+++ b/mailcommon/src/search/searchrule/searchrulestatus.h
diff --git a/mailcommon/search/searchrule/searchrulestring.cpp b/mailcommon/src/search/searchrule/searchrulestring.cpp
index 42bd95c..42bd95c 100644
--- a/mailcommon/search/searchrule/searchrulestring.cpp
+++ b/mailcommon/src/search/searchrule/searchrulestring.cpp
diff --git a/mailcommon/search/searchrule/searchrulestring.h b/mailcommon/src/search/searchrule/searchrulestring.h
index 6783e21..6783e21 100644
--- a/mailcommon/search/searchrule/searchrulestring.h
+++ b/mailcommon/src/search/searchrule/searchrulestring.h
diff --git a/mailcommon/search/widgethandler/daterulewidgethandler.cpp b/mailcommon/src/search/widgethandler/daterulewidgethandler.cpp
index 54034bd..54034bd 100644
--- a/mailcommon/search/widgethandler/daterulewidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/daterulewidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/daterulewidgethandler.h b/mailcommon/src/search/widgethandler/daterulewidgethandler.h
index 4b87f68..4b87f68 100644
--- a/mailcommon/search/widgethandler/daterulewidgethandler.h
+++ b/mailcommon/src/search/widgethandler/daterulewidgethandler.h
diff --git a/mailcommon/search/widgethandler/headersrulerwidgethandler.cpp b/mailcommon/src/search/widgethandler/headersrulerwidgethandler.cpp
index 00a4eb5..00a4eb5 100644
--- a/mailcommon/search/widgethandler/headersrulerwidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/headersrulerwidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/headersrulerwidgethandler.h b/mailcommon/src/search/widgethandler/headersrulerwidgethandler.h
index d33bf35..d33bf35 100644
--- a/mailcommon/search/widgethandler/headersrulerwidgethandler.h
+++ b/mailcommon/src/search/widgethandler/headersrulerwidgethandler.h
diff --git a/mailcommon/search/widgethandler/messagerulewidgethandler.cpp b/mailcommon/src/search/widgethandler/messagerulewidgethandler.cpp
index 2fb0f6b..2fb0f6b 100644
--- a/mailcommon/search/widgethandler/messagerulewidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/messagerulewidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/messagerulewidgethandler.h b/mailcommon/src/search/widgethandler/messagerulewidgethandler.h
index ef6136d..ef6136d 100644
--- a/mailcommon/search/widgethandler/messagerulewidgethandler.h
+++ b/mailcommon/src/search/widgethandler/messagerulewidgethandler.h
diff --git a/mailcommon/search/widgethandler/numericdoublerulewidgethandler.cpp b/mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.cpp
index 19326dd..19326dd 100644
--- a/mailcommon/search/widgethandler/numericdoublerulewidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/numericdoublerulewidgethandler.h b/mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.h
index 90eeea1..90eeea1 100644
--- a/mailcommon/search/widgethandler/numericdoublerulewidgethandler.h
+++ b/mailcommon/src/search/widgethandler/numericdoublerulewidgethandler.h
diff --git a/mailcommon/search/widgethandler/numericrulewidgethandler.cpp b/mailcommon/src/search/widgethandler/numericrulewidgethandler.cpp
index c54e7df..c54e7df 100644
--- a/mailcommon/search/widgethandler/numericrulewidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/numericrulewidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/numericrulewidgethandler.h b/mailcommon/src/search/widgethandler/numericrulewidgethandler.h
index 9f09c1b..9f09c1b 100644
--- a/mailcommon/search/widgethandler/numericrulewidgethandler.h
+++ b/mailcommon/src/search/widgethandler/numericrulewidgethandler.h
diff --git a/mailcommon/search/widgethandler/rulewidgethandlermanager.cpp b/mailcommon/src/search/widgethandler/rulewidgethandlermanager.cpp
index 0a6403c..0a6403c 100644
--- a/mailcommon/search/widgethandler/rulewidgethandlermanager.cpp
+++ b/mailcommon/src/search/widgethandler/rulewidgethandlermanager.cpp
diff --git a/mailcommon/search/widgethandler/rulewidgethandlermanager.h b/mailcommon/src/search/widgethandler/rulewidgethandlermanager.h
index 1063dd2..1063dd2 100644
--- a/mailcommon/search/widgethandler/rulewidgethandlermanager.h
+++ b/mailcommon/src/search/widgethandler/rulewidgethandlermanager.h
diff --git a/mailcommon/search/widgethandler/statusrulewidgethandler.cpp b/mailcommon/src/search/widgethandler/statusrulewidgethandler.cpp
index c166eff..c166eff 100644
--- a/mailcommon/search/widgethandler/statusrulewidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/statusrulewidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/statusrulewidgethandler.h b/mailcommon/src/search/widgethandler/statusrulewidgethandler.h
index 0028fc9..0028fc9 100644
--- a/mailcommon/search/widgethandler/statusrulewidgethandler.h
+++ b/mailcommon/src/search/widgethandler/statusrulewidgethandler.h
diff --git a/mailcommon/search/widgethandler/tagrulewidgethandler.cpp b/mailcommon/src/search/widgethandler/tagrulewidgethandler.cpp
index 3c26ef0..3c26ef0 100644
--- a/mailcommon/search/widgethandler/tagrulewidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/tagrulewidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/tagrulewidgethandler.h b/mailcommon/src/search/widgethandler/tagrulewidgethandler.h
index 4c1b8df..4c1b8df 100644
--- a/mailcommon/search/widgethandler/tagrulewidgethandler.h
+++ b/mailcommon/src/search/widgethandler/tagrulewidgethandler.h
diff --git a/mailcommon/search/widgethandler/textrulerwidgethandler.cpp b/mailcommon/src/search/widgethandler/textrulerwidgethandler.cpp
index 56e7aeb..56e7aeb 100644
--- a/mailcommon/search/widgethandler/textrulerwidgethandler.cpp
+++ b/mailcommon/src/search/widgethandler/textrulerwidgethandler.cpp
diff --git a/mailcommon/search/widgethandler/textrulerwidgethandler.h b/mailcommon/src/search/widgethandler/textrulerwidgethandler.h
index e3777dd..e3777dd 100644
--- a/mailcommon/search/widgethandler/textrulerwidgethandler.h
+++ b/mailcommon/src/search/widgethandler/textrulerwidgethandler.h
diff --git a/mailcommon/settings.kcfg b/mailcommon/src/settings.kcfg
index e1b7d40..e1b7d40 100644
--- a/mailcommon/settings.kcfg
+++ b/mailcommon/src/settings.kcfg
diff --git a/mailcommon/settings/mailcommon.kcfg b/mailcommon/src/settings/mailcommon.kcfg
index 83cd5f2..83cd5f2 100644
--- a/mailcommon/settings/mailcommon.kcfg
+++ b/mailcommon/src/settings/mailcommon.kcfg
diff --git a/mailcommon/settings/mailcommonsettings_base.kcfgc b/mailcommon/src/settings/mailcommonsettings_base.kcfgc
index 8c4b348..8c4b348 100644
--- a/mailcommon/settings/mailcommonsettings_base.kcfgc
+++ b/mailcommon/src/settings/mailcommonsettings_base.kcfgc
diff --git a/mailcommon/snippets/autotests/CMakeLists.txt b/mailcommon/src/snippets/autotests/CMakeLists.txt
index a163ede..74b3915 100644
--- a/mailcommon/snippets/autotests/CMakeLists.txt
+++ b/mailcommon/src/snippets/autotests/CMakeLists.txt
@@ -1,4 +1,4 @@
ecm_add_test(snippetsmanagertest.cpp
NAME_PREFIX "mailcommon-snippets-"
- LINK_LIBRARIES Qt5::Test Qt5::Gui mailcommon KF5::XmlGui
+ LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon KF5::XmlGui
)
diff --git a/mailcommon/snippets/autotests/snippetsmanagertest.cpp b/mailcommon/src/snippets/autotests/snippetsmanagertest.cpp
index e3ff24a..e3ff24a 100644
--- a/mailcommon/snippets/autotests/snippetsmanagertest.cpp
+++ b/mailcommon/src/snippets/autotests/snippetsmanagertest.cpp
diff --git a/mailcommon/snippets/autotests/snippetsmanagertest.h b/mailcommon/src/snippets/autotests/snippetsmanagertest.h
index b893216..b893216 100644
--- a/mailcommon/snippets/autotests/snippetsmanagertest.h
+++ b/mailcommon/src/snippets/autotests/snippetsmanagertest.h
diff --git a/mailcommon/snippets/snippetdialog.cpp b/mailcommon/src/snippets/snippetdialog.cpp
index 31dcd78..31dcd78 100644
--- a/mailcommon/snippets/snippetdialog.cpp
+++ b/mailcommon/src/snippets/snippetdialog.cpp
diff --git a/mailcommon/snippets/snippetdialog.h b/mailcommon/src/snippets/snippetdialog.h
index b053252..b053252 100644
--- a/mailcommon/snippets/snippetdialog.h
+++ b/mailcommon/src/snippets/snippetdialog.h
diff --git a/mailcommon/snippets/snippetsmanager.cpp b/mailcommon/src/snippets/snippetsmanager.cpp
index 066b370..066b370 100644
--- a/mailcommon/snippets/snippetsmanager.cpp
+++ b/mailcommon/src/snippets/snippetsmanager.cpp
diff --git a/mailcommon/snippets/snippetsmanager.h b/mailcommon/src/snippets/snippetsmanager.h
index a8b933b..a8b933b 100644
--- a/mailcommon/snippets/snippetsmanager.h
+++ b/mailcommon/src/snippets/snippetsmanager.h
diff --git a/mailcommon/snippets/snippetsmodel.cpp b/mailcommon/src/snippets/snippetsmodel.cpp
index 859f7b6..859f7b6 100644
--- a/mailcommon/snippets/snippetsmodel.cpp
+++ b/mailcommon/src/snippets/snippetsmodel.cpp
diff --git a/mailcommon/snippets/snippetsmodel.h b/mailcommon/src/snippets/snippetsmodel.h
index 5a771be..5a771be 100644
--- a/mailcommon/snippets/snippetsmodel.h
+++ b/mailcommon/src/snippets/snippetsmodel.h
diff --git a/mailcommon/snippets/snippetvariabledialog.cpp b/mailcommon/src/snippets/snippetvariabledialog.cpp
index 13f2da4..13f2da4 100644
--- a/mailcommon/snippets/snippetvariabledialog.cpp
+++ b/mailcommon/src/snippets/snippetvariabledialog.cpp
diff --git a/mailcommon/snippets/snippetvariabledialog.h b/mailcommon/src/snippets/snippetvariabledialog.h
index 2b565ca..2b565ca 100644
--- a/mailcommon/snippets/snippetvariabledialog.h
+++ b/mailcommon/src/snippets/snippetvariabledialog.h
diff --git a/mailcommon/snippets/ui/snippetdialog.ui b/mailcommon/src/snippets/ui/snippetdialog.ui
index 2a43f1f..2a43f1f 100644
--- a/mailcommon/snippets/ui/snippetdialog.ui
+++ b/mailcommon/src/snippets/ui/snippetdialog.ui
diff --git a/mailcommon/tag/addtagdialog.cpp b/mailcommon/src/tag/addtagdialog.cpp
index b4c66cd..7084935 100644
--- a/mailcommon/tag/addtagdialog.cpp
+++ b/mailcommon/src/tag/addtagdialog.cpp
@@ -16,7 +16,7 @@
*/
#include "addtagdialog.h"
-#include "mailcommon/tag/tagwidget.h"
+#include "tag/tagwidget.h"
#include "mailcommon_debug.h"
#include <AkonadiCore/tagcreatejob.h>
diff --git a/mailcommon/tag/addtagdialog.h b/mailcommon/src/tag/addtagdialog.h
index 9311d54..9311d54 100644
--- a/mailcommon/tag/addtagdialog.h
+++ b/mailcommon/src/tag/addtagdialog.h
diff --git a/mailcommon/tag/tag.cpp b/mailcommon/src/tag/tag.cpp
index 45bad11..45bad11 100644
--- a/mailcommon/tag/tag.cpp
+++ b/mailcommon/src/tag/tag.cpp
diff --git a/mailcommon/tag/tag.h b/mailcommon/src/tag/tag.h
index 1c2a023..1c2a023 100644
--- a/mailcommon/tag/tag.h
+++ b/mailcommon/src/tag/tag.h
diff --git a/mailcommon/tag/tagwidget.cpp b/mailcommon/src/tag/tagwidget.cpp
index 920c400..920c400 100644
--- a/mailcommon/tag/tagwidget.cpp
+++ b/mailcommon/src/tag/tagwidget.cpp
diff --git a/mailcommon/tag/tagwidget.h b/mailcommon/src/tag/tagwidget.h
index 59559ea..59559ea 100644
--- a/mailcommon/tag/tagwidget.h
+++ b/mailcommon/src/tag/tagwidget.h
diff --git a/mailcommon/util/kcursorsaver.h b/mailcommon/src/util/kcursorsaver.h
index 4158323..4158323 100644
--- a/mailcommon/util/kcursorsaver.h
+++ b/mailcommon/src/util/kcursorsaver.h
diff --git a/mailcommon/util/mailutil.cpp b/mailcommon/src/util/mailutil.cpp
index ac2c833..ac2c833 100644
--- a/mailcommon/util/mailutil.cpp
+++ b/mailcommon/src/util/mailutil.cpp
diff --git a/mailcommon/util/mailutil.h b/mailcommon/src/util/mailutil.h
index 745c53d..745c53d 100644
--- a/mailcommon/util/mailutil.h
+++ b/mailcommon/src/util/mailutil.h
diff --git a/mailcommon/widgets/favoritecollectionwidget.cpp b/mailcommon/src/widgets/favoritecollectionwidget.cpp
index 13db5e7..13db5e7 100644
--- a/mailcommon/widgets/favoritecollectionwidget.cpp
+++ b/mailcommon/src/widgets/favoritecollectionwidget.cpp
diff --git a/mailcommon/widgets/favoritecollectionwidget.h b/mailcommon/src/widgets/favoritecollectionwidget.h
index 6b993e3..6b993e3 100644
--- a/mailcommon/widgets/favoritecollectionwidget.h
+++ b/mailcommon/src/widgets/favoritecollectionwidget.h
diff --git a/mailcommon/widgets/redirectdialog.cpp b/mailcommon/src/widgets/redirectdialog.cpp
index 738111a..738111a 100644
--- a/mailcommon/widgets/redirectdialog.cpp
+++ b/mailcommon/src/widgets/redirectdialog.cpp
diff --git a/mailcommon/widgets/redirectdialog.h b/mailcommon/src/widgets/redirectdialog.h
index 4cb567c..4cb567c 100644
--- a/mailcommon/widgets/redirectdialog.h
+++ b/mailcommon/src/widgets/redirectdialog.h
diff --git a/mailcommon/widgets/redirectwidget.cpp b/mailcommon/src/widgets/redirectwidget.cpp
index 32e2c65..32e2c65 100644
--- a/mailcommon/widgets/redirectwidget.cpp
+++ b/mailcommon/src/widgets/redirectwidget.cpp
diff --git a/mailcommon/widgets/redirectwidget.h b/mailcommon/src/widgets/redirectwidget.h
index f8f4023..f8f4023 100644
--- a/mailcommon/widgets/redirectwidget.h
+++ b/mailcommon/src/widgets/redirectwidget.h
diff --git a/mboximporter/CMakeLists.txt b/mboximporter/CMakeLists.txt
index 3105362..c51f043 100644
--- a/mboximporter/CMakeLists.txt
+++ b/mboximporter/CMakeLists.txt
@@ -22,7 +22,7 @@ PRIVATE
KF5::AkonadiCore
KF5::IdentityManagement
KF5::MailImporter
- mailcommon
+ KF5::MailCommon
KF5::Completion
)
diff --git a/mboximporter/mboximportkernel.cpp b/mboximporter/mboximportkernel.cpp
index da0cbe8..070d179 100644
--- a/mboximporter/mboximportkernel.cpp
+++ b/mboximporter/mboximportkernel.cpp
@@ -18,7 +18,7 @@
#include "mboximportkernel.h"
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <MailCommon/FolderCollectionMonitor>
#include <AkonadiCore/session.h>
#include <entitytreemodel.h>
#include <entitymimetypefiltermodel.h>
diff --git a/mboximporter/mboximportkernel.h b/mboximporter/mboximportkernel.h
index be527ec..f357efc 100644
--- a/mboximporter/mboximportkernel.h
+++ b/mboximporter/mboximportkernel.h
@@ -18,7 +18,7 @@
#ifndef MBOXIMPORTERKERNEL_H
#define MBOXIMPORTERKERNEL_H
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
namespace Akonadi
{
diff --git a/mboximporter/mboxmainwindow.cpp b/mboximporter/mboxmainwindow.cpp
index 625f009..813540b 100644
--- a/mboximporter/mboxmainwindow.cpp
+++ b/mboximporter/mboxmainwindow.cpp
@@ -23,7 +23,7 @@
#include <mailimporter/filtermbox.h>
#include <mailimporter/importmailswidget.h>
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
#include <KLocalizedString>
#include <QDialogButtonBox>
diff --git a/mboximporter/ui/mboximportwidget.ui b/mboximporter/ui/mboximportwidget.ui
index c75d7ee..25a40d9 100644
--- a/mboximporter/ui/mboximportwidget.ui
+++ b/mboximporter/ui/mboximportwidget.ui
@@ -63,7 +63,7 @@
<customwidget>
<class>MailCommon::FolderRequester</class>
<extends>QWidget</extends>
- <header location="global">mailcommon/folder/folderrequester.h</header>
+ <header location="global">MailCommon/FolderRequester</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/messagecomposer/CMakeLists.txt b/messagecomposer/CMakeLists.txt
index d4971ee..47eb688 100644
--- a/messagecomposer/CMakeLists.txt
+++ b/messagecomposer/CMakeLists.txt
@@ -172,6 +172,7 @@ PRIVATE
)
target_include_directories(messagecomposer PUBLIC "$<BUILD_INTERFACE:${messagecomposer_SOURCE_DIR};${messagecomposer_BINARY_DIR}>")
+target_include_directories(messagecomposer PUBLIC $<TARGET_PROPERTY:KF5::MailCommon,INTERFACE_INCLUDE_DIRECTORIES>)
set_target_properties( messagecomposer PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION} )
diff --git a/messagecomposer/composer/composerviewbase.cpp b/messagecomposer/composer/composerviewbase.cpp
index 606708d..7a4ba48 100644
--- a/messagecomposer/composer/composerviewbase.cpp
+++ b/messagecomposer/composer/composerviewbase.cpp
@@ -48,7 +48,7 @@
#include <viewer/objecttreeemptysource.h>
#include <viewer/objecttreeparser.h>
#ifndef QT_NO_CURSOR
-#include <mailcommon/util/kcursorsaver.h>
+#include <MailCommon/KCursorSaver>
#endif
#include <sonnet/dictionarycombobox.h>
diff --git a/messagecomposer/composer/keyresolver.cpp b/messagecomposer/composer/keyresolver.cpp
index 7e17539..1de4dd3 100644
--- a/messagecomposer/composer/keyresolver.cpp
+++ b/messagecomposer/composer/keyresolver.cpp
@@ -38,7 +38,7 @@
#include "job/savecontactpreferencejob.h"
#ifndef QT_NO_CURSOR
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#endif
#include "kleo_util.h"
diff --git a/messagecomposer/helper/messagefactory.cpp b/messagecomposer/helper/messagefactory.cpp
index 5260751..45ff90d 100644
--- a/messagecomposer/helper/messagefactory.cpp
+++ b/messagecomposer/helper/messagefactory.cpp
@@ -24,7 +24,7 @@
#include <AkonadiCore/item.h>
#ifndef QT_NO_CURSOR
-#include <mailcommon/util/kcursorsaver.h>
+#include <MailCommon/KCursorSaver>
#endif
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
diff --git a/pimsettingexporter/console/CMakeLists.txt b/pimsettingexporter/console/CMakeLists.txt
index 808fa56..5f312bf 100644
--- a/pimsettingexporter/console/CMakeLists.txt
+++ b/pimsettingexporter/console/CMakeLists.txt
@@ -1,6 +1,6 @@
include_directories(${AKONADI_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/mailcommon
+ ${CMAKE_SOURCE_DIR}/KF5::MailCommon
${CMAKE_SOURCE_DIR}/pimcommon
${CMAKE_SOURCE_DIR}/messagecomposer/
${CMAKE_SOURCE_DIR}/pimsettingexporter/core/
diff --git a/pimsettingexporter/core/CMakeLists.txt b/pimsettingexporter/core/CMakeLists.txt
index b752645..8314da7 100644
--- a/pimsettingexporter/core/CMakeLists.txt
+++ b/pimsettingexporter/core/CMakeLists.txt
@@ -78,7 +78,7 @@ PRIVATE
KF5::Mime
KF5::MailTransport
KF5::AlarmCalendar
- mailcommon
+ KF5::MailCommon
KF5::Archive
)
diff --git a/pimsettingexporter/core/abstractimportexportjob.cpp b/pimsettingexporter/core/abstractimportexportjob.cpp
index 1de9a92..71aa884 100644
--- a/pimsettingexporter/core/abstractimportexportjob.cpp
+++ b/pimsettingexporter/core/abstractimportexportjob.cpp
@@ -20,7 +20,7 @@
#include "importexportprogressindicatorbase.h"
#include "synchronizeresourcejob.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "pimcommon/util/createresource.h"
diff --git a/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp b/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp
index dc98719..688e5e8 100644
--- a/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp
+++ b/pimsettingexporter/core/addressbook/exportaddressbookjob.cpp
@@ -16,7 +16,7 @@
*/
#include "exportaddressbookjob.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <AkonadiCore/AgentManager>
diff --git a/pimsettingexporter/core/akregator/exportakregatorjob.cpp b/pimsettingexporter/core/akregator/exportakregatorjob.cpp
index 6097627..13ae944 100644
--- a/pimsettingexporter/core/akregator/exportakregatorjob.cpp
+++ b/pimsettingexporter/core/akregator/exportakregatorjob.cpp
@@ -17,7 +17,7 @@
#include "exportakregatorjob.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <AkonadiCore/AgentManager>
diff --git a/pimsettingexporter/core/alarm/exportalarmjob.cpp b/pimsettingexporter/core/alarm/exportalarmjob.cpp
index e76ac02..807c24a 100644
--- a/pimsettingexporter/core/alarm/exportalarmjob.cpp
+++ b/pimsettingexporter/core/alarm/exportalarmjob.cpp
@@ -17,7 +17,7 @@
#include "exportalarmjob.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <AkonadiCore/AgentManager>
diff --git a/pimsettingexporter/core/blogilo/exportblogilojob.cpp b/pimsettingexporter/core/blogilo/exportblogilojob.cpp
index 2ebba0a..43656ad 100644
--- a/pimsettingexporter/core/blogilo/exportblogilojob.cpp
+++ b/pimsettingexporter/core/blogilo/exportblogilojob.cpp
@@ -17,7 +17,7 @@
#include "exportblogilojob.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <AkonadiCore/AgentManager>
diff --git a/pimsettingexporter/core/calendar/exportcalendarjob.cpp b/pimsettingexporter/core/calendar/exportcalendarjob.cpp
index 47c200e..37ef947 100644
--- a/pimsettingexporter/core/calendar/exportcalendarjob.cpp
+++ b/pimsettingexporter/core/calendar/exportcalendarjob.cpp
@@ -17,7 +17,7 @@
#include "exportcalendarjob.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <AkonadiCore/AgentManager>
diff --git a/pimsettingexporter/core/mail/exportmailjob.cpp b/pimsettingexporter/core/mail/exportmailjob.cpp
index 7b96f47..dfa0ca5 100644
--- a/pimsettingexporter/core/mail/exportmailjob.cpp
+++ b/pimsettingexporter/core/mail/exportmailjob.cpp
@@ -17,10 +17,10 @@
#include "exportmailjob.h"
#include "akonadidatabase.h"
-#include "mailcommon/util/kcursorsaver.h"
-#include "mailcommon/util/mailutil.h"
-#include "mailcommon/filter/filtermanager.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/KCursorSaver"
+#include "MailCommon/MailUtil"
+#include "MailCommon/FilterManager"
+#include "MailCommon/FilterImporterExporter"
#include <AkonadiCore/AgentManager>
#include <AkonadiCore/Collection>
diff --git a/pimsettingexporter/core/mail/importmailjob.cpp b/pimsettingexporter/core/mail/importmailjob.cpp
index a62fe24..3076fbb 100644
--- a/pimsettingexporter/core/mail/importmailjob.cpp
+++ b/pimsettingexporter/core/mail/importmailjob.cpp
@@ -19,12 +19,12 @@
#include "akonadidatabase.h"
#include "archivestorage.h"
-#include "mailcommon/filter/filtermanager.h"
-#include "mailcommon/filter/filterimporterexporter.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/FilterManager"
+#include "MailCommon/FilterImporterExporter"
+#include "MailCommon/MailUtil"
#include "pimcommon/util/createresource.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <MailTransport/mailtransport/transportmanager.h>
diff --git a/pimsettingexporter/core/notes/exportnotesjob.cpp b/pimsettingexporter/core/notes/exportnotesjob.cpp
index fdd7572..961ad41 100644
--- a/pimsettingexporter/core/notes/exportnotesjob.cpp
+++ b/pimsettingexporter/core/notes/exportnotesjob.cpp
@@ -17,7 +17,7 @@
#include "exportnotesjob.h"
-#include "mailcommon/util/kcursorsaver.h"
+#include "MailCommon/KCursorSaver"
#include <AkonadiCore/AgentManager>
diff --git a/pimsettingexporter/core/pimsettingexporterkernel.cpp b/pimsettingexporter/core/pimsettingexporterkernel.cpp
index e191de1..157d306 100644
--- a/pimsettingexporter/core/pimsettingexporterkernel.cpp
+++ b/pimsettingexporter/core/pimsettingexporterkernel.cpp
@@ -23,7 +23,7 @@
#include <kalarmcal/kacalendar.h>
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <messagecomposer/sender/akonadisender.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <MailCommon/FolderCollectionMonitor>
#include <AkonadiCore/session.h>
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
diff --git a/pimsettingexporter/core/pimsettingexporterkernel.h b/pimsettingexporter/core/pimsettingexporterkernel.h
index 50716ca..e55b95a 100644
--- a/pimsettingexporter/core/pimsettingexporterkernel.h
+++ b/pimsettingexporter/core/pimsettingexporterkernel.h
@@ -17,7 +17,7 @@
#ifndef PIMSETTINGEXPORTERKERNEL_H
#define PIMSETTINGEXPORTERKERNEL_H
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
#include "pimsettingexporter_export.h"
namespace Akonadi
diff --git a/pimsettingexporter/core/tests/CMakeLists.txt b/pimsettingexporter/core/tests/CMakeLists.txt
index 924b75f..c2979a7 100644
--- a/pimsettingexporter/core/tests/CMakeLists.txt
+++ b/pimsettingexporter/core/tests/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(selectiontreewidget_gui ${selectiontreewidget_gui_SRCS})
target_link_libraries(selectiontreewidget_gui
KF5::AkonadiCore
KF5::AkonadiPrivate
- mailcommon
+ KF5::MailCommon
pimcommon
KF5::Archive
)
@@ -14,7 +14,7 @@ add_executable(showarchivestructuredialog_gui ${showarchivestructuredialog_gui_S
target_link_libraries(showarchivestructuredialog_gui
KF5::AkonadiCore
KF5::AkonadiPrivate
- mailcommon
+ KF5::MailCommon
pimcommon
KF5::Archive
)
diff --git a/pimsettingexporter/core/utils.cpp b/pimsettingexporter/core/utils.cpp
index 47e116c..d5bd7db 100644
--- a/pimsettingexporter/core/utils.cpp
+++ b/pimsettingexporter/core/utils.cpp
@@ -17,7 +17,7 @@
#include "utils.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
#include "pimcommon/util/pimutil.h"
#include <akonadi/private/xdgbasedirs_p.h>
diff --git a/pimsettingexporter/gui/CMakeLists.txt b/pimsettingexporter/gui/CMakeLists.txt
index ef75a47..f41997d 100644
--- a/pimsettingexporter/gui/CMakeLists.txt
+++ b/pimsettingexporter/gui/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(pimsettingexporter
PRIVATE
KF5::XmlGui
KF5::DBusAddons
- mailcommon
+ KF5::MailCommon
pimcommon
KF5::Libkdepim
pimsettingexporterprivate
diff --git a/pimsettingexporter/gui/pimsettingexporterwindow.cpp b/pimsettingexporter/gui/pimsettingexporterwindow.cpp
index be2bc42..0e7614a 100644
--- a/pimsettingexporter/gui/pimsettingexporterwindow.cpp
+++ b/pimsettingexporter/gui/pimsettingexporterwindow.cpp
@@ -28,8 +28,8 @@
#include "dialog/backupfilestructureinfodialog.h"
-#include <mailcommon/kernel/mailkernel.h>
-#include <mailcommon/filter/filtermanager.h>
+#include <MailCommon/MailKernel>
+#include <MailCommon/FilterManager>
#include "pimcommon/util/pimutil.h"