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 Messagelib
Commits
81dbf56c
Commit
81dbf56c
authored
Feb 25, 2020
by
Laurent Montel
Browse files
Fix clazy warning
parent
1d257970
Changes
16
Hide whitespace changes
Inline
Side-by-side
messagecomposer/autotests/cryptocomposertest.cpp
View file @
81dbf56c
...
...
@@ -351,7 +351,7 @@ void CryptoComposerTest::testBCCEncrypt()
Composer
*
composer
=
new
Composer
;
QString
data
(
QStringLiteral
(
"All happy families are alike; each unhappy family is unhappy in its own way."
));
fillComposerData
(
composer
,
data
);
composer
->
infoPart
()
->
setBcc
(
QStringList
(
Q
Latin1
String
(
"bcc@bcc.org"
)));
composer
->
infoPart
()
->
setBcc
(
QStringList
(
QString
Literal
(
"bcc@bcc.org"
)));
std
::
vector
<
GpgME
::
Key
>
keys
=
MessageComposer
::
Test
::
getKeys
();
...
...
@@ -543,7 +543,7 @@ void CryptoComposerTest::fillComposerData(Composer *composer, const QString &dat
{
composer
->
globalPart
()
->
setFallbackCharsetEnabled
(
true
);
composer
->
infoPart
()
->
setFrom
(
QStringLiteral
(
"me@me.me"
));
composer
->
infoPart
()
->
setTo
(
QStringList
(
Q
Latin1
String
(
"you@you.you"
)));
composer
->
infoPart
()
->
setTo
(
QStringList
(
QString
Literal
(
"you@you.you"
)));
composer
->
textPart
()
->
setWrappedPlainText
(
data
);
}
...
...
messagecomposer/src/snippet/convertsnippetvariablesutil.cpp
View file @
81dbf56c
...
...
@@ -23,73 +23,73 @@ QString MessageComposer::ConvertSnippetVariablesUtil::snippetVariableFromEnum(Me
{
switch
(
type
)
{
case
CcAddr
:
return
Q
Latin1
String
(
"%CCADDR"
);
return
QString
Literal
(
"%CCADDR"
);
case
CcLname
:
return
Q
Latin1
String
(
"%CCLNAME"
);
return
QString
Literal
(
"%CCLNAME"
);
case
CcFname
:
return
Q
Latin1
String
(
"%CCFNAME"
);
return
QString
Literal
(
"%CCFNAME"
);
case
CcName
:
return
Q
Latin1
String
(
"%CCNAME"
);
return
QString
Literal
(
"%CCNAME"
);
case
FullSubject
:
return
Q
Latin1
String
(
"%FULLSUBJECT"
);
return
QString
Literal
(
"%FULLSUBJECT"
);
case
ToAddr
:
return
Q
Latin1
String
(
"%TOADDR"
);
return
QString
Literal
(
"%TOADDR"
);
case
ToFname
:
return
Q
Latin1
String
(
"%TOFNAME"
);
return
QString
Literal
(
"%TOFNAME"
);
case
ToLname
:
return
Q
Latin1
String
(
"%TOLNAME"
);
return
QString
Literal
(
"%TOLNAME"
);
case
ToName
:
return
Q
Latin1
String
(
"%TONAME"
);
return
QString
Literal
(
"%TONAME"
);
case
FromAddr
:
return
Q
Latin1
String
(
"%FROMADDR"
);
return
QString
Literal
(
"%FROMADDR"
);
case
FromLname
:
return
Q
Latin1
String
(
"%FROMLNAME"
);
return
QString
Literal
(
"%FROMLNAME"
);
case
FromFname
:
return
Q
Latin1
String
(
"%FROMFNAME"
);
return
QString
Literal
(
"%FROMFNAME"
);
case
FromName
:
return
Q
Latin1
String
(
"%FROMNAME"
);
return
QString
Literal
(
"%FROMNAME"
);
case
Dow
:
return
Q
Latin1
String
(
"%DOW"
);
return
QString
Literal
(
"%DOW"
);
case
Date
:
return
Q
Latin1
String
(
"%DATE"
);
return
QString
Literal
(
"%DATE"
);
case
ShortDate
:
return
Q
Latin1
String
(
"%SHORTDATE"
);
return
QString
Literal
(
"%SHORTDATE"
);
case
Time
:
return
Q
Latin1
String
(
"%TIME"
);
return
QString
Literal
(
"%TIME"
);
case
TimeLong
:
return
Q
Latin1
String
(
"%TIMELONG"
);
return
QString
Literal
(
"%TIMELONG"
);
case
AttachmentCount
:
return
Q
Latin1
String
(
"%ATTACHMENTCOUNT"
);
return
QString
Literal
(
"%ATTACHMENTCOUNT"
);
case
AttachmentName
:
return
Q
Latin1
String
(
"%ATTACHMENTNAMES"
);
return
QString
Literal
(
"%ATTACHMENTNAMES"
);
case
AttachmentFilenames
:
return
Q
Latin1
String
(
"%ATTACHMENTFILENAMES"
);
return
QString
Literal
(
"%ATTACHMENTFILENAMES"
);
case
AttachmentNamesAndSizes
:
return
Q
Latin1
String
(
"%ATTACHMENTNAMESANDSIZES"
);
return
QString
Literal
(
"%ATTACHMENTNAMESANDSIZES"
);
case
Year
:
return
Q
Latin1
String
(
"%YEAR"
);
return
QString
Literal
(
"%YEAR"
);
case
LastYear
:
return
Q
Latin1
String
(
"%LASTYEAR"
);
return
QString
Literal
(
"%LASTYEAR"
);
case
NextYear
:
return
Q
Latin1
String
(
"%NEXTYEAR"
);
return
QString
Literal
(
"%NEXTYEAR"
);
case
MonthNumber
:
return
Q
Latin1
String
(
"%MONTHNUMBER"
);
//1-12
return
QString
Literal
(
"%MONTHNUMBER"
);
//1-12
case
DayOfMonth
:
return
Q
Latin1
String
(
"%DAYOFMONTH"
);
//1-31
return
QString
Literal
(
"%DAYOFMONTH"
);
//1-31
case
WeekNumber
:
return
Q
Latin1
String
(
"%WEEKNUMBER"
);
//1-52
return
QString
Literal
(
"%WEEKNUMBER"
);
//1-52
case
MonthNameShort
:
return
Q
Latin1
String
(
"%MONTHNAMESHORT"
);
//(Jan-Dec)
return
QString
Literal
(
"%MONTHNAMESHORT"
);
//(Jan-Dec)
case
MonthNameLong
:
return
Q
Latin1
String
(
"%MONTHNAMELONG"
);
//(January-December)
return
QString
Literal
(
"%MONTHNAMELONG"
);
//(January-December)
case
DayOfWeek
:
return
Q
Latin1
String
(
"%DAYOFWEEK"
);
//(1-7)
return
QString
Literal
(
"%DAYOFWEEK"
);
//(1-7)
case
DayOfWeekNameShort
:
return
Q
Latin1
String
(
"%DAYOFWEEKNAMESHORT"
);
//(Mon-Sun)
return
QString
Literal
(
"%DAYOFWEEKNAMESHORT"
);
//(Mon-Sun)
case
DayOfWeekNameLong
:
return
Q
Latin1
String
(
"%DAYOFWEEKNAMELONG"
);
//(Monday-Sunday)
return
QString
Literal
(
"%DAYOFWEEKNAMELONG"
);
//(Monday-Sunday)
case
YearLastMonth
:
return
Q
Latin1
String
(
"%YEARLASTMONTH"
);
//january 2020 will how 2019-12
return
QString
Literal
(
"%YEARLASTMONTH"
);
//january 2020 will how 2019-12
}
return
{};
}
messagelist/src/core/sortorder.cpp
View file @
81dbf56c
...
...
@@ -194,7 +194,7 @@ bool SortOrder::validForAggregation(const Aggregation *aggregation) const
&&
groupSortingOk
&&
groupSortDirectionOk
;
}
SortOrder
SortOrder
::
defaultForAggregation
(
const
Aggregation
*
aggregation
,
const
SortOrder
&
oldSortOrder
)
SortOrder
SortOrder
::
defaultForAggregation
(
const
Aggregation
*
aggregation
,
SortOrder
oldSortOrder
)
{
SortOrder
newSortOrder
;
...
...
messagelist/src/core/sortorder.h
View file @
81dbf56c
...
...
@@ -176,7 +176,7 @@ public:
* will be based on that old sort order, i.e. the message sorting and
* message sort direction is adopted.
*/
static
SortOrder
defaultForAggregation
(
const
Aggregation
*
aggregation
,
const
SortOrder
&
oldSortOrder
);
static
SortOrder
defaultForAggregation
(
const
Aggregation
*
aggregation
,
SortOrder
oldSortOrder
);
/**
* Returns true if the ms parameter specifies a valid MessageSorting option.
...
...
messageviewer/src/dkim-verify/dkimchecksignaturejob.cpp
View file @
81dbf56c
...
...
@@ -564,7 +564,7 @@ DKIMCheckSignatureJob::DKIMWarning DKIMCheckSignatureJob::warning() const
return
mWarning
;
}
void
DKIMCheckSignatureJob
::
setWarning
(
const
DKIMCheckSignatureJob
::
DKIMWarning
&
warning
)
void
DKIMCheckSignatureJob
::
setWarning
(
DKIMCheckSignatureJob
::
DKIMWarning
warning
)
{
mWarning
=
warning
;
}
...
...
@@ -654,7 +654,7 @@ DKIMCheckSignatureJob::DKIMStatus DKIMCheckSignatureJob::status() const
return
mStatus
;
}
void
DKIMCheckSignatureJob
::
setStatus
(
const
DKIMCheckSignatureJob
::
DKIMStatus
&
status
)
void
DKIMCheckSignatureJob
::
setStatus
(
DKIMCheckSignatureJob
::
DKIMStatus
status
)
{
mStatus
=
status
;
}
...
...
messageviewer/src/dkim-verify/dkimchecksignaturejob.h
View file @
81dbf56c
...
...
@@ -125,7 +125,7 @@ public:
Q_REQUIRED_RESULT
QString
dkimValue
()
const
;
Q_REQUIRED_RESULT
DKIMCheckSignatureJob
::
DKIMStatus
status
()
const
;
void
setStatus
(
const
DKIMCheckSignatureJob
::
DKIMStatus
&
status
);
void
setStatus
(
MessageViewer
::
DKIMCheckSignatureJob
::
DKIMStatus
status
);
Q_REQUIRED_RESULT
MessageViewer
::
DKIMCheckSignatureJob
::
DKIMStatus
checkSignature
(
const
MessageViewer
::
DKIMInfo
&
info
);
...
...
@@ -135,7 +135,7 @@ public:
void
setMessage
(
const
KMime
::
Message
::
Ptr
&
message
);
Q_REQUIRED_RESULT
DKIMCheckSignatureJob
::
DKIMWarning
warning
()
const
;
void
setWarning
(
const
DKIMWarning
&
warning
);
void
setWarning
(
MessageViewer
::
DKIMCheckSignatureJob
::
DKIMWarning
warning
);
Q_REQUIRED_RESULT
QString
headerCanonizationResult
()
const
;
...
...
messageviewer/src/dkim-verify/dkiminfo.cpp
View file @
81dbf56c
...
...
@@ -189,7 +189,7 @@ DKIMInfo::CanonicalizationType DKIMInfo::bodyCanonization() const
return
mBodyCanonization
;
}
void
DKIMInfo
::
setBodyCanonization
(
const
CanonicalizationType
&
bodyCanonization
)
void
DKIMInfo
::
setBodyCanonization
(
CanonicalizationType
bodyCanonization
)
{
mBodyCanonization
=
bodyCanonization
;
}
...
...
@@ -219,7 +219,7 @@ DKIMInfo::CanonicalizationType DKIMInfo::headerCanonization() const
return
mHeaderCanonization
;
}
void
DKIMInfo
::
setHeaderCanonization
(
const
CanonicalizationType
&
headerCanonization
)
void
DKIMInfo
::
setHeaderCanonization
(
CanonicalizationType
headerCanonization
)
{
mHeaderCanonization
=
headerCanonization
;
}
...
...
messageviewer/src/dkim-verify/dkiminfo.h
View file @
81dbf56c
...
...
@@ -92,10 +92,10 @@ public:
void
setBodyLengthCount
(
int
bodyLengthCount
);
Q_REQUIRED_RESULT
CanonicalizationType
headerCanonization
()
const
;
void
setHeaderCanonization
(
const
CanonicalizationType
&
headerCanonization
);
void
setHeaderCanonization
(
CanonicalizationType
headerCanonization
);
Q_REQUIRED_RESULT
CanonicalizationType
bodyCanonization
()
const
;
void
setBodyCanonization
(
const
CanonicalizationType
&
bodyCanonization
);
void
setBodyCanonization
(
CanonicalizationType
bodyCanonization
);
Q_REQUIRED_RESULT
bool
operator
==
(
const
DKIMInfo
&
other
)
const
;
...
...
messageviewer/src/dkim-verify/dkimmanagerkey.cpp
View file @
81dbf56c
...
...
@@ -105,9 +105,9 @@ void DKIMManagerKey::saveKeys()
const
QString
groupName
=
QStringLiteral
(
"DKIM Key Record #%1"
).
arg
(
i
);
KConfigGroup
group
=
config
->
group
(
groupName
);
const
KeyInfo
&
info
=
mKeys
.
at
(
i
);
group
.
writeEntry
(
Q
Latin1
String
(
"Selector"
),
info
.
selector
);
group
.
writeEntry
(
Q
Latin1
String
(
"Domain"
),
info
.
domain
);
group
.
writeEntry
(
Q
Latin1
String
(
"Key"
),
info
.
keyValue
);
group
.
writeEntry
(
QString
Literal
(
"Selector"
),
info
.
selector
);
group
.
writeEntry
(
QString
Literal
(
"Domain"
),
info
.
domain
);
group
.
writeEntry
(
QString
Literal
(
"Key"
),
info
.
keyValue
);
}
}
...
...
messageviewer/src/dkim-verify/dkimmanagerrules.cpp
View file @
81dbf56c
...
...
@@ -75,13 +75,13 @@ int DKIMManagerRules::loadRules(const QString &fileName)
int
numberOfRulesAdded
=
0
;
for
(
const
QString
&
groupName
:
rulesGroups
)
{
KConfigGroup
group
=
config
->
group
(
groupName
);
const
QStringList
signedDomainIdentifier
=
group
.
readEntry
(
Q
Latin1
String
(
"SignedDomainIdentifier"
),
QStringList
());
const
QString
from
=
group
.
readEntry
(
Q
Latin1
String
(
"From"
),
QString
());
const
QString
domain
=
group
.
readEntry
(
Q
Latin1
String
(
"Domain"
),
QString
());
const
bool
enabled
=
group
.
readEntry
(
Q
Latin1
String
(
"Enabled"
),
true
);
const
int
ruleType
=
group
.
readEntry
(
Q
Latin1
String
(
"RuleType"
),
0
);
const
QString
listId
=
group
.
readEntry
(
Q
Latin1
String
(
"List-Id"
),
QString
());
const
int
priority
=
group
.
readEntry
(
Q
Latin1
String
(
"Priority"
),
1000
);
const
QStringList
signedDomainIdentifier
=
group
.
readEntry
(
QString
Literal
(
"SignedDomainIdentifier"
),
QStringList
());
const
QString
from
=
group
.
readEntry
(
QString
Literal
(
"From"
),
QString
());
const
QString
domain
=
group
.
readEntry
(
QString
Literal
(
"Domain"
),
QString
());
const
bool
enabled
=
group
.
readEntry
(
QString
Literal
(
"Enabled"
),
true
);
const
int
ruleType
=
group
.
readEntry
(
QString
Literal
(
"RuleType"
),
0
);
const
QString
listId
=
group
.
readEntry
(
QString
Literal
(
"List-Id"
),
QString
());
const
int
priority
=
group
.
readEntry
(
QString
Literal
(
"Priority"
),
1000
);
DKIMRule
rule
;
rule
.
setEnabled
(
enabled
);
rule
.
setDomain
(
domain
);
...
...
@@ -133,12 +133,12 @@ void DKIMManagerRules::save(const QString &fileName)
KConfigGroup
group
=
config
->
group
(
groupName
);
const
DKIMRule
&
rule
=
mRules
.
at
(
i
);
group
.
writeEntry
(
Q
Latin1
String
(
"SignedDomainIdentifier"
),
rule
.
signedDomainIdentifier
());
group
.
writeEntry
(
Q
Latin1
String
(
"From"
),
rule
.
from
());
group
.
writeEntry
(
Q
Latin1
String
(
"Domain"
),
rule
.
domain
());
group
.
writeEntry
(
Q
Latin1
String
(
"Enabled"
),
rule
.
enabled
());
group
.
writeEntry
(
Q
Latin1
String
(
"RuleType"
),
static_cast
<
int
>
(
rule
.
ruleType
()));
group
.
writeEntry
(
Q
Latin1
String
(
"List-Id"
),
rule
.
listId
());
group
.
writeEntry
(
Q
Latin1
String
(
"Priority"
),
rule
.
priority
());
group
.
writeEntry
(
QString
Literal
(
"SignedDomainIdentifier"
),
rule
.
signedDomainIdentifier
());
group
.
writeEntry
(
QString
Literal
(
"From"
),
rule
.
from
());
group
.
writeEntry
(
QString
Literal
(
"Domain"
),
rule
.
domain
());
group
.
writeEntry
(
QString
Literal
(
"Enabled"
),
rule
.
enabled
());
group
.
writeEntry
(
QString
Literal
(
"RuleType"
),
static_cast
<
int
>
(
rule
.
ruleType
()));
group
.
writeEntry
(
QString
Literal
(
"List-Id"
),
rule
.
listId
());
group
.
writeEntry
(
QString
Literal
(
"Priority"
),
rule
.
priority
());
}
}
messageviewer/src/dkim-verify/dkimrule.cpp
View file @
81dbf56c
...
...
@@ -74,7 +74,7 @@ DKIMRule::RuleType DKIMRule::ruleType() const
return
mRuleType
;
}
void
DKIMRule
::
setRuleType
(
const
RuleType
&
ruleType
)
void
DKIMRule
::
setRuleType
(
RuleType
ruleType
)
{
mRuleType
=
ruleType
;
}
...
...
messageviewer/src/dkim-verify/dkimrule.h
View file @
81dbf56c
...
...
@@ -56,7 +56,7 @@ public:
Q_REQUIRED_RESULT
bool
isValid
()
const
;
Q_REQUIRED_RESULT
RuleType
ruleType
()
const
;
void
setRuleType
(
const
RuleType
&
ruleType
);
void
setRuleType
(
MessageViewer
::
DKIMRule
::
RuleType
ruleType
);
Q_REQUIRED_RESULT
QString
listId
()
const
;
void
setListId
(
const
QString
&
listId
);
...
...
messageviewer/src/dkim-verify/dkimwidgetinfo.cpp
View file @
81dbf56c
...
...
@@ -67,7 +67,7 @@ Akonadi::Item::Id DKIMWidgetInfo::currentItemId() const
return
mCurrentItemId
;
}
void
DKIMWidgetInfo
::
setCurrentItemId
(
const
Akonadi
::
Item
::
Id
&
currentItemId
)
void
DKIMWidgetInfo
::
setCurrentItemId
(
Akonadi
::
Item
::
Id
currentItemId
)
{
mCurrentItemId
=
currentItemId
;
}
...
...
messageviewer/src/dkim-verify/dkimwidgetinfo.h
View file @
81dbf56c
...
...
@@ -40,7 +40,7 @@ public:
void
clear
();
Q_REQUIRED_RESULT
Akonadi
::
Item
::
Id
currentItemId
()
const
;
void
setCurrentItemId
(
const
Akonadi
::
Item
::
Id
&
currentItemId
);
void
setCurrentItemId
(
Akonadi
::
Item
::
Id
currentItemId
);
Q_REQUIRED_RESULT
MessageViewer
::
DKIMCheckSignatureJob
::
CheckSignatureResult
result
()
const
;
...
...
messageviewer/src/header/grantleeheaderformatter.cpp
View file @
81dbf56c
...
...
@@ -278,7 +278,7 @@ public:
QVector
<
QByteArray
>
addressHeaders
;
addressHeaders
<<
"to"
<<
"reply-To"
<<
"reply-From"
<<
"cc"
<<
"bcc"
<<
"from"
<<
"sender"
<<
"resent-From"
<<
"resent-To"
;
for
(
const
auto
&
header
:
addressHeaders
)
{
for
(
const
auto
&
header
:
qAsConst
(
addressHeaders
)
)
{
registerHeaderFormatter
(
header
,
QSharedPointer
<
HeaderFormatter
>
(
new
AddressHeaderFormatter
(
header
)));
}
...
...
@@ -366,7 +366,7 @@ QString GrantleeHeaderFormatter::format(const QString &absolutePath, const Grant
QVector
<
QByteArray
>
defaultHeaders
;
defaultHeaders
<<
"to"
<<
"reply-To"
<<
"reply-From"
<<
"cc"
<<
"bcc"
<<
"from"
<<
"sender"
<<
"resent-From"
<<
"resent-To"
<<
"subject"
<<
"organization"
<<
"list-id"
<<
"date"
;
for
(
const
auto
&
header
:
defaultHeaders
)
{
for
(
const
auto
&
header
:
qAsConst
(
defaultHeaders
)
)
{
QSharedPointer
<
HeaderFormatter
>
formatter
;
if
(
d
->
headerFormatter
.
contains
(
header
))
{
formatter
=
d
->
headerFormatter
.
value
(
header
);
...
...
messageviewer/src/utils/messageviewerutil.cpp
View file @
81dbf56c
...
...
@@ -134,9 +134,9 @@ bool Util::containsExternalReferences(const QString &str, const QString &extraHe
}
}
if
(
!
newStringImg
.
isEmpty
())
{
const
bool
containsReg2
=
newStringImg
.
contains
(
QRegularExpression
(
Q
Latin1
String
(
"<img.*src=
\"
https?:/.*
\"
.*>"
),
QRegularExpression
::
CaseInsensitiveOption
),
&
rmatch
);
const
bool
containsReg2
=
newStringImg
.
contains
(
QRegularExpression
(
QString
Literal
(
"<img.*src=
\"
https?:/.*
\"
.*>"
),
QRegularExpression
::
CaseInsensitiveOption
),
&
rmatch
);
if
(
!
containsReg2
)
{
const
bool
containsReg
=
newStringImg
.
contains
(
QRegularExpression
(
Q
Latin1
String
(
"<img.*src=https?:/.*>"
),
QRegularExpression
::
CaseInsensitiveOption
),
&
rmatch
);
const
bool
containsReg
=
newStringImg
.
contains
(
QRegularExpression
(
QString
Literal
(
"<img.*src=https?:/.*>"
),
QRegularExpression
::
CaseInsensitiveOption
),
&
rmatch
);
return
containsReg
;
}
else
{
return
true
;
...
...
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