Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
PIM Messagelib
Commits
79949843
Commit
79949843
authored
Jun 09, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Coding style
parent
c21489ac
Changes
215
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
215 changed files
with
3100 additions
and
2126 deletions
+3100
-2126
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp
...eviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp
+6
-6
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
...ageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
+0
-1
messageviewer/autotests/messagedisplayformatattributetest.cpp
...ageviewer/autotests/messagedisplayformatattributetest.cpp
+0
-3
messageviewer/autotests/setupenv.cpp
messageviewer/autotests/setupenv.cpp
+2
-2
messageviewer/autotests/setupenv.h
messageviewer/autotests/setupenv.h
+2
-8
messageviewer/autotests/viewergrantleethemesupporttest.cpp
messageviewer/autotests/viewergrantleethemesupporttest.cpp
+2
-2
messageviewer/autotests/viewertest.cpp
messageviewer/autotests/viewertest.cpp
+29
-26
messageviewer/autotests/zoomactionmenutest.cpp
messageviewer/autotests/zoomactionmenutest.cpp
+0
-2
messageviewer/src/antispam/antispamconfig.cpp
messageviewer/src/antispam/antispamconfig.cpp
+7
-7
messageviewer/src/antispam/antispamconfig.h
messageviewer/src/antispam/antispamconfig.h
+23
-9
messageviewer/src/antispam/spamheaderanalyzer.cpp
messageviewer/src/antispam/spamheaderanalyzer.cpp
+3
-2
messageviewer/src/antispam/spamheaderanalyzer.h
messageviewer/src/antispam/spamheaderanalyzer.h
+16
-11
messageviewer/src/findbar/findbarsourceview.cpp
messageviewer/src/findbar/findbarsourceview.cpp
+2
-2
messageviewer/src/findbar/findbarsourceview.h
messageviewer/src/findbar/findbarsourceview.h
+2
-3
messageviewer/src/header/contactdisplaymessagememento.cpp
messageviewer/src/header/contactdisplaymessagememento.cpp
+27
-15
messageviewer/src/header/contactdisplaymessagememento.h
messageviewer/src/header/contactdisplaymessagememento.h
+5
-10
messageviewer/src/header/grantleeheaderformatter.cpp
messageviewer/src/header/grantleeheaderformatter.cpp
+123
-41
messageviewer/src/header/grantleeheaderformatter.h
messageviewer/src/header/grantleeheaderformatter.h
+14
-11
messageviewer/src/header/grantleeheaderstyle.cpp
messageviewer/src/header/grantleeheaderstyle.cpp
+5
-4
messageviewer/src/header/grantleeheaderstyle.h
messageviewer/src/header/grantleeheaderstyle.h
+1
-2
messageviewer/src/header/grantleeheaderteststyle.cpp
messageviewer/src/header/grantleeheaderteststyle.cpp
+5
-4
messageviewer/src/header/grantleeheaderteststyle.h
messageviewer/src/header/grantleeheaderteststyle.h
+1
-2
messageviewer/src/header/headerstrategy.cpp
messageviewer/src/header/headerstrategy.cpp
+0
-2
messageviewer/src/header/headerstrategy.h
messageviewer/src/header/headerstrategy.h
+4
-6
messageviewer/src/header/headerstyle.cpp
messageviewer/src/header/headerstyle.cpp
+8
-9
messageviewer/src/header/headerstyle.h
messageviewer/src/header/headerstyle.h
+4
-8
messageviewer/src/header/headerstyle_util.cpp
messageviewer/src/header/headerstyle_util.cpp
+133
-69
messageviewer/src/header/headerstyle_util.h
messageviewer/src/header/headerstyle_util.h
+9
-7
messageviewer/src/header/headerstyleinterface.cpp
messageviewer/src/header/headerstyleinterface.cpp
+4
-4
messageviewer/src/header/headerstyleinterface.h
messageviewer/src/header/headerstyleinterface.h
+3
-3
messageviewer/src/header/headerstylemenumanager.cpp
messageviewer/src/header/headerstylemenumanager.cpp
+34
-19
messageviewer/src/header/headerstylemenumanager.h
messageviewer/src/header/headerstylemenumanager.h
+1
-2
messageviewer/src/header/headerstyleplugin.cpp
messageviewer/src/header/headerstyleplugin.cpp
+3
-4
messageviewer/src/header/headerstyleplugin.h
messageviewer/src/header/headerstyleplugin.h
+3
-3
messageviewer/src/header/headerstylepluginmanager.cpp
messageviewer/src/header/headerstylepluginmanager.cpp
+29
-18
messageviewer/src/header/headerstylepluginmanager.h
messageviewer/src/header/headerstylepluginmanager.h
+1
-2
messageviewer/src/header/kxface.cpp
messageviewer/src/header/kxface.cpp
+90
-51
messageviewer/src/header/kxface.h
messageviewer/src/header/kxface.h
+7
-10
messageviewer/src/header/plainheaderstyle.cpp
messageviewer/src/header/plainheaderstyle.cpp
+51
-28
messageviewer/src/header/plainheaderstyle.h
messageviewer/src/header/plainheaderstyle.h
+1
-2
messageviewer/src/header/richheaderstrategy.cpp
messageviewer/src/header/richheaderstrategy.cpp
+2
-4
messageviewer/src/header/richheaderstrategy.h
messageviewer/src/header/richheaderstrategy.h
+3
-4
messageviewer/src/htmlwriter/autotests/webengineembedparttest.cpp
...iewer/src/htmlwriter/autotests/webengineembedparttest.cpp
+0
-2
messageviewer/src/htmlwriter/autotests/webengineparthtmlwritertest.cpp
.../src/htmlwriter/autotests/webengineparthtmlwritertest.cpp
+43
-20
messageviewer/src/htmlwriter/teehtmlwriter.cpp
messageviewer/src/htmlwriter/teehtmlwriter.cpp
+5
-4
messageviewer/src/htmlwriter/teehtmlwriter.h
messageviewer/src/htmlwriter/teehtmlwriter.h
+1
-4
messageviewer/src/htmlwriter/webengineembedpart.cpp
messageviewer/src/htmlwriter/webengineembedpart.cpp
+0
-2
messageviewer/src/htmlwriter/webengineembedpart.h
messageviewer/src/htmlwriter/webengineembedpart.h
+1
-2
messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp
messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp
+5
-4
messageviewer/src/htmlwriter/webengineparthtmlwriter.h
messageviewer/src/htmlwriter/webengineparthtmlwriter.h
+2
-6
messageviewer/src/interfaces/bodyparturlhandler.h
messageviewer/src/interfaces/bodyparturlhandler.h
+15
-18
messageviewer/src/interfaces/urlhandler.h
messageviewer/src/interfaces/urlhandler.h
+7
-9
messageviewer/src/job/attachmenteditjob.cpp
messageviewer/src/job/attachmenteditjob.cpp
+19
-13
messageviewer/src/job/attachmenteditjob.h
messageviewer/src/job/attachmenteditjob.h
+2
-4
messageviewer/src/job/modifymessagedisplayformatjob.cpp
messageviewer/src/job/modifymessagedisplayformatjob.cpp
+8
-8
messageviewer/src/job/modifymessagedisplayformatjob.h
messageviewer/src/job/modifymessagedisplayformatjob.h
+1
-2
messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.cpp
...rtthemes/default/autotests/converthtmltoplaintexttest.cpp
+8
-6
messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp
...sagepartthemes/default/autotests/objecttreeparsertest.cpp
+34
-21
messageviewer/src/messagepartthemes/default/autotests/quotehtmltest.cpp
...src/messagepartthemes/default/autotests/quotehtmltest.cpp
+81
-56
messageviewer/src/messagepartthemes/default/autotests/rendertest.cpp
...er/src/messagepartthemes/default/autotests/rendertest.cpp
+68
-21
messageviewer/src/messagepartthemes/default/autotests/setupenv.cpp
...ewer/src/messagepartthemes/default/autotests/setupenv.cpp
+2
-2
messageviewer/src/messagepartthemes/default/autotests/setupenv.h
...viewer/src/messagepartthemes/default/autotests/setupenv.h
+19
-19
messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp
...src/messagepartthemes/default/autotests/testcsshelper.cpp
+8
-9
messageviewer/src/messagepartthemes/default/autotests/testcsshelper.h
...r/src/messagepartthemes/default/autotests/testcsshelper.h
+2
-6
messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp
...gepartthemes/default/autotests/unencryptedmessagetest.cpp
+76
-39
messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.h
...sagepartthemes/default/autotests/unencryptedmessagetest.h
+1
-1
messageviewer/src/messagepartthemes/default/autotests/util.h
messageviewer/src/messagepartthemes/default/autotests/util.h
+44
-19
messageviewer/src/messagepartthemes/default/converthtmltoplaintext.cpp
.../src/messagepartthemes/default/converthtmltoplaintext.cpp
+0
-2
messageviewer/src/messagepartthemes/default/converthtmltoplaintext.h
...er/src/messagepartthemes/default/converthtmltoplaintext.h
+1
-2
messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
...eviewer/src/messagepartthemes/default/defaultrenderer.cpp
+152
-83
messageviewer/src/messagepartthemes/default/defaultrenderer.h
...ageviewer/src/messagepartthemes/default/defaultrenderer.h
+6
-9
messageviewer/src/messagepartthemes/default/defaultrenderer_p.h
...eviewer/src/messagepartthemes/default/defaultrenderer_p.h
+10
-11
messageviewer/src/messagepartthemes/default/htmlblock.cpp
messageviewer/src/messagepartthemes/default/htmlblock.cpp
+1
-1
messageviewer/src/messagepartthemes/default/htmlblock.h
messageviewer/src/messagepartthemes/default/htmlblock.h
+2
-5
messageviewer/src/messagepartthemes/default/messagepartrendererbase.h
...r/src/messagepartthemes/default/messagepartrendererbase.h
+7
-7
messageviewer/src/messagepartthemes/default/messagepartrendererfactorybase.cpp
...sagepartthemes/default/messagepartrendererfactorybase.cpp
+9
-5
messageviewer/src/messagepartthemes/default/messagepartrendererfactorybase.h
...essagepartthemes/default/messagepartrendererfactorybase.h
+1
-4
messageviewer/src/messagepartthemes/default/messagepartrendererfactorybase_p.h
...sagepartthemes/default/messagepartrendererfactorybase_p.h
+2
-4
messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
.../messagepartthemes/default/messagepartrenderermanager.cpp
+13
-9
messageviewer/src/messagepartthemes/default/messagepartrenderermanager.h
...rc/messagepartthemes/default/messagepartrenderermanager.h
+2
-5
messageviewer/src/messagepartthemes/default/partrendered.cpp
messageviewer/src/messagepartthemes/default/partrendered.cpp
+58
-21
messageviewer/src/messagepartthemes/default/partrendered.h
messageviewer/src/messagepartthemes/default/partrendered.h
+10
-12
messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
...tthemes/default/plugins/attachmentmessagepartrenderer.cpp
+12
-5
messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.h
...artthemes/default/plugins/attachmentmessagepartrenderer.h
+3
-1
messageviewer/src/messagepartthemes/default/plugins/messagepartrenderer.cpp
...messagepartthemes/default/plugins/messagepartrenderer.cpp
+7
-2
messageviewer/src/messagepartthemes/default/plugins/messagepartrenderer.h
...c/messagepartthemes/default/plugins/messagepartrenderer.h
+3
-1
messageviewer/src/messagepartthemes/default/plugins/plugins.cpp
...eviewer/src/messagepartthemes/default/plugins/plugins.cpp
+2
-1
messageviewer/src/messagepartthemes/default/plugins/quotehtml.cpp
...iewer/src/messagepartthemes/default/plugins/quotehtml.cpp
+33
-18
messageviewer/src/messagepartthemes/default/plugins/quotehtml.h
...eviewer/src/messagepartthemes/default/plugins/quotehtml.h
+6
-8
messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
...agepartthemes/default/plugins/textmessagepartrenderer.cpp
+4
-1
messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.h
...ssagepartthemes/default/plugins/textmessagepartrenderer.h
+3
-1
messageviewer/src/messagepartthemes/default/rendererpluginfactorysingleton.cpp
...sagepartthemes/default/rendererpluginfactorysingleton.cpp
+2
-1
messageviewer/src/messagepartthemes/default/rendererpluginfactorysingleton.h
...essagepartthemes/default/rendererpluginfactorysingleton.h
+1
-2
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstrategy.cpp
...antleeheaderstyleplugin/defaultgrantleeheaderstrategy.cpp
+0
-2
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstrategy.h
...grantleeheaderstyleplugin/defaultgrantleeheaderstrategy.h
+2
-2
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
...headerstyleplugin/defaultgrantleeheaderstyleinterface.cpp
+16
-9
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.h
...eeheaderstyleplugin/defaultgrantleeheaderstyleinterface.h
+3
-5
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp
...leeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp
+17
-8
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.h
...ntleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.h
+5
-4
messageviewer/src/scamdetection/autotests/scamattributetest.cpp
...eviewer/src/scamdetection/autotests/scamattributetest.cpp
+0
-2
messageviewer/src/scamdetection/autotests/scamdetectionwebenginetest.cpp
...rc/scamdetection/autotests/scamdetectionwebenginetest.cpp
+46
-21
messageviewer/src/scamdetection/autotests/scamdetectionwebenginetest.h
.../src/scamdetection/autotests/scamdetectionwebenginetest.h
+1
-2
messageviewer/src/scamdetection/scamattribute.cpp
messageviewer/src/scamdetection/scamattribute.cpp
+2
-1
messageviewer/src/scamdetection/scamattribute.h
messageviewer/src/scamdetection/scamattribute.h
+1
-2
messageviewer/src/scamdetection/scamcheckshorturl.cpp
messageviewer/src/scamdetection/scamcheckshorturl.cpp
+6
-3
messageviewer/src/scamdetection/scamcheckshorturl.h
messageviewer/src/scamdetection/scamcheckshorturl.h
+1
-2
messageviewer/src/scamdetection/scamcheckshorturlmanager.cpp
messageviewer/src/scamdetection/scamcheckshorturlmanager.cpp
+3
-3
messageviewer/src/scamdetection/scamcheckshorturlmanager.h
messageviewer/src/scamdetection/scamcheckshorturlmanager.h
+1
-2
messageviewer/src/scamdetection/scamdetectiondetailsdialog.cpp
...geviewer/src/scamdetection/scamdetectiondetailsdialog.cpp
+7
-4
messageviewer/src/scamdetection/scamdetectiondetailsdialog.h
messageviewer/src/scamdetection/scamdetectiondetailsdialog.h
+2
-4
messageviewer/src/scamdetection/scamdetectionwarningwidget.cpp
...geviewer/src/scamdetection/scamdetectionwarningwidget.cpp
+7
-6
messageviewer/src/scamdetection/scamdetectionwarningwidget.h
messageviewer/src/scamdetection/scamdetectionwarningwidget.h
+1
-2
messageviewer/src/scamdetection/scamdetectionwebengine.cpp
messageviewer/src/scamdetection/scamdetectionwebengine.cpp
+33
-19
messageviewer/src/scamdetection/scamdetectionwebengine.h
messageviewer/src/scamdetection/scamdetectionwebengine.h
+1
-2
messageviewer/src/scamdetection/scamexpandurljob.cpp
messageviewer/src/scamdetection/scamexpandurljob.cpp
+16
-8
messageviewer/src/scamdetection/scamexpandurljob.h
messageviewer/src/scamdetection/scamexpandurljob.h
+1
-2
messageviewer/src/scamdetection/tests/scamdetectionwebengine_gui.cpp
...er/src/scamdetection/tests/scamdetectionwebengine_gui.cpp
+17
-9
messageviewer/src/scamdetection/tests/scamdetectionwebengine_gui.h
...ewer/src/scamdetection/tests/scamdetectionwebengine_gui.h
+1
-2
messageviewer/src/settings/messageviewersettings.cpp
messageviewer/src/settings/messageviewersettings.cpp
+0
-1
messageviewer/src/settings/messageviewersettings.h
messageviewer/src/settings/messageviewersettings.h
+1
-5
messageviewer/src/utils/iconnamecache.cpp
messageviewer/src/utils/iconnamecache.cpp
+5
-2
messageviewer/src/utils/iconnamecache.h
messageviewer/src/utils/iconnamecache.h
+2
-5
messageviewer/src/utils/markmessagereadhandler.cpp
messageviewer/src/utils/markmessagereadhandler.cpp
+4
-2
messageviewer/src/utils/markmessagereadhandler.h
messageviewer/src/utils/markmessagereadhandler.h
+3
-5
messageviewer/src/utils/messageviewerutil.cpp
messageviewer/src/utils/messageviewerutil.cpp
+94
-48
messageviewer/src/utils/messageviewerutil.h
messageviewer/src/utils/messageviewerutil.h
+9
-12
messageviewer/src/utils/messageviewerutil_p.h
messageviewer/src/utils/messageviewerutil_p.h
+2
-6
messageviewer/src/utils/mimetype.cpp
messageviewer/src/utils/mimetype.cpp
+11
-6
messageviewer/src/utils/mimetype.h
messageviewer/src/utils/mimetype.h
+5
-11
messageviewer/src/viewer/bodypartformatterfactory.cpp
messageviewer/src/viewer/bodypartformatterfactory.cpp
+5
-6
messageviewer/src/viewer/bodypartformatterfactory.h
messageviewer/src/viewer/bodypartformatterfactory.h
+3
-5
messageviewer/src/viewer/bodypartformatterfactorysingleton.cpp
...geviewer/src/viewer/bodypartformatterfactorysingleton.cpp
+4
-2
messageviewer/src/viewer/bodypartformatterfactorysingleton.h
messageviewer/src/viewer/bodypartformatterfactorysingleton.h
+2
-4
messageviewer/src/viewer/csshelper.cpp
messageviewer/src/viewer/csshelper.cpp
+32
-26
messageviewer/src/viewer/csshelper.h
messageviewer/src/viewer/csshelper.h
+1
-4
messageviewer/src/viewer/csshelperbase.cpp
messageviewer/src/viewer/csshelperbase.cpp
+17
-19
messageviewer/src/viewer/csshelperbase.h
messageviewer/src/viewer/csshelperbase.h
+1
-5
messageviewer/src/viewer/editorwatcher.cpp
messageviewer/src/viewer/editorwatcher.cpp
+26
-23
messageviewer/src/viewer/editorwatcher.h
messageviewer/src/viewer/editorwatcher.h
+3
-6
messageviewer/src/viewer/messagedisplayformatattribute.cpp
messageviewer/src/viewer/messagedisplayformatattribute.cpp
+5
-4
messageviewer/src/viewer/messagedisplayformatattribute.h
messageviewer/src/viewer/messagedisplayformatattribute.h
+1
-2
messageviewer/src/viewer/mimeparttree/mimeparttreeview.h
messageviewer/src/viewer/mimeparttree/mimeparttreeview.h
+1
-2
messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp
messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp
+18
-11
messageviewer/src/viewer/mimeparttree/mimetreemodel.h
messageviewer/src/viewer/mimeparttree/mimetreemodel.h
+6
-8
messageviewer/src/viewer/objecttreeemptysource.cpp
messageviewer/src/viewer/objecttreeemptysource.cpp
+10
-11
messageviewer/src/viewer/objecttreeemptysource.h
messageviewer/src/viewer/objecttreeemptysource.h
+5
-6
messageviewer/src/viewer/objecttreeviewersource.cpp
messageviewer/src/viewer/objecttreeviewersource.cpp
+12
-6
messageviewer/src/viewer/objecttreeviewersource.h
messageviewer/src/viewer/objecttreeviewersource.h
+6
-8
messageviewer/src/viewer/pluginloader.h
messageviewer/src/viewer/pluginloader.h
+12
-9
messageviewer/src/viewer/pluginloaderbase.cpp
messageviewer/src/viewer/pluginloaderbase.cpp
+32
-13
messageviewer/src/viewer/pluginloaderbase.h
messageviewer/src/viewer/pluginloaderbase.h
+12
-5
messageviewer/src/viewer/stl_util.h
messageviewer/src/viewer/stl_util.h
+3
-6
messageviewer/src/viewer/urlhandlermanager.cpp
messageviewer/src/viewer/urlhandlermanager.cpp
+185
-103
messageviewer/src/viewer/urlhandlermanager.h
messageviewer/src/viewer/urlhandlermanager.h
+6
-11
messageviewer/src/viewer/viewer.cpp
messageviewer/src/viewer/viewer.cpp
+9
-10
messageviewer/src/viewer/viewer.h
messageviewer/src/viewer/viewer.h
+22
-19
messageviewer/src/viewer/viewer_p.cpp
messageviewer/src/viewer/viewer_p.cpp
+445
-260
messageviewer/src/viewer/viewer_p.h
messageviewer/src/viewer/viewer_p.h
+26
-23
messageviewer/src/viewer/webengine/autotests/mailwebenginescripttest.cpp
...rc/viewer/webengine/autotests/mailwebenginescripttest.cpp
+9
-5
messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.cpp
...esurlinterceptor/blockexternalresourcesurlinterceptor.cpp
+18
-19
messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.h
...rcesurlinterceptor/blockexternalresourcesurlinterceptor.h
+3
-3
messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/loadexternalreferencesurlinterceptor.cpp
...esurlinterceptor/loadexternalreferencesurlinterceptor.cpp
+5
-6
messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/loadexternalreferencesurlinterceptor.h
...rcesurlinterceptor/loadexternalreferencesurlinterceptor.h
+3
-3
messageviewer/src/viewer/webengine/cidreferencesurlinterceptor/cidreferencesurlinterceptor.cpp
...dreferencesurlinterceptor/cidreferencesurlinterceptor.cpp
+2
-2
messageviewer/src/viewer/webengine/cidreferencesurlinterceptor/cidreferencesurlinterceptor.h
...cidreferencesurlinterceptor/cidreferencesurlinterceptor.h
+1
-2
messageviewer/src/viewer/webengine/loadexternalreferencesurlinterceptor/loadexternalreferencesurlinterceptor.cpp
...esurlinterceptor/loadexternalreferencesurlinterceptor.cpp
+5
-6
messageviewer/src/viewer/webengine/loadexternalreferencesurlinterceptor/loadexternalreferencesurlinterceptor.h
...ncesurlinterceptor/loadexternalreferencesurlinterceptor.h
+3
-3
messageviewer/src/viewer/webengine/mailwebenginepage.cpp
messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+2
-3
messageviewer/src/viewer/webengine/mailwebenginepage.h
messageviewer/src/viewer/webengine/mailwebenginepage.h
+1
-2
messageviewer/src/viewer/webengine/mailwebenginescript.cpp
messageviewer/src/viewer/webengine/mailwebenginescript.cpp
+21
-17
messageviewer/src/viewer/webengine/mailwebenginescript.h
messageviewer/src/viewer/webengine/mailwebenginescript.h
+2
-4
messageviewer/src/viewer/webengine/mailwebengineview.cpp
messageviewer/src/viewer/webengine/mailwebengineview.cpp
+39
-26
messageviewer/src/viewer/webengine/mailwebengineview.h
messageviewer/src/viewer/webengine/mailwebengineview.h
+2
-4
messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.cpp
...viewer/webengine/tests/testjquerysupportmailwebengine.cpp
+4
-3
messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.h
...c/viewer/webengine/tests/testjquerysupportmailwebengine.h
+1
-2
messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
...ewer/src/viewer/webengine/tests/testmaildndattachment.cpp
+3
-3
messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
...ewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
+2
-2
messageviewer/src/viewer/webengine/tests/testmailwebengine.cpp
...geviewer/src/viewer/webengine/tests/testmailwebengine.cpp
+10
-5
messageviewer/src/viewer/webengine/tests/testmailwebengine.h
messageviewer/src/viewer/webengine/tests/testmailwebengine.h
+1
-2
messageviewer/src/viewer/webengine/tests/testmailwebengineselection.cpp
...src/viewer/webengine/tests/testmailwebengineselection.cpp
+11
-7
messageviewer/src/viewer/webengine/tests/testmailwebengineselection.h
...r/src/viewer/webengine/tests/testmailwebengineselection.h
+1
-2
messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.cpp
...wer/src/viewer/webengine/tests/testwebengineaccesskey.cpp
+2
-4
messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.h
...iewer/src/viewer/webengine/tests/testwebengineaccesskey.h
+1
-2
messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.cpp
...ewer/webengine/tests/testwebenginescrolladdattachment.cpp
+2
-2
messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.h
...viewer/webengine/tests/testwebenginescrolladdattachment.h
+1
-2
messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
+10
-7
messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
+1
-2
messageviewer/src/viewerplugins/viewerplugin.cpp
messageviewer/src/viewerplugins/viewerplugin.cpp
+3
-5
messageviewer/src/viewerplugins/viewerplugin.h
messageviewer/src/viewerplugins/viewerplugin.h
+3
-3
messageviewer/src/viewerplugins/viewerplugininterface.cpp
messageviewer/src/viewerplugins/viewerplugininterface.cpp
+2
-4
messageviewer/src/viewerplugins/viewerplugininterface.h
messageviewer/src/viewerplugins/viewerplugininterface.h
+1
-2
messageviewer/src/viewerplugins/viewerpluginmanager.cpp
messageviewer/src/viewerplugins/viewerpluginmanager.cpp
+22
-15
messageviewer/src/viewerplugins/viewerpluginmanager.h
messageviewer/src/viewerplugins/viewerpluginmanager.h
+1
-2
messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp
messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp
+18
-13
messageviewer/src/viewerplugins/viewerplugintoolmanager.h
messageviewer/src/viewerplugins/viewerplugintoolmanager.h
+3
-3
messageviewer/src/widgets/attachmentdialog.cpp
messageviewer/src/widgets/attachmentdialog.cpp
+6
-4
messageviewer/src/widgets/attachmentdialog.h
messageviewer/src/widgets/attachmentdialog.h
+3
-6
messageviewer/src/widgets/configurewidget.cpp
messageviewer/src/widgets/configurewidget.cpp
+14
-10
messageviewer/src/widgets/configurewidget.h
messageviewer/src/widgets/configurewidget.h
+1
-4
messageviewer/src/widgets/htmlstatusbar.cpp
messageviewer/src/widgets/htmlstatusbar.cpp
+5
-4
messageviewer/src/widgets/htmlstatusbar.h
messageviewer/src/widgets/htmlstatusbar.h
+1
-4
messageviewer/src/widgets/invitationsettings.cpp
messageviewer/src/widgets/invitationsettings.cpp
+59
-30
messageviewer/src/widgets/invitationsettings.h
messageviewer/src/widgets/invitationsettings.h
+2
-4
messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
...ageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
+20
-13
messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
+5
-8
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
+11
-8
messageviewer/src/widgets/mailsourcewebengineviewer.h
messageviewer/src/widgets/mailsourcewebengineviewer.h
+1
-3
messageviewer/src/widgets/openattachmentfolderwidget.cpp
messageviewer/src/widgets/openattachmentfolderwidget.cpp
+4
-3
messageviewer/src/widgets/openattachmentfolderwidget.h
messageviewer/src/widgets/openattachmentfolderwidget.h
+1
-2
messageviewer/src/widgets/printingsettings.cpp
messageviewer/src/widgets/printingsettings.cpp
+27
-15
messageviewer/src/widgets/printingsettings.h
messageviewer/src/widgets/printingsettings.h
+1
-2
messageviewer/src/widgets/submittedformwarningwidget.h
messageviewer/src/widgets/submittedformwarningwidget.h
+1
-2
messageviewer/src/widgets/vcardviewer.cpp
messageviewer/src/widgets/vcardviewer.cpp
+2
-3
messageviewer/src/widgets/vcardviewer.h
messageviewer/src/widgets/vcardviewer.h
+2
-7
messageviewer/tests/viewertest_gui.cpp
messageviewer/tests/viewertest_gui.cpp
+12
-5
No files found.
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.cpp
View file @
79949843
...
...
@@ -24,29 +24,29 @@
MailSourceViewTextBrowserWidgetTest
::
MailSourceViewTextBrowserWidgetTest
(
QObject
*
parent
)
:
QObject
(
parent
)
{
}
MailSourceViewTextBrowserWidgetTest
::~
MailSourceViewTextBrowserWidgetTest
()
{
}
void
MailSourceViewTextBrowserWidgetTest
::
shouldHaveDefaultValue
()
{
MessageViewer
::
MailSourceViewTextBrowserWidget
widget
(
QStringLiteral
(
"Email"
));
MessageViewer
::
MailSourceViewTextBrowser
*
textbrowser
=
widget
.
findChild
<
MessageViewer
::
MailSourceViewTextBrowser
*>
(
QStringLiteral
(
"textbrowser"
));
MessageViewer
::
MailSourceViewTextBrowser
*
textbrowser
=
widget
.
findChild
<
MessageViewer
::
MailSourceViewTextBrowser
*>
(
QStringLiteral
(
"textbrowser"
));
QVERIFY
(
textbrowser
);
QVERIFY
(
!
textbrowser
->
isHidden
());
MessageViewer
::
FindBarSourceView
*
findbar
=
widget
.
findChild
<
MessageViewer
::
FindBarSourceView
*>
(
QStringLiteral
(
"findbar"
));
MessageViewer
::
FindBarSourceView
*
findbar
=
widget
.
findChild
<
MessageViewer
::
FindBarSourceView
*>
(
QStringLiteral
(
"findbar"
));
QVERIFY
(
findbar
);
QVERIFY
(
findbar
->
isHidden
());
KPIMTextEdit
::
TextToSpeechWidget
*
texttospeechwidget
=
widget
.
findChild
<
KPIMTextEdit
::
TextToSpeechWidget
*>
(
QStringLiteral
(
"texttospeech"
));
KPIMTextEdit
::
TextToSpeechWidget
*
texttospeechwidget
=
widget
.
findChild
<
KPIMTextEdit
::
TextToSpeechWidget
*>
(
QStringLiteral
(
"texttospeech"
));
QVERIFY
(
texttospeechwidget
);
QVERIFY
(
texttospeechwidget
->
isHidden
());
}
QTEST_MAIN
(
MailSourceViewTextBrowserWidgetTest
)
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
View file @
79949843
...
...
@@ -31,4 +31,3 @@ private Q_SLOTS:
};
#endif // MAILSOURCEVIEWTEXTBROWSERWIDGETTEST_H
messageviewer/autotests/messagedisplayformatattributetest.cpp
View file @
79949843
...
...
@@ -25,12 +25,10 @@
MessageDisplayFormatAttributeTest
::
MessageDisplayFormatAttributeTest
(
QObject
*
parent
)
:
QObject
(
parent
)
{
}
MessageDisplayFormatAttributeTest
::~
MessageDisplayFormatAttributeTest
()
{
}
void
MessageDisplayFormatAttributeTest
::
shouldHaveDefaultValue
()
...
...
@@ -61,7 +59,6 @@ void MessageDisplayFormatAttributeTest::shouldChangeMessageFormat()
format
=
MessageViewer
::
Viewer
::
UseGlobalSetting
;
attr
.
setMessageFormat
(
format
);
QCOMPARE
(
attr
.
messageFormat
(),
format
);
}
void
MessageDisplayFormatAttributeTest
::
shouldDeserializeValue
()
...
...
messageviewer/autotests/setupenv.cpp
View file @
79949843
...
...
@@ -28,7 +28,7 @@
void
MessageViewer
::
Test
::
setupEnv
()
{
setenv
(
"LC_ALL"
,
"C"
,
1
);
setenv
(
"KDEHOME"
,
QFile
::
encodeName
(
QDir
::
homePath
()
+
QString
::
fromLatin1
(
"/.qttest"
)).
constData
(),
1
);
setenv
(
"KDEHOME"
,
QFile
::
encodeName
(
QDir
::
homePath
()
+
QString
::
fromLatin1
(
"/.qttest"
)).
constData
(),
1
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
messageviewer/autotests/setupenv.h
View file @
79949843
...
...
@@ -25,21 +25,15 @@
#include <viewer/objecttreeemptysource.h>
#include <viewer/attachmentstrategy.h>
namespace
MessageViewer
{
namespace
Test
{
namespace
MessageViewer
{
namespace
Test
{
/**
* setup a environment variables for tests:
* * set LC_ALL to C
* * set KDEHOME
*/
void
setupEnv
();
}
}
#endif
messageviewer/autotests/viewergrantleethemesupporttest.cpp
View file @
79949843
...
...
@@ -31,7 +31,6 @@ ViewerGrantleeThemeSupportTest::ViewerGrantleeThemeSupportTest(QObject *parent)
ViewerGrantleeThemeSupportTest
::~
ViewerGrantleeThemeSupportTest
()
{
}
void
ViewerGrantleeThemeSupportTest
::
initTestCase
()
...
...
@@ -46,7 +45,8 @@ void ViewerGrantleeThemeSupportTest::initTestCase()
void
ViewerGrantleeThemeSupportTest
::
shouldUpdateThemeMenu
()
{
MessageViewer
::
Viewer
*
viewer
=
new
MessageViewer
::
Viewer
(
nullptr
,
nullptr
,
new
KActionCollection
(
this
));
MessageViewer
::
Viewer
*
viewer
=
new
MessageViewer
::
Viewer
(
nullptr
,
nullptr
,
new
KActionCollection
(
this
));
viewer
->
show
();
QTest
::
qWaitForWindowExposed
(
viewer
);
}
...
...
messageviewer/autotests/viewertest.cpp
View file @
79949843
...
...
@@ -27,7 +27,8 @@ ViewerTest::ViewerTest()
void
ViewerTest
::
shouldHaveDefaultValuesOnCreation
()
{
MessageViewer
::
Viewer
*
viewer
=
new
MessageViewer
::
Viewer
(
nullptr
,
nullptr
,
new
KActionCollection
(
this
));
MessageViewer
::
Viewer
*
viewer
=
new
MessageViewer
::
Viewer
(
nullptr
,
nullptr
,
new
KActionCollection
(
this
));
viewer
->
show
();
QTest
::
qWaitForWindowExposed
(
viewer
);
...
...
@@ -42,11 +43,13 @@ void ViewerTest::shouldHaveDefaultValuesOnCreation()
QWidget
*
colorBar
=
viewer
->
findChild
<
QWidget
*>
(
QStringLiteral
(
"mColorBar"
));
QVERIFY
(
colorBar
);
QWidget
*
scandetectionWidget
=
viewer
->
findChild
<
QWidget
*>
(
QStringLiteral
(
"scandetectionwarning"
));
QWidget
*
scandetectionWidget
=
viewer
->
findChild
<
QWidget
*>
(
QStringLiteral
(
"scandetectionwarning"
));
QVERIFY
(
scandetectionWidget
);
QCOMPARE
(
scandetectionWidget
->
isVisible
(),
false
);
QWidget
*
openattachementfolderwidget
=
viewer
->
findChild
<
QWidget
*>
(
QStringLiteral
(
"openattachementfolderwidget"
));
QWidget
*
openattachementfolderwidget
=
viewer
->
findChild
<
QWidget
*>
(
QStringLiteral
(
"openattachementfolderwidget"
));
QVERIFY
(
openattachementfolderwidget
);
QCOMPARE
(
openattachementfolderwidget
->
isVisible
(),
false
);
...
...
@@ -70,29 +73,29 @@ void ViewerTest::shouldHaveDefaultValuesOnCreation()
delete
viewer
;
}
static
const
char
s_mail1
[]
=
"From: Konqui <konqui@kde.org>
\n
"
"To: Friends <friends@kde.org>
\n
"
"Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST)
\n
"
"Subject: Sample message
\n
"
"MIME-Version: 1.0
\n
"
"Content-type: text/plain; charset=us-ascii
\n
"
"
\n
"
"
\n
"
"This is a test message.
\n
"
"
\n
"
;
static
const
char
s_mail2
[]
=
"From: David Faure <dfaure@example.com>
\n
"
"To: Friends <friends@example.com>
\n
"
"Date: Sun, 31 Aug 2016 23:56:48 +0200 (CEST)
\n
"
"Subject: Second mail
\n
"
"MIME-Version: 1.0
\n
"
"Content-type: text/plain; charset=
\"
us-ascii
\"\n
"
"
\n
"
"
\n
"
"This is the second message.
\n
"
"
\n
"
;
static
const
char
s_mail1
[]
=
"From: Konqui <konqui@kde.org>
\n
"
"To: Friends <friends@kde.org>
\n
"
"Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST)
\n
"
"Subject: Sample message
\n
"
"MIME-Version: 1.0
\n
"
"Content-type: text/plain; charset=us-ascii
\n
"
"
\n
"
"
\n
"
"This is a test message.
\n
"
"
\n
"
;
static
const
char
s_mail2
[]
=
"From: David Faure <dfaure@example.com>
\n
"
"To: Friends <friends@example.com>
\n
"
"Date: Sun, 31 Aug 2016 23:56:48 +0200 (CEST)
\n
"
"Subject: Second mail
\n
"
"MIME-Version: 1.0
\n
"
"Content-type: text/plain; charset=
\"
us-ascii
\"\n
"
"
\n
"
"
\n
"
"This is the second message.
\n
"
"
\n
"
;
KMime
::
Message
::
Ptr
createMsg
(
const
char
*
data
)
{
...
...
messageviewer/autotests/zoomactionmenutest.cpp
View file @
79949843
...
...
@@ -23,12 +23,10 @@
ZoomActionMenuTest
::
ZoomActionMenuTest
(
QObject
*
parent
)
:
QObject
(
parent
)
{
}
ZoomActionMenuTest
::~
ZoomActionMenuTest
()
{
}
void
ZoomActionMenuTest
::
shouldHaveDefaultValue
()
...
...
messageviewer/src/antispam/antispamconfig.cpp
View file @
79949843
...
...
@@ -79,13 +79,13 @@ void AntiSpamConfig::readConfig()
for
(
unsigned
int
i
=
1
;
i
<=
totalTools
;
++
i
)
{
KConfigGroup
tool
(
&
config
,
QStringLiteral
(
"Spamtool #%1"
).
arg
(
i
));
if
(
tool
.
hasKey
(
"ScoreHeader"
))
{
const
QString
name
=
tool
.
readEntry
(
"ScoreName"
);
const
QByteArray
header
=
tool
.
readEntry
(
"ScoreHeader"
).
toLatin1
();
const
QByteArray
cheader
=
tool
.
readEntry
(
"ConfidenceHeader"
).
toLatin1
();
const
QByteArray
type
=
tool
.
readEntry
(
"ScoreType"
).
toLatin1
();
const
QString
score
=
tool
.
readEntryUntranslated
(
"ScoreValueRegexp"
);
const
QString
threshold
=
tool
.
readEntryUntranslated
(
"ScoreThresholdRegexp"
);
const
QString
confidence
=
tool
.
readEntryUntranslated
(
"ScoreConfidenceRegexp"
);
const
QString
name
=
tool
.
readEntry
(
"ScoreName"
);
const
QByteArray
header
=
tool
.
readEntry
(
"ScoreHeader"
).
toLatin1
();
const
QByteArray
cheader
=
tool
.
readEntry
(
"ConfidenceHeader"
).
toLatin1
();
const
QByteArray
type
=
tool
.
readEntry
(
"ScoreType"
).
toLatin1
();
const
QString
score
=
tool
.
readEntryUntranslated
(
"ScoreValueRegexp"
);
const
QString
threshold
=
tool
.
readEntryUntranslated
(
"ScoreThresholdRegexp"
);
const
QString
confidence
=
tool
.
readEntryUntranslated
(
"ScoreConfidenceRegexp"
);
SpamAgentTypes
typeE
=
SpamAgentNone
;
if
(
qstricmp
(
type
.
data
(),
"bool"
)
==
0
)
{
typeE
=
SpamAgentBool
;
...
...
messageviewer/src/antispam/antispamconfig.h
View file @
79949843
...
...
@@ -40,9 +40,7 @@
class
QString
;
namespace
MessageViewer
{
namespace
MessageViewer
{
/// Valid types of SpamAgent
enum
SpamAgentTypes
{
SpamAgentNone
,
//!< Invalid SpamAgent, skip this agent
...
...
@@ -55,36 +53,53 @@ enum SpamAgentTypes {
class
SpamAgent
{
public:
SpamAgent
()
:
mType
(
SpamAgentNone
)
{}
SpamAgent
(
const
QString
&
name
,
SpamAgentTypes
type
,
const
QByteArray
&
field
,
const
QByteArray
&
cfield
,
const
QRegExp
&
score
,
const
QRegExp
&
threshold
,
const
QRegExp
&
confidence
)
:
mName
(
name
),
mType
(
type
),
mField
(
field
),
mConfidenceField
(
cfield
),
mScore
(
score
),
mThreshold
(
threshold
),
mConfidence
(
confidence
)
{}
SpamAgent
()
:
mType
(
SpamAgentNone
)
{
}
SpamAgent
(
const
QString
&
name
,
SpamAgentTypes
type
,
const
QByteArray
&
field
,
const
QByteArray
&
cfield
,
const
QRegExp
&
score
,
const
QRegExp
&
threshold
,
const
QRegExp
&
confidence
)
:
mName
(
name
)
,
mType
(
type
)
,
mField
(
field
)
,
mConfidenceField
(
cfield
)
,
mScore
(
score
)
,
mThreshold
(
threshold
)
,
mConfidence
(
confidence
)
{
}
QString
name
()
const
{
return
mName
;
}
SpamAgentTypes
scoreType
()
const
{
return
mType
;
}
QByteArray
header
()
const
{
return
mField
;
}
QByteArray
confidenceHeader
()
const
{
return
mConfidenceField
;
}
QRegExp
scorePattern
()
const
{
return
mScore
;
}
QRegExp
thresholdPattern
()
const
{
return
mThreshold
;
}
QRegExp
confidencePattern
()
const
{
return
mConfidence
;
...
...
@@ -141,7 +156,6 @@ private:
void
readConfig
();
};
}
#endif // __MESSAGEVIEWER_ANTISPAMCONFIG_H__
messageviewer/src/antispam/spamheaderanalyzer.cpp
View file @
79949843
...
...
@@ -170,7 +170,7 @@ SpamScores SpamHeaderAnalyzer::getSpamScores(KMime::Message *message)
KMime
::
Headers
::
Base
*
cHeader
=
message
->
headerByType
(
confidenceHeaderName
.
constData
());
if
(
cHeader
)
{
mCField
=
cHeader
->
asUnicodeString
();
if
(
!
mCField
.
isEmpty
())
{
if
(
!
mCField
.
isEmpty
())
{
// Can we extract the confidence?
QRegExp
cScorePattern
=
(
*
it
).
confidencePattern
();
if
(
cScorePattern
.
indexIn
(
mCField
)
!=
-
1
)
{
...
...
@@ -179,7 +179,8 @@ SpamScores SpamHeaderAnalyzer::getSpamScores(KMime::Message *message)
confidence
=
confidenceString
.
toFloat
(
&
confidenceValid
);
if
(
!
confidenceValid
)
{
spamError
=
couldNotConvertConfidenceToFloat
;
qCDebug
(
MESSAGEVIEWER_LOG
)
<<
"Unable to convert confidence to float:"
<<
confidenceString
;
qCDebug
(
MESSAGEVIEWER_LOG
)
<<
"Unable to convert confidence to float:"
<<
confidenceString
;
}
}
}
...
...
messageviewer/src/antispam/spamheaderanalyzer.h
View file @
79949843
...
...
@@ -39,9 +39,7 @@
#include <QString>
#include <QVector>
namespace
MessageViewer
{
namespace
MessageViewer
{
enum
SpamError
{
noError
,
uninitializedStructUsed
,
...
...
@@ -72,40 +70,48 @@ class SpamScore
public:
SpamScore
()
:
mError
(
noError
),
mScore
(
-
2.0
),
mConfidence
(
-
2.0
)
:
mError
(
noError
)
,
mScore
(
-
2.0
)
,
mConfidence
(
-
2.0
)
{
}
SpamScore
(
const
QString
&
agent
,
SpamError
error
,
float
score
,
float
confidence
,
const
QString
&
header
,
const
QString
&
cheader
)
:
mAgent
(
agent
)
,
mError
(
error
)
,
mScore
(
score
)
,
mConfidence
(
confidence
)
,
mHeader
(
header
)
,
mConfidenceHeader
(
cheader
)
:
mAgent
(
agent
)
,
mError
(
error
)
,
mScore
(
score
)
,
mConfidence
(
confidence
)
,
mHeader
(
header
)
,
mConfidenceHeader
(
cheader
)
{
}
QString
agent
()
const
{
return
mAgent
;
}
float
score
()
const
{
return
mScore
;
}
float
confidence
()
const
{
return
mConfidence
;
}
SpamError
error
()
const
{
return
mError
;
}
QString
spamHeader
()
const
{
return
mHeader
;
}
QString
confidenceHeader
()
const
{
return
mConfidenceHeader
;
...
...
@@ -135,7 +141,6 @@ public:
*/
static
SpamScores
getSpamScores
(
KMime
::
Message
*
message
);
};
}
#endif // __SPAMHEADERANALYZER_H__
messageviewer/src/findbar/findbarsourceview.cpp
View file @
79949843
...
...
@@ -24,7 +24,8 @@
using
namespace
MessageViewer
;
FindBarSourceView
::
FindBarSourceView
(
QPlainTextEdit
*
view
,
QWidget
*
parent
)
:
WebEngineViewer
::
FindBarBase
(
parent
),
mView
(
view
)
:
WebEngineViewer
::
FindBarBase
(
parent
)
,
mView
(
view
)
{
}
...
...
@@ -80,4 +81,3 @@ void FindBarSourceView::updateSensitivity(bool)
const
bool
found
=
mView
->
find
(
mLastSearchStr
,
searchOptions
);
setFoundMatch
(
found
);
}
messageviewer/src/findbar/findbarsourceview.h
View file @
79949843
...
...
@@ -23,8 +23,7 @@
class
QPlainTextEdit
;
namespace
MessageViewer
{
namespace
MessageViewer
{
class
FindBarSourceView
:
public
WebEngineViewer
::
FindBarBase
{
Q_OBJECT
...
...
@@ -38,6 +37,7 @@ private:
{
Q_UNUSED
(
parent
);
}
void
clearSelections
()
override
;
void
searchText
(
bool
backward
,
bool
isAutoSearch
)
override
;
void
updateHighLight
(
bool
)
override
;
...
...
@@ -49,4 +49,3 @@ private:
}
#endif
/* FINDBARSOURCEVIEW_H */
messageviewer/src/header/contactdisplaymessagememento.cpp
View file @
79949843
...
...
@@ -29,17 +29,20 @@
using
namespace
MessageViewer
;
ContactDisplayMessageMemento
::
ContactDisplayMessageMemento
(
const
QString
&
emailAddress
)
:
QObject
(
nullptr
)
,
mForceDisplayTo
(
Viewer
::
UseGlobalSetting
)
,
mEmailAddress
(
emailAddress
)
,
mFinished
(
false
)
,
mMailAllowToRemoteContent
(
false
)
,
mSearchJob
(
nullptr
)
:
QObject
(
nullptr
)
,
mForceDisplayTo
(
Viewer
::
UseGlobalSetting
)
,
mEmailAddress
(
emailAddress
)
,
mFinished
(
false
)
,
mMailAllowToRemoteContent
(
false
)
,
mSearchJob
(
nullptr
)
{
if
(
!
emailAddress
.
isEmpty
())
{
mSearchJob
=
new
Akonadi
::
ContactSearchJob
();
mSearchJob
->
setQuery
(
Akonadi
::
ContactSearchJob
::
Email
,
emailAddress
.
toLower
(),
Akonadi
::
ContactSearchJob
::
ExactMatch
);
connect
(
mSearchJob
.
data
(),
&
Akonadi
::
ContactSearchJob
::
result
,
this
,
&
ContactDisplayMessageMemento
::
slotSearchJobFinished
);
mSearchJob
->
setQuery
(
Akonadi
::
ContactSearchJob
::
Email
,
emailAddress
.
toLower
(),
Akonadi
::
ContactSearchJob
::
ExactMatch
);
connect
(
mSearchJob
.
data
(),
&
Akonadi
::
ContactSearchJob
::
result
,
this
,
&
ContactDisplayMessageMemento
::
slotSearchJobFinished
);
}
else
{
mFinished
=
true
;
}
...
...
@@ -48,7 +51,9 @@ ContactDisplayMessageMemento::ContactDisplayMessageMemento(const QString &emailA
ContactDisplayMessageMemento
::~
ContactDisplayMessageMemento
()
{
if
(
mSearchJob
)
{
disconnect
(
mSearchJob
.
data
(),
&
Akonadi
::
ContactSearchJob
::
result
,
this
,
&
ContactDisplayMessageMemento
::
slotSearchJobFinished
);
disconnect
(
mSearchJob
.
data
(),
&
Akonadi
::
ContactSearchJob
::
result
,
this
,
&
ContactDisplayMessageMemento
::
slotSearchJobFinished
);
mSearchJob
->
kill
();
}
}
...
...
@@ -89,7 +94,7 @@ void ContactDisplayMessageMemento::slotSearchJobFinished(KJob *job)
QByteArray
imageData
;
KIO
::
TransferJob
*
job
=
KIO
::
get
(
url
,
KIO
::
NoReload
);
QObject
::
connect
(
job
,
&
KIO
::
TransferJob
::
data
,
[
&
imageData
](
KIO
::
Job
*
,
const
QByteArray
&
data
)
{
[
&
imageData
](
KIO
::
Job
*
,
const
QByteArray
&
data
)
{
imageData
.
append
(
data
);
});
if
(
job
->
exec
())
{
...
...
@@ -111,12 +116,14 @@ void ContactDisplayMessageMemento::slotSearchJobFinished(KJob *job)
if
(
Gravatar
::
GravatarSettings
::
self
()
->
gravatarSupportEnabled
())
{
Gravatar
::
GravatarResolvUrlJob
*
job
=
new
Gravatar
::
GravatarResolvUrlJob
(
this
);
job
->
setEmail
(
mEmailAddress
);
job
->
setUseDefaultPixmap
(
Gravatar
::
GravatarSettings
::
self
()
->
gravatarUseDefaultImage
());
job
->
setUseDefaultPixmap
(
Gravatar
::
GravatarSettings
::
self
()
->
gravatarUseDefaultImage
());
job
->
setUseLibravatar
(
Gravatar
::
GravatarSettings
::
self
()
->
libravatarSupportEnabled
());
job
->
setFallbackGravatar
(
Gravatar
::
GravatarSettings
::
self
()
->
fallbackToGravatar
());
job
->
setUseHttps
(
true
);
if
(
job
->
canStart
())
{
connect
(
job
,
&
Gravatar
::
GravatarResolvUrlJob
::
finished
,
this
,
&
ContactDisplayMessageMemento
::
slotGravatarResolvUrlFinished
);
connect
(
job
,
&
Gravatar
::
GravatarResolvUrlJob
::
finished
,
this
,
&
ContactDisplayMessageMemento
::
slotGravatarResolvUrlFinished
);
job
->
start
();
}
else
{
job
->
deleteLater
();
...
...
@@ -134,7 +141,8 @@ bool ContactDisplayMessageMemento::finished() const
void
ContactDisplayMessageMemento
::
detach
()
{
disconnect
(
this
,
SIGNAL
(
update
(
MimeTreeParser
::
UpdateMode
)),
nullptr
,
nullptr
);