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
KMail
Commits
d896d826
Commit
d896d826
authored
Oct 20, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment unused variable + const'ify
parent
948cf0e2
Pipeline
#38139
passed with stage
in 46 minutes and 45 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
14 deletions
+15
-14
src/editor/kmcomposerwin.cpp
src/editor/kmcomposerwin.cpp
+15
-14
No files found.
src/editor/kmcomposerwin.cpp
View file @
d896d826
...
...
@@ -73,7 +73,7 @@
#include <Libkdepim/ProgressStatusBarWidget>
#include <Libkdepim/StatusbarProgressWidget>
#include <followupreminder.h>
#include <KCursorSaver>
...
...
@@ -113,6 +113,13 @@
#include <MessageComposer/StatusBarLabelToggledState>
#include <MessageComposer/ConvertSnippetVariablesJob>
#include <MessageComposer/ComposerViewInterface>
#include <MessageComposer/SendLaterDialog>
#include <MessageComposer/SendLaterInfo>
#include <MessageComposer/SendLaterUtil>
#include <MessageComposer/PluginEditorConverterInitialData>
#include <MessageComposer/PluginEditorConverterBeforeConvertingData>
#include <MessageComposer/FollowupReminder>
#include <Sonnet/DictionaryComboBox>
...
...
@@ -133,10 +140,6 @@
#include <PimCommon/LineEditWithAutoCorrection>
#include <PimCommon/CustomToolsPluginManager>
#include <MessageComposer/SendLaterDialog>
#include <MessageComposer/SendLaterInfo>
#include <MessageComposer/SendLaterUtil>
#include <TemplateParser/TemplateParserJob>
#include <TemplateParser/TemplatesConfiguration>
...
...
@@ -178,8 +181,6 @@
#include <QStandardPaths>
#include <QStatusBar>
#include <QMenuBar>
#include <MessageComposer/PluginEditorConverterInitialData>
#include <MessageComposer/PluginEditorConverterBeforeConvertingData>
// GPGME
#include <gpgme++/keylistresult.h>
...
...
@@ -648,7 +649,7 @@ void KMComposerWin::addAttachment(const QString &name, KMime::Headers::contentEn
mComposerBase
->
addAttachment
(
name
,
name
,
charset
,
data
,
mimeType
);
}
void
KMComposerWin
::
readConfig
(
bool
reload
/* = false */
)
void
KMComposerWin
::
readConfig
(
bool
reload
)
{
mEdtFrom
->
setCompletionMode
((
KCompletion
::
CompletionMode
)
KMailSettings
::
self
()
->
completionMode
());
mComposerBase
->
recipientsEditor
()
->
setCompletionMode
((
KCompletion
::
CompletionMode
)
KMailSettings
::
self
()
->
completionMode
());
...
...
@@ -1024,7 +1025,7 @@ void KMComposerWin::applyTemplate(uint uoid, uint uOldId, const KIdentityManagem
void
KMComposerWin
::
slotDelayedApplyTemplate
(
KJob
*
job
)
{
const
Akonadi
::
ItemFetchJob
*
fetchJob
=
qobject_cast
<
Akonadi
::
ItemFetchJob
*>
(
job
);
const
Akonadi
::
Item
::
List
items
=
fetchJob
->
items
();
//
const Akonadi::Item::List items = fetchJob->items();
//Readd ? const TemplateParser::TemplateParserJob::Mode mode = static_cast<TemplateParser::TemplateParserJob::Mode>(fetchJob->property("mode").toInt());
const
uint
uoid
=
fetchJob
->
property
(
"uoid"
).
toUInt
();
...
...
@@ -1461,12 +1462,12 @@ void KMComposerWin::initializePluginActions()
}
//Initialize statusbar
const
QList
<
QWidget
*>
statusbarWidgetList
=
mPluginEditorManagerInterface
->
statusBarWidgetList
();
for
(
int
i
=
0
;
i
<
statusbarWidgetList
.
count
();
++
i
)
{
statusBar
()
->
addPermanentWidget
(
statusbarWidgetList
.
at
(
i
),
0
);
for
(
int
i
ndex
=
0
;
i
ndex
<
statusbarWidgetList
.
count
();
++
i
ndex
)
{
statusBar
()
->
addPermanentWidget
(
statusbarWidgetList
.
at
(
i
ndex
),
0
);
}
const
QList
<
QWidget
*>
statusbarWidgetListConverter
=
mPluginEditorConvertTextManagerInterface
->
statusBarWidgetList
();
for
(
int
i
=
0
;
i
<
statusbarWidgetListConverter
.
count
();
++
i
)
{
statusBar
()
->
addPermanentWidget
(
statusbarWidgetListConverter
.
at
(
i
),
0
);
for
(
int
i
ndex
=
0
;
i
ndex
<
statusbarWidgetListConverter
.
count
();
++
i
ndex
)
{
statusBar
()
->
addPermanentWidget
(
statusbarWidgetListConverter
.
at
(
i
ndex
),
0
);
}
}
}
...
...
@@ -2308,7 +2309,7 @@ void KMComposerWin::slotFetchJob(KJob *job)
return
;
}
if
(
items
.
f
irst
().
mimeType
()
==
KMime
::
Message
::
mimeType
())
{
if
(
items
.
constF
irst
().
mimeType
()
==
KMime
::
Message
::
mimeType
())
{
uint
identity
=
0
;
if
(
items
.
at
(
0
).
isValid
())
{
const
Akonadi
::
Collection
parentCollection
=
items
.
at
(
0
).
parentCollection
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment