Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM MailCommon
Commits
0a7c142d
Commit
0a7c142d
authored
Jan 14, 2019
by
Laurent Montel
Browse files
Fix some clazy wazrning
parent
898e1123
Changes
11
Hide whitespace changes
Inline
Side-by-side
src/filter/filteractions/filteractionaddheader.cpp
View file @
0a7c142d
...
...
@@ -33,7 +33,7 @@ using namespace MailCommon;
FilterActionAddHeader
::
FilterActionAddHeader
(
QObject
*
parent
)
:
FilterActionWithStringList
(
QStringLiteral
(
"add header"
),
i18n
(
"Add Header"
),
parent
)
{
mParameterList
<<
QString
Literal
(
""
)
mParameterList
<<
QString
(
)
<<
QStringLiteral
(
"Reply-To"
)
<<
QStringLiteral
(
"Delivered-To"
)
<<
QStringLiteral
(
"X-KDE-PR-Message"
)
...
...
src/filter/filteractions/filteractionremoveheader.cpp
View file @
0a7c142d
...
...
@@ -34,7 +34,7 @@ FilterAction *FilterActionRemoveHeader::newAction()
FilterActionRemoveHeader
::
FilterActionRemoveHeader
(
QObject
*
parent
)
:
FilterActionWithStringList
(
QStringLiteral
(
"remove header"
),
i18n
(
"Remove Header"
),
parent
)
{
mParameterList
<<
QString
Literal
(
""
)
mParameterList
<<
QString
(
)
<<
QStringLiteral
(
"Reply-To"
)
<<
QStringLiteral
(
"Delivered-To"
)
<<
QStringLiteral
(
"X-KDE-PR-Message"
)
...
...
src/filter/filteractions/filteractionrewriteheader.cpp
View file @
0a7c142d
...
...
@@ -37,7 +37,7 @@ FilterAction *FilterActionRewriteHeader::newAction()
FilterActionRewriteHeader
::
FilterActionRewriteHeader
(
QObject
*
parent
)
:
FilterActionWithStringList
(
QStringLiteral
(
"rewrite header"
),
i18n
(
"Rewrite Header"
),
parent
)
{
mParameterList
<<
QString
Literal
(
""
)
mParameterList
<<
QString
(
)
<<
QStringLiteral
(
"Subject"
)
<<
QStringLiteral
(
"Reply-To"
)
<<
QStringLiteral
(
"Delivered-To"
)
...
...
src/filter/filterimporter/autotests/filtertestkernel.h
View file @
0a7c142d
...
...
@@ -30,6 +30,7 @@ class FolderCollectionMonitor;
class
FilterTestKernel
:
public
QObject
,
public
MailCommon
::
IKernel
,
public
MailCommon
::
ISettings
{
Q_OBJECT
public:
explicit
FilterTestKernel
(
QObject
*
parent
=
nullptr
);
...
...
src/filter/filterimporter/filterimporterbalsa.cpp
View file @
0a7c142d
...
...
@@ -68,7 +68,7 @@ void FilterImporterBalsa::parseFilter(const KConfigGroup &grp)
filter
->
setToolbarName
(
name
);
//TODO not implemented in kmail.
const
QString
popupText
=
grp
.
readEntry
(
QStringLiteral
(
"Popup-text"
));
//
const QString popupText = grp.readEntry(QStringLiteral("Popup-text"));
const
QString
sound
=
grp
.
readEntry
(
QStringLiteral
(
"Sound"
));
if
(
!
sound
.
isEmpty
())
{
...
...
src/filter/kmfilterlistbox.cpp
View file @
0a7c142d
...
...
@@ -381,7 +381,7 @@ void KMFilterListBox::applyFilterChanged(bool closeAfterSaving)
QList
<
MailFilter
*>
KMFilterListBox
::
filtersForSaving
(
bool
closeAfterSaving
,
bool
&
wasCanceled
)
const
{
const_cast
<
KMFilterListBox
*>
(
this
)
->
applyWidgets
();
// signals aren't const
Q_EMIT
const_cast
<
KMFilterListBox
*>
(
this
)
->
applyWidgets
();
// signals aren't const
QList
<
MailFilter
*>
filters
;
QStringList
emptyFilters
;
QVector
<
MailCommon
::
InvalidFilterInfo
>
listInvalidFilters
;
...
...
src/filter/mailfilter.cpp
View file @
0a7c142d
...
...
@@ -541,19 +541,19 @@ void MailFilter::writeConfig(KConfigGroup &config, bool exportFilter) const
QStringList
sets
;
if
(
bApplyOnInbound
)
{
sets
.
append
(
Q
Latin1
String
(
"check-mail"
));
sets
.
append
(
QString
Literal
(
"check-mail"
));
}
if
(
bApplyBeforeOutbound
)
{
sets
.
append
(
Q
Latin1
String
(
"before-send-mail"
));
sets
.
append
(
QString
Literal
(
"before-send-mail"
));
}
if
(
bApplyOnOutbound
)
{
sets
.
append
(
Q
Latin1
String
(
"send-mail"
));
sets
.
append
(
QString
Literal
(
"send-mail"
));
}
if
(
bApplyOnExplicit
)
{
sets
.
append
(
Q
Latin1
String
(
"manual-filtering"
));
sets
.
append
(
QString
Literal
(
"manual-filtering"
));
}
if
(
bApplyOnAllFolders
)
{
sets
.
append
(
Q
Latin1
String
(
"all-folders"
));
sets
.
append
(
QString
Literal
(
"all-folders"
));
}
config
.
writeEntry
(
"apply-on"
,
sets
);
...
...
src/job/folderjob.cpp
View file @
0a7c142d
...
...
@@ -35,8 +35,9 @@
using
namespace
MailCommon
;
//----------------------------------------------------------------------------
FolderJob
::
FolderJob
()
:
mErrorCode
(
0
)
FolderJob
::
FolderJob
(
QObject
*
parent
)
:
QObject
(
parent
)
,
mErrorCode
(
0
)
,
mStarted
(
false
)
,
mCancellable
(
false
)
{
...
...
src/job/folderjob.h
View file @
0a7c142d
...
...
@@ -40,7 +40,7 @@ class MAILCOMMON_EXPORT FolderJob : public QObject
Q_OBJECT
public:
FolderJob
();
explicit
FolderJob
(
QObject
*
parent
=
nullptr
);
virtual
~
FolderJob
();
...
...
src/search/searchpatternedit.cpp
View file @
0a7c142d
...
...
@@ -396,12 +396,12 @@ void SearchRuleWidget::initFieldList(SearchPatternEdit::SearchPatternEditOptions
// these others only represent message headers and you can add to
// them as you like
mFilterFieldList
.
append
(
Q
Latin1
String
(
"List-Id"
));
mFilterFieldList
.
append
(
Q
Latin1
String
(
"Resent-From"
));
mFilterFieldList
.
append
(
Q
Latin1
String
(
"X-Loop"
));
mFilterFieldList
.
append
(
Q
Latin1
String
(
"X-Mailing-List"
));
mFilterFieldList
.
append
(
Q
Latin1
String
(
"X-Spam-Flag"
));
mFilterFieldList
.
append
(
Q
Latin1
String
(
"X-Spam-Status"
));
mFilterFieldList
.
append
(
QString
Literal
(
"List-Id"
));
mFilterFieldList
.
append
(
QString
Literal
(
"Resent-From"
));
mFilterFieldList
.
append
(
QString
Literal
(
"X-Loop"
));
mFilterFieldList
.
append
(
QString
Literal
(
"X-Mailing-List"
));
mFilterFieldList
.
append
(
QString
Literal
(
"X-Spam-Flag"
));
mFilterFieldList
.
append
(
QString
Literal
(
"X-Spam-Status"
));
}
void
SearchRuleWidget
::
slotRuleFieldChanged
(
const
QString
&
field
)
...
...
src/search/searchrule/searchrule.cpp
View file @
0a7c142d
...
...
@@ -403,7 +403,7 @@ void SearchRule::generateSieveScript(QStringList &requireModules, QString &code)
code
+=
QLatin1Char
(
'"'
)
+
i18n
(
"
\"
%1
\"
is not supported with condition
\"
%2
\"
"
,
QLatin1String
(
mField
),
conditionToString
(
mFunction
))
+
QLatin1Char
(
'"'
);
return
;
}
code
+=
(
negative
?
QStringLiteral
(
"not "
)
:
QString
())
+
QStringLiteral
(
"body :text %1
\"
%2
\"
"
).
arg
(
comparaison
).
arg
(
contentStr
);
code
+=
(
negative
?
QStringLiteral
(
"not "
)
:
QString
())
+
QStringLiteral
(
"body :text %1
\"
%2
\"
"
).
arg
(
comparaison
,
contentStr
);
}
else
{
QString
comparaison
;
bool
negative
=
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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