Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PIM Messagelib
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
PIM Messagelib
Commits
78aecb44
Commit
78aecb44
authored
Jan 02, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GIT_SILENT: use nullptr now
parent
8d32eb95
Changes
192
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
192 changed files
with
600 additions
and
600 deletions
+600
-600
messagecomposer/autotests/attachmentjobtest.cpp
messagecomposer/autotests/attachmentjobtest.cpp
+1
-1
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp
...poser/autotests/attachmentvcardfromaddressbookjobtest.cpp
+4
-4
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h
...omposer/autotests/attachmentvcardfromaddressbookjobtest.h
+1
-1
messagecomposer/autotests/composertest.cpp
messagecomposer/autotests/composertest.cpp
+4
-4
messagecomposer/autotests/composerviewbasetest.h
messagecomposer/autotests/composerviewbasetest.h
+1
-1
messagecomposer/autotests/cryptocomposertest.cpp
messagecomposer/autotests/cryptocomposertest.cpp
+8
-8
messagecomposer/autotests/followupreminderselectdatedialogtest.h
...composer/autotests/followupreminderselectdatedialogtest.h
+1
-1
messagecomposer/autotests/globalparttest.h
messagecomposer/autotests/globalparttest.h
+1
-1
messagecomposer/autotests/infoparttest.h
messagecomposer/autotests/infoparttest.h
+1
-1
messagecomposer/autotests/messagefactorytest.cpp
messagecomposer/autotests/messagefactorytest.cpp
+1
-1
messagecomposer/autotests/plugineditorcheckbeforesendparamstest.h
...omposer/autotests/plugineditorcheckbeforesendparamstest.h
+1
-1
messagecomposer/autotests/recipientseditortest.cpp
messagecomposer/autotests/recipientseditortest.cpp
+1
-1
messagecomposer/autotests/singlepartjobtest.cpp
messagecomposer/autotests/singlepartjobtest.cpp
+2
-2
messagecomposer/autotests/testcsshelper.h
messagecomposer/autotests/testcsshelper.h
+1
-1
messagecomposer/autotests/textparttest.h
messagecomposer/autotests/textparttest.h
+1
-1
messagecomposer/src/attachment/attachmentcontrollerbase.cpp
messagecomposer/src/attachment/attachmentcontrollerbase.cpp
+28
-28
messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h
...mposer/src/composer-ng/autotests/richtextcomposerngtest.h
+1
-1
messagecomposer/src/composer-ng/richtextcomposerng.cpp
messagecomposer/src/composer-ng/richtextcomposerng.cpp
+1
-1
messagecomposer/src/composer/composer.cpp
messagecomposer/src/composer/composer.cpp
+8
-8
messagecomposer/src/composer/composerviewbase.cpp
messagecomposer/src/composer/composerviewbase.cpp
+15
-15
messagecomposer/src/composer/keyresolver.cpp
messagecomposer/src/composer/keyresolver.cpp
+16
-16
messagecomposer/src/composer/signaturecontroller.cpp
messagecomposer/src/composer/signaturecontroller.cpp
+2
-2
messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp
...src/followupreminder/followupreminderselectdatedialog.cpp
+3
-3
messagecomposer/src/helper/messagefactory.cpp
messagecomposer/src/helper/messagefactory.cpp
+1
-1
messagecomposer/src/imagescaling/autotests/imagescalingtest.h
...agecomposer/src/imagescaling/autotests/imagescalingtest.h
+1
-1
messagecomposer/src/imagescaling/imagescalingwidget.cpp
messagecomposer/src/imagescaling/imagescalingwidget.cpp
+2
-2
messagecomposer/src/imagescaling/tests/imagescaling_gui.h
messagecomposer/src/imagescaling/tests/imagescaling_gui.h
+1
-1
messagecomposer/src/job/encryptjob.cpp
messagecomposer/src/job/encryptjob.cpp
+2
-2
messagecomposer/src/job/jobbase.cpp
messagecomposer/src/job/jobbase.cpp
+2
-2
messagecomposer/src/job/maintextjob.cpp
messagecomposer/src/job/maintextjob.cpp
+1
-1
messagecomposer/src/job/savecontactpreferencejob.cpp
messagecomposer/src/job/savecontactpreferencejob.cpp
+1
-1
messagecomposer/src/job/signencryptjob.cpp
messagecomposer/src/job/signencryptjob.cpp
+2
-2
messagecomposer/src/job/signjob.cpp
messagecomposer/src/job/signjob.cpp
+2
-2
messagecomposer/src/job/singlepartjob.cpp
messagecomposer/src/job/singlepartjob.cpp
+5
-5
messagecomposer/src/job/skeletonmessagejob.cpp
messagecomposer/src/job/skeletonmessagejob.cpp
+3
-3
messagecomposer/src/job/transparentjob.cpp
messagecomposer/src/job/transparentjob.cpp
+1
-1
messagecomposer/src/part/globalpart.cpp
messagecomposer/src/part/globalpart.cpp
+1
-1
messagecomposer/src/plugineditor/plugineditorinterface.cpp
messagecomposer/src/plugineditor/plugineditorinterface.cpp
+4
-4
messagecomposer/src/plugineditor/plugineditormanager.cpp
messagecomposer/src/plugineditor/plugineditormanager.cpp
+2
-2
messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendinterface.cpp
...rcheckbeforesend/plugineditorcheckbeforesendinterface.cpp
+1
-1
messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
...torcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
+2
-2
messagecomposer/src/recipient/distributionlistdialog.cpp
messagecomposer/src/recipient/distributionlistdialog.cpp
+1
-1
messagecomposer/src/recipient/recipientseditor.cpp
messagecomposer/src/recipient/recipientseditor.cpp
+4
-4
messagecomposer/src/recipient/recipientseditorsidewidget.cpp
messagecomposer/src/recipient/recipientseditorsidewidget.cpp
+1
-1
messagecomposer/src/recipient/recipientspicker.cpp
messagecomposer/src/recipient/recipientspicker.cpp
+1
-1
messagecomposer/src/settings/messagecomposersettings.cpp
messagecomposer/src/settings/messagecomposersettings.cpp
+1
-1
messagecomposer/src/utils/util.cpp
messagecomposer/src/utils/util.cpp
+1
-1
messagecomposer/tests/recipientseditortest.cpp
messagecomposer/tests/recipientseditortest.cpp
+1
-1
messagecore/autotests/attachmentpropertiesdialogtest.h
messagecore/autotests/attachmentpropertiesdialogtest.h
+1
-1
messagecore/autotests/attachmentupdatejobtest.h
messagecore/autotests/attachmentupdatejobtest.h
+1
-1
messagecore/autotests/mailinglisttest.h
messagecore/autotests/mailinglisttest.h
+1
-1
messagecore/src/attachment/attachmentfromfolderjob.cpp
messagecore/src/attachment/attachmentfromfolderjob.cpp
+1
-1
messagelist/autotests/quicksearchwarningtest.h
messagelist/autotests/quicksearchwarningtest.h
+1
-1
messagelist/autotests/searchcollectionindexingwarningtest.h
messagelist/autotests/searchcollectionindexingwarningtest.h
+1
-1
messagelist/autotests/searchlinestatustest.h
messagelist/autotests/searchlinestatustest.h
+1
-1
messagelist/src/core/filter.cpp
messagelist/src/core/filter.cpp
+1
-1
messagelist/src/core/item.cpp
messagelist/src/core/item.cpp
+12
-12
messagelist/src/core/manager.cpp
messagelist/src/core/manager.cpp
+9
-9
messagelist/src/core/messageitem.cpp
messagelist/src/core/messageitem.cpp
+6
-6
messagelist/src/core/messageitemsetmanager.cpp
messagelist/src/core/messageitemsetmanager.cpp
+5
-5
messagelist/src/core/model.cpp
messagelist/src/core/model.cpp
+50
-50
messagelist/src/core/modelinvariantindex.cpp
messagelist/src/core/modelinvariantindex.cpp
+2
-2
messagelist/src/core/modelinvariantrowmapper.cpp
messagelist/src/core/modelinvariantrowmapper.cpp
+16
-16
messagelist/src/core/optionset.cpp
messagelist/src/core/optionset.cpp
+1
-1
messagelist/src/core/theme.cpp
messagelist/src/core/theme.cpp
+1
-1
messagelist/src/core/themedelegate.cpp
messagelist/src/core/themedelegate.cpp
+32
-32
messagelist/src/core/view.cpp
messagelist/src/core/view.cpp
+32
-32
messagelist/src/core/widgetbase.cpp
messagelist/src/core/widgetbase.cpp
+12
-12
messagelist/src/core/widgets/searchlinestatus.cpp
messagelist/src/core/widgets/searchlinestatus.cpp
+3
-3
messagelist/src/pane.cpp
messagelist/src/pane.cpp
+23
-23
messagelist/src/pane.h
messagelist/src/pane.h
+1
-1
messagelist/src/storagemodel.cpp
messagelist/src/storagemodel.cpp
+4
-4
messagelist/src/storagemodel.h
messagelist/src/storagemodel.h
+1
-1
messagelist/src/utils/aggregationconfigbutton.cpp
messagelist/src/utils/aggregationconfigbutton.cpp
+2
-2
messagelist/src/utils/aggregationeditor.cpp
messagelist/src/utils/aggregationeditor.cpp
+1
-1
messagelist/src/utils/configureaggregationsdialog.cpp
messagelist/src/utils/configureaggregationsdialog.cpp
+7
-7
messagelist/src/utils/configurethemesdialog.cpp
messagelist/src/utils/configurethemesdialog.cpp
+7
-7
messagelist/src/utils/themeconfigbutton.cpp
messagelist/src/utils/themeconfigbutton.cpp
+3
-3
messagelist/src/utils/themeeditor.cpp
messagelist/src/utils/themeeditor.cpp
+18
-18
messagelist/src/widget.cpp
messagelist/src/widget.cpp
+5
-5
messageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
...ageviewer/autotests/mailsourceviewtextbrowserwidgettest.h
+1
-1
messageviewer/autotests/messagedisplayformatattributetest.h
messageviewer/autotests/messagedisplayformatattributetest.h
+1
-1
messageviewer/autotests/zoomactionmenutest.h
messageviewer/autotests/zoomactionmenutest.h
+1
-1
messageviewer/src/header/contactdisplaymessagememento.cpp
messageviewer/src/header/contactdisplaymessagememento.cpp
+2
-2
messageviewer/src/header/grantleeheaderstyle.cpp
messageviewer/src/header/grantleeheaderstyle.cpp
+1
-1
messageviewer/src/header/headerstylemenumanager.cpp
messageviewer/src/header/headerstylemenumanager.cpp
+2
-2
messageviewer/src/header/headerstylepluginmanager.cpp
messageviewer/src/header/headerstylepluginmanager.cpp
+2
-2
messageviewer/src/htmlwriter/autotests/webengineembedparttest.h
...eviewer/src/htmlwriter/autotests/webengineembedparttest.h
+1
-1
messageviewer/src/htmlwriter/autotests/webengineparthtmlwritertest.h
...er/src/htmlwriter/autotests/webengineparthtmlwritertest.h
+1
-1
messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.h
...partthemes/default/autotests/converthtmltoplaintexttest.h
+1
-1
messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp
...sagepartthemes/default/autotests/objecttreeparsertest.cpp
+3
-3
messageviewer/src/messagepartthemes/default/autotests/setupenv.h
...viewer/src/messagepartthemes/default/autotests/setupenv.h
+2
-2
messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp
...gepartthemes/default/autotests/unencryptedmessagetest.cpp
+7
-7
messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
...eviewer/src/messagepartthemes/default/defaultrenderer.cpp
+2
-2
messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
.../messagepartthemes/default/messagepartrenderermanager.cpp
+1
-1
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.h
...eeheaderstyleplugin/defaultgrantleeheaderstyleinterface.h
+1
-1
messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.h
...ntleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.h
+2
-2
messageviewer/src/scamdetection/autotests/scamattributetest.h
...ageviewer/src/scamdetection/autotests/scamattributetest.h
+1
-1
messageviewer/src/scamdetection/autotests/scamdetectionwebenginetest.h
.../src/scamdetection/autotests/scamdetectionwebenginetest.h
+2
-2
messageviewer/src/scamdetection/scamcheckshorturlmanager.cpp
messageviewer/src/scamdetection/scamcheckshorturlmanager.cpp
+1
-1
messageviewer/src/scamdetection/scamexpandurljob.cpp
messageviewer/src/scamdetection/scamexpandurljob.cpp
+1
-1
messageviewer/src/scamdetection/tests/scamdetectionwebengine_gui.h
...ewer/src/scamdetection/tests/scamdetectionwebengine_gui.h
+1
-1
messageviewer/src/utils/messageviewerutil.cpp
messageviewer/src/utils/messageviewerutil.cpp
+2
-2
messageviewer/src/viewer/mailcheckphishingurljob.cpp
messageviewer/src/viewer/mailcheckphishingurljob.cpp
+1
-1
messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp
messageviewer/src/viewer/mimeparttree/mimetreemodel.cpp
+1
-1
messageviewer/src/viewer/objecttreeemptysource.cpp
messageviewer/src/viewer/objecttreeemptysource.cpp
+4
-4
messageviewer/src/viewer/viewer_p.cpp
messageviewer/src/viewer/viewer_p.cpp
+11
-11
messageviewer/src/viewer/webengine/autotests/mailwebenginescripttest.h
.../src/viewer/webengine/autotests/mailwebenginescripttest.h
+1
-1
messageviewer/src/viewer/webengine/mailwebengineview.cpp
messageviewer/src/viewer/webengine/mailwebengineview.cpp
+6
-6
messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.h
...c/viewer/webengine/tests/testjquerysupportmailwebengine.h
+1
-1
messageviewer/src/viewer/webengine/tests/testmaildndattachment.h
...viewer/src/viewer/webengine/tests/testmaildndattachment.h
+1
-1
messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.h
...viewer/src/viewer/webengine/tests/testmailmboxwebengine.h
+1
-1
messageviewer/src/viewer/webengine/tests/testmailwebengine.h
messageviewer/src/viewer/webengine/tests/testmailwebengine.h
+1
-1
messageviewer/src/viewer/webengine/tests/testmailwebengineselection.h
...r/src/viewer/webengine/tests/testmailwebengineselection.h
+1
-1
messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.h
...iewer/src/viewer/webengine/tests/testwebengineaccesskey.h
+2
-2
messageviewer/src/viewer/webengine/tests/testwebenginescrolladdattachment.h
...viewer/webengine/tests/testwebenginescrolladdattachment.h
+1
-1
messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
messageviewer/src/viewerplugins/tests/viewerplugin_gui.h
+1
-1
messageviewer/src/viewerplugins/viewerpluginmanager.cpp
messageviewer/src/viewerplugins/viewerpluginmanager.cpp
+2
-2
messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp
messageviewer/src/viewerplugins/viewerplugintoolmanager.cpp
+1
-1
messageviewer/src/widgets/configurewidget.cpp
messageviewer/src/widgets/configurewidget.cpp
+2
-2
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
messageviewer/src/widgets/mailsourcewebengineviewer.cpp
+1
-1
mimetreeparser/autotests/attachmenttest.cpp
mimetreeparser/autotests/attachmenttest.cpp
+1
-1
mimetreeparser/autotests/setupenv.h
mimetreeparser/autotests/setupenv.h
+2
-2
mimetreeparser/src/bodyformatter/multipartalternative.cpp
mimetreeparser/src/bodyformatter/multipartalternative.cpp
+3
-3
mimetreeparser/src/bodyformatter/multipartencrypted.cpp
mimetreeparser/src/bodyformatter/multipartencrypted.cpp
+1
-1
mimetreeparser/src/bodyformatter/multipartsigned.cpp
mimetreeparser/src/bodyformatter/multipartsigned.cpp
+1
-1
mimetreeparser/src/bodyformatter/utils.cpp
mimetreeparser/src/bodyformatter/utils.cpp
+1
-1
mimetreeparser/src/interfaces/bodypartformatter.cpp
mimetreeparser/src/interfaces/bodypartformatter.cpp
+3
-3
mimetreeparser/src/temporaryfile/autotests/attachmenttemporaryfilesdirstest.h
...emporaryfile/autotests/attachmenttemporaryfilesdirstest.h
+1
-1
mimetreeparser/src/viewer/messagepart.cpp
mimetreeparser/src/viewer/messagepart.cpp
+6
-6
mimetreeparser/src/viewer/nodehelper.cpp
mimetreeparser/src/viewer/nodehelper.cpp
+1
-1
mimetreeparser/src/viewer/objecttreeparser.cpp
mimetreeparser/src/viewer/objecttreeparser.cpp
+3
-3
templateparser/autotests/customtemplatesmenutest.cpp
templateparser/autotests/customtemplatesmenutest.cpp
+1
-1
templateparser/autotests/customtemplatesmenutest.h
templateparser/autotests/customtemplatesmenutest.h
+1
-1
templateparser/src/customtemplates.cpp
templateparser/src/customtemplates.cpp
+2
-2
templateparser/src/customtemplates.h
templateparser/src/customtemplates.h
+3
-3
templateparser/src/customtemplatesmenu.cpp
templateparser/src/customtemplatesmenu.cpp
+7
-7
templateparser/src/templateparser.cpp
templateparser/src/templateparser.cpp
+4
-4
templateparser/src/templatesconfiguration.cpp
templateparser/src/templatesconfiguration.cpp
+3
-3
templateparser/src/templatesconfiguration.h
templateparser/src/templatesconfiguration.h
+1
-1
templateparser/src/templatestextedit.h
templateparser/src/templatestextedit.h
+1
-1
templateparser/src/templatestexteditor.h
templateparser/src/templatestexteditor.h
+1
-1
templateparser/tests/templateconfigurewidget_gui.h
templateparser/tests/templateconfigurewidget_gui.h
+1
-1
templateparser/tests/templateeditor_gui.h
templateparser/tests/templateeditor_gui.h
+1
-1
webengineviewer/src/autotests/webengineexporthtmlpagejobtest.h
...gineviewer/src/autotests/webengineexporthtmlpagejobtest.h
+1
-1
webengineviewer/src/autotests/webengineprintmessageboxtest.h
webengineviewer/src/autotests/webengineprintmessageboxtest.h
+1
-1
webengineviewer/src/autotests/webhittestresulttest.h
webengineviewer/src/autotests/webhittestresulttest.h
+1
-1
webengineviewer/src/autotests/zoomactionmenutest.h
webengineviewer/src/autotests/zoomactionmenutest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/backoffmodemanagertest.h
...r/src/checkphishingurl/autotests/backoffmodemanagertest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/checkphishingurlcachetest.h
...rc/checkphishingurl/autotests/checkphishingurlcachetest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/checkphishingurljobtest.h
.../src/checkphishingurl/autotests/checkphishingurljobtest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/checkphishingurlutiltest.h
...src/checkphishingurl/autotests/checkphishingurlutiltest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/createdatabasefilejobtest.h
...rc/checkphishingurl/autotests/createdatabasefilejobtest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.h
...kphishingurl/autotests/createphishingurldatabasejobtest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/downloadlocaldatabasethreadtest.h
...ckphishingurl/autotests/downloadlocaldatabasethreadtest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/hashcachemanagertest.h
...wer/src/checkphishingurl/autotests/hashcachemanagertest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.h
...er/src/checkphishingurl/autotests/localdatabasefiletest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/localdatabasemanagertest.h
...src/checkphishingurl/autotests/localdatabasemanagertest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/riceencodingdecodertest.h
.../src/checkphishingurl/autotests/riceencodingdecodertest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/searchfullhashjobtest.h
...er/src/checkphishingurl/autotests/searchfullhashjobtest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/urlhashingtest.h
...ineviewer/src/checkphishingurl/autotests/urlhashingtest.h
+1
-1
webengineviewer/src/checkphishingurl/autotests/verifydatabaseupdatetest.h
...src/checkphishingurl/autotests/verifydatabaseupdatetest.h
+1
-1
webengineviewer/src/checkphishingurl/checkphishingurljob.cpp
webengineviewer/src/checkphishingurl/checkphishingurljob.cpp
+1
-1
webengineviewer/src/checkphishingurl/createphishingurldatabasejob.cpp
...wer/src/checkphishingurl/createphishingurldatabasejob.cpp
+1
-1
webengineviewer/src/checkphishingurl/localdatabasefile.cpp
webengineviewer/src/checkphishingurl/localdatabasefile.cpp
+2
-2
webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
+1
-1
webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.h
...neviewer/src/checkphishingurl/tests/checkphishingurlgui.h
+1
-1
webengineviewer/src/checkphishingurl/tests/createphishingurldatabasegui.h
...src/checkphishingurl/tests/createphishingurldatabasegui.h
+1
-1
webengineviewer/src/checkphishingurl/tests/managelocaldatabasegui.h
...iewer/src/checkphishingurl/tests/managelocaldatabasegui.h
+1
-1
webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
...gineviewer/src/checkphishingurl/tests/searchfullhashgui.h
+1
-1
webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
...kphishingurl/tests/webengineviewwithsafebrowsingsupport.h
+1
-1
webengineviewer/src/findbar/autotests/findbarbasetest.h
webengineviewer/src/findbar/autotests/findbarbasetest.h
+1
-1
webengineviewer/src/findbar/findbarwebengineview.cpp
webengineviewer/src/findbar/findbarwebengineview.cpp
+1
-1
webengineviewer/src/networkmanager/interceptormanager.cpp
webengineviewer/src/networkmanager/interceptormanager.cpp
+2
-2
webengineviewer/src/tests/testdndwebengine.h
webengineviewer/src/tests/testdndwebengine.h
+2
-2
webengineviewer/src/tests/testjquerysupportwebengine.h
webengineviewer/src/tests/testjquerysupportwebengine.h
+1
-1
webengineviewer/src/tests/testselectedtextwebengine.h
webengineviewer/src/tests/testselectedtextwebengine.h
+1
-1
webengineviewer/src/tests/testwebengine.h
webengineviewer/src/tests/testwebengine.h
+2
-2
webengineviewer/src/tests/testwebenginescript.h
webengineviewer/src/tests/testwebenginescript.h
+4
-4
webengineviewer/src/urlinterceptor/networkurlinterceptorpluginmanager.cpp
...src/urlinterceptor/networkurlinterceptorpluginmanager.cpp
+2
-2
webengineviewer/src/webengineaccesskey/autotests/webengineaccesskeyanchorfromhtmltest.h
...ccesskey/autotests/webengineaccesskeyanchorfromhtmltest.h
+2
-2
webengineviewer/src/webengineaccesskey/autotests/webengineaccesskeyanchortest.h
...bengineaccesskey/autotests/webengineaccesskeyanchortest.h
+1
-1
webengineviewer/src/webengineaccesskey/webengineaccesskey.cpp
...ngineviewer/src/webengineaccesskey/webengineaccesskey.cpp
+1
-1
webengineviewer/src/webengineexporthtmlpagejob.cpp
webengineviewer/src/webengineexporthtmlpagejob.cpp
+1
-1
webengineviewer/src/webengineexporthtmlpagejob.h
webengineviewer/src/webengineexporthtmlpagejob.h
+1
-1
webengineviewer/src/webenginemanagescript.h
webengineviewer/src/webenginemanagescript.h
+1
-1
webengineviewer/src/webenginepage.h
webengineviewer/src/webenginepage.h
+2
-2
webengineviewer/src/webengineprintmessagebox.h
webengineviewer/src/webengineprintmessagebox.h
+1
-1
webengineviewer/src/webengineview.cpp
webengineviewer/src/webengineview.cpp
+5
-5
webengineviewer/src/webengineview.h
webengineviewer/src/webengineview.h
+1
-1
webengineviewer/src/webhittest.h
webengineviewer/src/webhittest.h
+1
-1
webengineviewer/src/widgets/zoomactionmenu.cpp
webengineviewer/src/widgets/zoomactionmenu.cpp
+4
-4
No files found.
messagecomposer/autotests/attachmentjobtest.cpp
View file @
78aecb44
...
...
@@ -61,7 +61,7 @@ void AttachmentJobTest::testAttachment()
QVERIFY
(
ajob
->
exec
());
Content
*
result
=
ajob
->
content
();
delete
ajob
;
ajob
=
Q_NULLPTR
;
ajob
=
nullptr
;
result
->
assemble
();
qDebug
()
<<
result
->
encodedContent
();
...
...
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp
View file @
78aecb44
...
...
@@ -40,7 +40,7 @@ void AttachmentVcardFromAddressBookJobTest::testAttachmentVCardWithInvalidItem()
MessageComposer
::
AttachmentVcardFromAddressBookJob
*
job
=
new
MessageComposer
::
AttachmentVcardFromAddressBookJob
(
item
);
QVERIFY
(
!
job
->
exec
());
delete
job
;
job
=
Q_NULLPTR
;
job
=
nullptr
;
}
void
AttachmentVcardFromAddressBookJobTest
::
testAttachmentVCardWithValidItem
()
...
...
@@ -56,7 +56,7 @@ void AttachmentVcardFromAddressBookJobTest::testAttachmentVCardWithValidItem()
MessageCore
::
AttachmentPart
::
Ptr
part
=
job
->
attachmentPart
();
delete
job
;
job
=
Q_NULLPTR
;
job
=
nullptr
;
QVERIFY
(
!
part
->
data
().
isEmpty
());
QCOMPARE
(
part
->
mimeType
(),
QByteArray
(
"text/x-vcard"
));
...
...
@@ -73,7 +73,7 @@ void AttachmentVcardFromAddressBookJobTest::testAttachmentVCardWithInvalidVCard(
MessageComposer
::
AttachmentVcardFromAddressBookJob
*
job
=
new
MessageComposer
::
AttachmentVcardFromAddressBookJob
(
item
);
QVERIFY
(
!
job
->
exec
());
delete
job
;
job
=
Q_NULLPTR
;
job
=
nullptr
;
}
void
AttachmentVcardFromAddressBookJobTest
::
testAttachmentVCardWithEmptyVCard
()
...
...
@@ -85,7 +85,7 @@ void AttachmentVcardFromAddressBookJobTest::testAttachmentVCardWithEmptyVCard()
MessageComposer
::
AttachmentVcardFromAddressBookJob
*
job
=
new
MessageComposer
::
AttachmentVcardFromAddressBookJob
(
item
);
QVERIFY
(
!
job
->
exec
());
delete
job
;
job
=
Q_NULLPTR
;
job
=
nullptr
;
}
QTEST_MAIN
(
AttachmentVcardFromAddressBookJobTest
)
messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h
View file @
78aecb44
...
...
@@ -27,7 +27,7 @@ class AttachmentVcardFromAddressBookJobTest : public QObject
{
Q_OBJECT
public:
explicit
AttachmentVcardFromAddressBookJobTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
AttachmentVcardFromAddressBookJobTest
(
QObject
*
parent
=
nullptr
);
~
AttachmentVcardFromAddressBookJobTest
();
private
Q_SLOTS
:
void
testAttachmentVCardWithInvalidItem
();
...
...
messagecomposer/autotests/composertest.cpp
View file @
78aecb44
...
...
@@ -52,7 +52,7 @@ void ComposerTest::testAttachments()
QCOMPARE
(
composer
->
resultMessages
().
size
(),
1
);
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
constFirst
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
// multipart/mixed
{
...
...
@@ -90,7 +90,7 @@ void ComposerTest::testAutoSave()
QVERIFY
(
composer
->
finished
());
QCOMPARE
(
composer
->
resultMessages
().
size
(),
1
);
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
}
...
...
@@ -133,7 +133,7 @@ void ComposerTest::testNonAsciiHeaders()
QCOMPARE
(
message
->
bcc
()
->
displayNames
().
constFirst
(),
bccDisplayName
);
QCOMPARE
(
message
->
replyTo
()
->
displayNames
().
constFirst
(),
replyToDisplayName
);
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
}
void
ComposerTest
::
testBug271192
()
...
...
@@ -149,7 +149,7 @@ void ComposerTest::testBug271192()
QCOMPARE
(
message
->
to
()
->
displayNames
().
size
(),
1
);
QCOMPARE
(
message
->
to
()
->
displayNames
().
first
().
toUtf8
(),
displayName
.
toUtf8
());
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
}
void
ComposerTest
::
fillComposerData
(
Composer
*
composer
)
...
...
messagecomposer/autotests/composerviewbasetest.h
View file @
78aecb44
...
...
@@ -24,7 +24,7 @@ class ComposerViewBaseTest : public QObject
{
Q_OBJECT
public:
explicit
ComposerViewBaseTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
ComposerViewBaseTest
(
QObject
*
parent
=
nullptr
);
~
ComposerViewBaseTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
...
...
messagecomposer/autotests/cryptocomposertest.cpp
View file @
78aecb44
...
...
@@ -100,7 +100,7 @@ void CryptoComposerTest::testOpenPGPMime()
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
//qDebug()<< "message:" << message.data()->encodedContent();
ComposerTestUtil
::
verify
(
sign
,
encrypt
,
message
.
data
(),
data
.
toUtf8
(),
...
...
@@ -144,7 +144,7 @@ void CryptoComposerTest::testEncryptSameAttachments()
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
//qDebug()<< "message:" << message.data()->encodedContent();
ComposerTestUtil
::
verifyEncryption
(
message
.
data
(),
data
.
toUtf8
(),
...
...
@@ -204,7 +204,7 @@ void CryptoComposerTest::testEditEncryptAttachments()
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
// setup a viewer
ComposerViewBase
view
(
this
,
nullptr
);
...
...
@@ -270,7 +270,7 @@ void CryptoComposerTest::testEditEncryptAndLateAttachments()
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
// setup a viewer
ComposerViewBase
view
(
this
,
nullptr
);
...
...
@@ -327,7 +327,7 @@ void CryptoComposerTest::testSignEncryptLateAttachments()
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
// as we have an additional attachment, just ignore it when checking for sign/encrypt
KMime
::
Content
*
b
=
MessageCore
::
NodeHelper
::
firstChild
(
message
.
data
());
...
...
@@ -388,7 +388,7 @@ void CryptoComposerTest::testBCCEncrypt()
KMime
::
Message
::
Ptr
primMessage
=
composer
->
resultMessages
().
first
();
KMime
::
Message
::
Ptr
secMessage
=
composer
->
resultMessages
()[
1
];
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
ComposerTestUtil
::
verifySignatureAndEncryption
(
primMessage
.
data
(),
data
.
toUtf8
(),
(
Kleo
::
CryptoMessageFormat
)
format
);
...
...
@@ -438,7 +438,7 @@ void CryptoComposerTest::testOpenPGPInline()
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
if
(
sign
&&
!
encrypt
)
{
data
+=
QString
::
fromLatin1
(
"
\n
"
);
...
...
@@ -602,7 +602,7 @@ void CryptoComposerTest::runSMIMETest(bool sign, bool enc, bool opaque)
QCOMPARE
(
composer
->
resultMessages
().
size
(),
1
);
KMime
::
Message
::
Ptr
message
=
composer
->
resultMessages
().
first
();
delete
composer
;
composer
=
Q_NULLPTR
;
composer
=
nullptr
;
//qDebug() << "message:" << message->encodedContent();
...
...
messagecomposer/autotests/followupreminderselectdatedialogtest.h
View file @
78aecb44
...
...
@@ -27,7 +27,7 @@ class FollowupReminderSelectDateDialogTest : public QObject
{
Q_OBJECT
public:
explicit
FollowupReminderSelectDateDialogTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
FollowupReminderSelectDateDialogTest
(
QObject
*
parent
=
nullptr
);
~
FollowupReminderSelectDateDialogTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
...
...
messagecomposer/autotests/globalparttest.h
View file @
78aecb44
...
...
@@ -25,7 +25,7 @@ class GlobalPartTest : public QObject
{
Q_OBJECT
public:
explicit
GlobalPartTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
GlobalPartTest
(
QObject
*
parent
=
nullptr
);
~
GlobalPartTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
...
...
messagecomposer/autotests/infoparttest.h
View file @
78aecb44
...
...
@@ -26,7 +26,7 @@ class InfoPartTest : public QObject
{
Q_OBJECT
public:
explicit
InfoPartTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
InfoPartTest
(
QObject
*
parent
=
nullptr
);
~
InfoPartTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
...
...
messagecomposer/autotests/messagefactorytest.cpp
View file @
78aecb44
...
...
@@ -129,7 +129,7 @@ QTEST_MAIN(MessageFactoryTest)
void
MessageFactoryTest
::
cleanupTestCase
()
{
delete
mIdentMan
;
mIdentMan
=
Q_NULLPTR
;
mIdentMan
=
nullptr
;
QDir
dir
(
QDir
::
homePath
()
+
QStringLiteral
(
"/.qttest/"
));
dir
.
removeRecursively
();
}
...
...
messagecomposer/autotests/plugineditorcheckbeforesendparamstest.h
View file @
78aecb44
...
...
@@ -26,7 +26,7 @@ class PluginEditorCheckBeforeSendParamsTest : public QObject
{
Q_OBJECT
public:
explicit
PluginEditorCheckBeforeSendParamsTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
PluginEditorCheckBeforeSendParamsTest
(
QObject
*
parent
=
nullptr
);
~
PluginEditorCheckBeforeSendParamsTest
();
private
Q_SLOTS
:
...
...
messagecomposer/autotests/recipientseditortest.cpp
View file @
78aecb44
...
...
@@ -32,7 +32,7 @@ class RecipientsLineTestFactory : public MessageComposer::RecipientLineFactory
Q_OBJECT
public:
explicit
RecipientsLineTestFactory
(
QObject
*
parent
=
Q_NULLPTR
)
explicit
RecipientsLineTestFactory
(
QObject
*
parent
=
nullptr
)
:
MessageComposer
::
RecipientLineFactory
(
parent
)
{
}
...
...
messagecomposer/autotests/singlepartjobtest.cpp
View file @
78aecb44
...
...
@@ -43,8 +43,8 @@ void SinglepartJobTest::testContent()
result
->
assemble
();
qDebug
()
<<
result
->
encodedContent
();
QCOMPARE
(
result
->
body
(),
data
);
QVERIFY
(
result
->
contentDisposition
(
false
)
==
Q_NULLPTR
);
// Not created unless demanded.
QVERIFY
(
result
->
contentType
(
false
)
==
Q_NULLPTR
);
// Not created unless demanded.
QVERIFY
(
result
->
contentDisposition
(
false
)
==
nullptr
);
// Not created unless demanded.
QVERIFY
(
result
->
contentType
(
false
)
==
nullptr
);
// Not created unless demanded.
QVERIFY
(
result
->
contentTransferEncoding
(
false
));
// KMime gives it a default one (7bit).
}
...
...
messagecomposer/autotests/testcsshelper.h
View file @
78aecb44
...
...
@@ -27,7 +27,7 @@
class
TestCSSHelper
:
public
MessageViewer
::
CSSHelper
{
public:
TestCSSHelper
()
:
MessageViewer
::
CSSHelper
(
Q_NULLPTR
)
{}
TestCSSHelper
()
:
MessageViewer
::
CSSHelper
(
nullptr
)
{}
virtual
~
TestCSSHelper
()
{}
QString
nonQuotedFontTag
()
const
...
...
messagecomposer/autotests/textparttest.h
View file @
78aecb44
...
...
@@ -25,7 +25,7 @@ class TextPartTest : public QObject
{
Q_OBJECT
public:
explicit
TextPartTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
TextPartTest
(
QObject
*
parent
=
nullptr
);
~
TextPartTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
...
...
messagecomposer/src/attachment/attachmentcontrollerbase.cpp
View file @
78aecb44
...
...
@@ -144,29 +144,29 @@ AttachmentControllerBase::Private::Private(AttachmentControllerBase *qq)
:
q
(
qq
)
,
encryptEnabled
(
false
)
,
signEnabled
(
false
)
,
model
(
Q_NULLPTR
)
,
wParent
(
Q_NULLPTR
)
,
mActionCollection
(
Q_NULLPTR
)
,
attachPublicKeyAction
(
Q_NULLPTR
)
,
attachMyPublicKeyAction
(
Q_NULLPTR
)
,
openContextAction
(
Q_NULLPTR
)
,
viewContextAction
(
Q_NULLPTR
)
,
editContextAction
(
Q_NULLPTR
)
,
editWithContextAction
(
Q_NULLPTR
)
,
removeAction
(
Q_NULLPTR
)
,
removeContextAction
(
Q_NULLPTR
)
,
saveAsAction
(
Q_NULLPTR
)
,
saveAsContextAction
(
Q_NULLPTR
)
,
propertiesAction
(
Q_NULLPTR
)
,
propertiesContextAction
(
Q_NULLPTR
)
,
addAttachmentFileAction
(
Q_NULLPTR
)
,
addAttachmentDirectoryAction
(
Q_NULLPTR
)
,
addContextAction
(
Q_NULLPTR
)
,
selectAllAction
(
Q_NULLPTR
)
,
attachmentMenu
(
Q_NULLPTR
)
,
addOwnVcardAction
(
Q_NULLPTR
)
,
reloadAttachmentAction
(
Q_NULLPTR
)
,
attachVCardsAction
(
Q_NULLPTR
)
,
model
(
nullptr
)
,
wParent
(
nullptr
)
,
mActionCollection
(
nullptr
)
,
attachPublicKeyAction
(
nullptr
)
,
attachMyPublicKeyAction
(
nullptr
)
,
openContextAction
(
nullptr
)
,
viewContextAction
(
nullptr
)
,
editContextAction
(
nullptr
)
,
editWithContextAction
(
nullptr
)
,
removeAction
(
nullptr
)
,
removeContextAction
(
nullptr
)
,
saveAsAction
(
nullptr
)
,
saveAsContextAction
(
nullptr
)
,
propertiesAction
(
nullptr
)
,
propertiesContextAction
(
nullptr
)
,
addAttachmentFileAction
(
nullptr
)
,
addAttachmentDirectoryAction
(
nullptr
)
,
addContextAction
(
nullptr
)
,
selectAllAction
(
nullptr
)
,
attachmentMenu
(
nullptr
)
,
addOwnVcardAction
(
nullptr
)
,
reloadAttachmentAction
(
nullptr
)
,
attachVCardsAction
(
nullptr
)
{
}
...
...
@@ -434,12 +434,12 @@ static QTemporaryFile *dumpAttachmentToTempFile(const AttachmentPart::Ptr part)
if
(
!
file
->
open
())
{
qCCritical
(
MESSAGECOMPOSER_LOG
)
<<
"Could not open tempfile"
<<
file
->
fileName
();
delete
file
;
return
Q_NULLPTR
;
return
nullptr
;
}
if
(
file
->
write
(
part
->
data
())
==
-
1
)
{
qCCritical
(
MESSAGECOMPOSER_LOG
)
<<
"Could not dump attachment to tempfile."
;
delete
file
;
return
Q_NULLPTR
;
return
nullptr
;
}
file
->
flush
();
return
file
;
...
...
@@ -696,7 +696,7 @@ void AttachmentControllerBase::openWith(const KService::Ptr &offer)
}
if
(
!
result
)
{
delete
tempFile
;
tempFile
=
Q_NULLPTR
;
tempFile
=
nullptr
;
}
else
{
// The file was opened. Delete it only when the composer is closed
// (and this object is destroyed).
...
...
@@ -729,7 +729,7 @@ void AttachmentControllerBase::openAttachment(AttachmentPart::Ptr part)
i18n
(
"Unable to open attachment"
));
}
delete
tempFile
;
tempFile
=
Q_NULLPTR
;
tempFile
=
nullptr
;
}
else
{
// The file was opened. Delete it only when the composer is closed
// (and this object is destroyed).
...
...
@@ -833,7 +833,7 @@ void AttachmentControllerBase::slotPutResult(KJob *job)
if
(
job
->
error
())
{
if
(
job
->
error
()
==
KIO
::
ERR_FILE_ALREADY_EXIST
)
{
if
(
KMessageBox
::
warningContinueCancel
(
Q_NULLPTR
,
if
(
KMessageBox
::
warningContinueCancel
(
nullptr
,
i18n
(
"File %1 exists.
\n
Do you want to replace it?"
,
_job
->
url
().
toLocalFile
()),
i18n
(
"Save to File"
),
KGuiItem
(
i18n
(
"&Replace"
)))
==
KMessageBox
::
Continue
)
{
byteArrayToRemoteFile
(
_job
->
data
(),
_job
->
url
(),
true
);
...
...
messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h
View file @
78aecb44
...
...
@@ -26,7 +26,7 @@ class RichTextComposerNgTest : public QObject
{
Q_OBJECT
public:
explicit
RichTextComposerNgTest
(
QObject
*
parent
=
Q_NULLPTR
);
explicit
RichTextComposerNgTest
(
QObject
*
parent
=
nullptr
);
~
RichTextComposerNgTest
();
private
Q_SLOTS
:
void
shouldHaveDefaultValue
();
...
...
messagecomposer/src/composer-ng/richtextcomposerng.cpp
View file @
78aecb44
...
...
@@ -36,7 +36,7 @@ class MessageComposer::RichTextComposerNgPrivate
{
public:
RichTextComposerNgPrivate
(
RichTextComposerNg
*
q
)
:
autoCorrection
(
Q_NULLPTR
),
:
autoCorrection
(
nullptr
),
richtextComposer
(
q
)
{
richTextComposerSignatures
=
new
MessageComposer
::
RichTextComposerSignatures
(
richtextComposer
,
richtextComposer
);
...
...
messagecomposer/src/composer/composer.cpp
View file @
78aecb44
...
...
@@ -54,11 +54,11 @@ public:
,
encrypt
(
false
)
,
noCrypto
(
false
)
,
autoSaving
(
false
)
,
globalPart
(
Q_NULLPTR
)
,
infoPart
(
Q_NULLPTR
)
,
textPart
(
Q_NULLPTR
)
,
skeletonMessage
(
Q_NULLPTR
)
,
resultContent
(
Q_NULLPTR
)
,
globalPart
(
nullptr
)
,
infoPart
(
nullptr
)
,
textPart
(
nullptr
)
,
skeletonMessage
(
nullptr
)
,
resultContent
(
nullptr
)
{
}
...
...
@@ -152,7 +152,7 @@ void ComposerPrivate::composeStep2()
{
Q_Q
(
Composer
);
ContentJobBase
*
mainJob
=
Q_NULLPTR
;
ContentJobBase
*
mainJob
=
nullptr
;
MainTextJob
*
mainTextJob
=
new
MainTextJob
(
textPart
,
q
);
if
((
sign
||
encrypt
)
&&
format
&
Kleo
::
InlineOpenPGPFormat
)
{
// needs custom handling --- one SignEncryptJob by itself
...
...
@@ -278,7 +278,7 @@ QList<ContentJobBase *> ComposerPrivate::createEncryptJobs(ContentJobBase *conte
for
(
int
i
=
0
;
i
<
encDataSize
;
++
i
)
{
QPair
<
QStringList
,
std
::
vector
<
GpgME
::
Key
>
>
recipients
=
encData
[
i
];
qCDebug
(
MESSAGECOMPOSER_LOG
)
<<
"got first list of recipients:"
<<
recipients
.
first
;
ContentJobBase
*
subJob
=
Q_NULLPTR
;
ContentJobBase
*
subJob
=
nullptr
;
if
(
sign
)
{
SignEncryptJob
*
seJob
=
new
SignEncryptJob
(
q
);
...
...
@@ -385,7 +385,7 @@ void ComposerPrivate::composeWithLateAttachments(KMime::Message *headers, KMime:
if
(
attachment
->
isSigned
())
{
qCDebug
(
MESSAGECOMPOSER_LOG
)
<<
"adding signjob for late attachment"
;
SignJob
*
sJob
=
new
SignJob
(
q
);
sJob
->
setContent
(
Q_NULLPTR
);
sJob
->
setContent
(
nullptr
);
sJob
->
setCryptoMessageFormat
(
format
);
sJob
->
setSigningKeys
(
signers
);
...
...
messagecomposer/src/composer/composerviewbase.cpp
View file @
78aecb44
...
...
@@ -99,16 +99,16 @@ static QStringList encodeIdn(const QStringList &emails)
MessageComposer
::
ComposerViewBase
::
ComposerViewBase
(
QObject
*
parent
,
QWidget
*
parentGui
)
:
QObject
(
parent
)
,
m_msg
(
KMime
::
Message
::
Ptr
(
new
KMime
::
Message
))
,
m_attachmentController
(
Q_NULLPTR
)
,
m_attachmentModel
(
Q_NULLPTR
)
,
m_signatureController
(
Q_NULLPTR
)
,
m_recipientsEditor
(
Q_NULLPTR
)
,
m_identityCombo
(
Q_NULLPTR
)
,
m_identMan
(
Q_NULLPTR
)
,
m_editor
(
Q_NULLPTR
)
,
m_transport
(
Q_NULLPTR
)
,
m_dictionary
(
Q_NULLPTR
)
,
m_fccCombo
(
Q_NULLPTR
)
,
m_attachmentController
(
nullptr
)
,
m_attachmentModel
(
nullptr
)
,
m_signatureController
(
nullptr
)
,
m_recipientsEditor
(
nullptr
)
,
m_identityCombo
(
nullptr
)
,
m_identMan
(
nullptr
)
,
m_editor
(
nullptr
)
,
m_transport
(
nullptr
)
,
m_dictionary
(
nullptr
)
,
m_fccCombo
(
nullptr
)
,
m_parentWidget
(
parentGui
)
,
m_sign
(
false
)
,
m_encrypt
(
false
)
...
...
@@ -117,10 +117,10 @@ MessageComposer::ComposerViewBase::ComposerViewBase(QObject *parent, QWidget *pa
,
m_urgent
(
false
)
,
m_cryptoMessageFormat
(
Kleo
::
AutoFormat
)
,
m_pendingQueueJobs
(
0
)
,
m_autoSaveTimer
(
Q_NULLPTR
)
,
m_autoSaveTimer
(
nullptr
)
,
m_autoSaveErrorShown
(
false
)
,
m_autoSaveInterval
(
1
*
1000
*
60
)
// default of 1 min
,
mSendLaterInfo
(
Q_NULLPTR
)
,
mSendLaterInfo
(
nullptr
)
{
m_charsets
<<
"utf-8"
;
// default, so we have a backup in case client code forgot to set.
...
...
@@ -1063,7 +1063,7 @@ void MessageComposer::ComposerViewBase::updateAutoSave()
{
if
(
m_autoSaveInterval
==
0
)
{
delete
m_autoSaveTimer
;
m_autoSaveTimer
=
Q_NULLPTR
;
m_autoSaveTimer
=
nullptr
;
}
else
{
if
(
!
m_autoSaveTimer
)
{
m_autoSaveTimer
=
new
QTimer
(
this
);
...
...
@@ -1082,7 +1082,7 @@ void MessageComposer::ComposerViewBase::updateAutoSave()
void
MessageComposer
::
ComposerViewBase
::
cleanupAutoSave
()
{
delete
m_autoSaveTimer
;
m_autoSaveTimer
=
Q_NULLPTR
;
m_autoSaveTimer
=
nullptr
;
if
(
!
m_autoSaveUUID
.
isEmpty
())
{
qCDebug
(
MESSAGECOMPOSER_LOG
)
<<
"deleting autosave files"
<<
m_autoSaveUUID
;
...
...
@@ -1300,7 +1300,7 @@ void MessageComposer::ComposerViewBase::slotCreateItemResult(KJob *job)
mSendLaterInfo
->
setItemId
(
item
.
id
());
SendLater
::
SendLaterUtil
::
writeSendLaterInfo
(
SendLater
::
SendLaterUtil
::
defaultConfig
(),
mSendLaterInfo
);
delete
mSendLaterInfo
;
mSendLaterInfo
=
Q_NULLPTR
;
mSendLaterInfo
=
nullptr
;
}
}
...
...
messagecomposer/src/composer/keyresolver.cpp
View file @
78aecb44
...
...
@@ -378,7 +378,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed(const std::vector<GpgME::Key>
msg
+=
keysAsStrings
(
rewookies
).
join
(
QLatin1Char
(
','
));
}
if
(
KMessageBox
::
warningContinueCancel
(
Q_NULLPTR
,
msg
,
i18n
(
"Not Fully Trusted Encryption Keys"
),
if
(
KMessageBox
::
warningContinueCancel
(
nullptr
,
msg
,
i18n
(
"Not Fully Trusted Encryption Keys"
),
KStandardGuiItem
::
cont
(),
KStandardGuiItem
::
cancel
(),
QStringLiteral
(
"not fully trusted encryption key warning"
))
==
KMessageBox
::
Continue
)
{
...
...
@@ -676,7 +676,7 @@ Kleo::KeyResolver::KeyResolver(bool encToSelf, bool showApproval, bool oppEncryp
Kleo
::
KeyResolver
::~
KeyResolver
()
{
delete
d
;
d
=
Q_NULLPTR
;
delete
d
;
d
=
nullptr
;
}
Kleo
::
Result
Kleo
::
KeyResolver
::
checkKeyNearExpiry
(
const
GpgME
::
Key
&
key
,
const
char
*
dontAskAgainName
,
...
...
@@ -696,7 +696,7 @@ Kleo::Result Kleo::KeyResolver::checkKeyNearExpiry(const GpgME::Key &key, const
return
Kleo
::
Ok
;
}
static
const
double
secsPerDay
=
24
*
60
*
60
;
const
double
secsTillExpiry
=
::
difftime
(
subkey
.
expirationTime
(),
time
(
Q_NULLPTR
));
const
double
secsTillExpiry
=
::
difftime
(
subkey
.
expirationTime
(),
time
(
nullptr
));
if
(
secsTillExpiry
<=
0
)
{
const
int
daysSinceExpiry
=
1
+
int
(
-
secsTillExpiry
/
secsPerDay
);
qCDebug
(
MESSAGECOMPOSER_LOG
)
<<
"Key 0x"
<<
key
.
shortKeyID
()
<<
" expired less than "
...
...
@@ -783,7 +783,7 @@ Kleo::Result Kleo::KeyResolver::checkKeyNearExpiry(const GpgME::Key &key, const
.
subs
(
QString
::
fromLatin1
(
key
.
issuerSerial
()))
.
toString
());
d
->
alreadyWarnedFingerprints
.
insert
(
subkey
.
fingerprint
());
if
(
KMessageBox
::
warningContinueCancel
(
Q_NULLPTR
,
msg
,
if
(
KMessageBox
::
warningContinueCancel
(
nullptr
,
msg
,