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
L
libksieve
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
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
libksieve
Commits
0d0aafde
Commit
0d0aafde
authored
Nov 14, 2016
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clazy warning
parent
48692e42
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
27 additions
and
24 deletions
+27
-24
kioslave/src/sieve/sieve.cpp
kioslave/src/sieve/sieve.cpp
+1
-1
kioslave/src/sieve/sieve.h
kioslave/src/sieve/sieve.h
+1
-1
src/kmanagesieve/sievejob.cpp
src/kmanagesieve/sievejob.cpp
+0
-1
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
+5
-5
src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
...eatescripts/sieveconditions/sieveconditioncurrentdate.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
...escripts/sieveconditions/sieveconditionmetadataexists.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
.../autocreatescripts/sieveconditions/sieveconditionsize.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
...ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveincludewidget.cpp
src/ksieveui/autocreatescripts/sieveincludewidget.cpp
+3
-3
src/ksieveui/editor/sievelinenumberarea.h
src/ksieveui/editor/sievelinenumberarea.h
+1
-0
src/ksieveui/vacation/autotests/vacationutilstest.cpp
src/ksieveui/vacation/autotests/vacationutilstest.cpp
+2
-0
src/ksieveui/vacation/multiimapvacationdialog.cpp
src/ksieveui/vacation/multiimapvacationdialog.cpp
+5
-3
src/ksieveui/vacation/vacationutils.cpp
src/ksieveui/vacation/vacationutils.cpp
+0
-1
No files found.
kioslave/src/sieve/sieve.cpp
View file @
0d0aafde
...
...
@@ -132,7 +132,7 @@ const QByteArray &kio_sieveResponse::getExtra() const
}
/* ---------------------------------------------------------------------------------- */
void
kio_sieveResponse
::
setQuantity
(
const
uint
&
newQty
)
void
kio_sieveResponse
::
setQuantity
(
uint
newQty
)
{
rType
=
QUANTITY
;
quantity
=
newQty
;
...
...
kioslave/src/sieve/sieve.h
View file @
0d0aafde
...
...
@@ -45,7 +45,7 @@ public:
const
QByteArray
&
getVal
()
const
;
const
QByteArray
&
getExtra
()
const
;
void
setQuantity
(
const
uint
&
quantity
);
void
setQuantity
(
uint
quantity
);
void
setAction
(
const
QByteArray
&
newAction
);
void
setKey
(
const
QByteArray
&
newKey
);
void
setVal
(
const
QByteArray
&
newVal
);
...
...
src/kmanagesieve/sievejob.cpp
View file @
0d0aafde
...
...
@@ -102,7 +102,6 @@ void SieveJob::Private::run(Session *session)
break
;
}
case
Check
:
{
const
QString
filename
=
mUrl
.
fileName
(
/*QUrl::ObeyTrailingSlash*/
);
QByteArray
encodedData
;
append_lf2crlf
(
encodedData
,
mScript
.
toUtf8
());
session
->
sendData
(
"RENAMESCRIPT {"
+
QByteArray
::
number
(
encodedData
.
size
())
+
"+}"
);
...
...
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
View file @
0d0aafde
...
...
@@ -353,10 +353,10 @@ void SieveActionWidgetLister::loadScript(const QDomElement &element, bool onlyAc
if
(
tagName
==
QLatin1String
(
"action"
))
{
if
(
element
.
hasAttribute
(
QStringLiteral
(
"name"
)))
{
const
QString
actionName
=
element
.
attribute
(
QStringLiteral
(
"name"
));
SieveActionWidget
*
w
=
qobject_cast
<
SieveActionWidget
*>
(
widgets
().
l
ast
());
SieveActionWidget
*
w
=
qobject_cast
<
SieveActionWidget
*>
(
widgets
().
constL
ast
());
if
(
w
->
isConfigurated
())
{
addWidgetAfterThisWidget
(
widgets
().
l
ast
());
w
=
qobject_cast
<
SieveActionWidget
*>
(
widgets
().
l
ast
());
addWidgetAfterThisWidget
(
widgets
().
constL
ast
());
w
=
qobject_cast
<
SieveActionWidget
*>
(
widgets
().
constL
ast
());
}
w
->
setAction
(
actionName
,
element
,
comment
,
error
);
//comment.clear();
...
...
@@ -384,9 +384,9 @@ void SieveActionWidgetLister::loadScript(const QDomElement &element, bool onlyAc
if
(
firstAction
)
{
firstAction
=
false
;
}
else
{
addWidgetAfterThisWidget
(
widgets
().
l
ast
());
addWidgetAfterThisWidget
(
widgets
().
constL
ast
());
}
SieveActionWidget
*
w
=
qobject_cast
<
SieveActionWidget
*>
(
widgets
().
l
ast
());
SieveActionWidget
*
w
=
qobject_cast
<
SieveActionWidget
*>
(
widgets
().
constL
ast
());
w
->
setAction
(
actionName
,
e
,
comment
,
error
);
comment
.
clear
();
}
else
{
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
View file @
0d0aafde
...
...
@@ -69,7 +69,7 @@ QString SieveConditionCurrentDate::code(QWidget *w) const
const
SelectDateWidget
*
dateWidget
=
w
->
findChild
<
SelectDateWidget
*>
(
QStringLiteral
(
"datewidget"
));
const
QString
dateWidgetStr
=
dateWidget
->
code
();
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"currentdate %1 %2"
).
arg
(
matchTypeStr
).
arg
(
dateWidgetStr
);
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"currentdate %1 %2"
).
arg
(
matchTypeStr
,
dateWidgetStr
);
}
bool
SieveConditionCurrentDate
::
needCheckIfServerHasCapability
()
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
View file @
0d0aafde
...
...
@@ -71,7 +71,7 @@ QString SieveConditionMetaDataExists::code(QWidget *w) const
const
QLineEdit
*
value
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"value"
));
const
QString
valueStr
=
value
->
text
();
return
QStringLiteral
(
"metadataexists
\"
%1
\"
\"
%2
\"
"
).
arg
(
mailboxStr
).
arg
(
valueStr
);
return
QStringLiteral
(
"metadataexists
\"
%1
\"
\"
%2
\"
"
).
arg
(
mailboxStr
,
valueStr
);
}
QStringList
SieveConditionMetaDataExists
::
needRequires
(
QWidget
*
)
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
View file @
0d0aafde
...
...
@@ -66,7 +66,7 @@ QString SieveConditionSize::code(QWidget *w) const
const
QComboBox
*
combo
=
w
->
findChild
<
QComboBox
*>
(
QStringLiteral
(
"combosize"
));
const
QString
comparaison
=
combo
->
itemData
(
combo
->
currentIndex
()).
toString
();
const
SelectSizeWidget
*
sizeWidget
=
w
->
findChild
<
SelectSizeWidget
*>
(
QStringLiteral
(
"sizewidget"
));
return
QStringLiteral
(
"size %1 %2"
).
arg
(
comparaison
).
arg
(
sizeWidget
->
code
());
return
QStringLiteral
(
"size %1 %2"
).
arg
(
comparaison
,
sizeWidget
->
code
());
}
QString
SieveConditionSize
::
help
()
const
...
...
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
View file @
0d0aafde
...
...
@@ -313,7 +313,7 @@ void SieveConditionWidgetLister::loadTest(const QDomElement &element, bool notCo
}
if
(
testElement
.
hasAttribute
(
QStringLiteral
(
"name"
)))
{
const
QString
conditionName
=
testElement
.
attribute
(
QStringLiteral
(
"name"
));
SieveConditionWidget
*
w
=
qobject_cast
<
SieveConditionWidget
*>
(
widgets
().
l
ast
());
SieveConditionWidget
*
w
=
qobject_cast
<
SieveConditionWidget
*>
(
widgets
().
constL
ast
());
w
->
setCondition
(
conditionName
,
testElement
,
notCondition
,
error
);
}
}
...
...
@@ -348,9 +348,9 @@ void SieveConditionWidgetLister::loadScript(const QDomElement &e, bool uniqTest,
if
(
firstCondition
)
{
firstCondition
=
false
;
}
else
{
addWidgetAfterThisWidget
(
widgets
().
l
ast
());
addWidgetAfterThisWidget
(
widgets
().
constL
ast
());
}
SieveConditionWidget
*
w
=
qobject_cast
<
SieveConditionWidget
*>
(
widgets
().
l
ast
());
SieveConditionWidget
*
w
=
qobject_cast
<
SieveConditionWidget
*>
(
widgets
().
constL
ast
());
if
(
conditionName
==
QLatin1String
(
"not"
))
{
notCondition
=
true
;
QDomNode
notNode
=
testElement
.
firstChild
();
...
...
src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
View file @
0d0aafde
...
...
@@ -285,10 +285,10 @@ QWidget *SieveGlobalVariableLister::createWidget(QWidget *parent)
void
SieveGlobalVariableLister
::
loadScript
(
const
QDomElement
&
element
,
QString
&
error
)
{
SieveGlobalVariableActionWidget
*
w
=
static_cast
<
SieveGlobalVariableActionWidget
*>
(
widgets
().
l
ast
());
SieveGlobalVariableActionWidget
*
w
=
static_cast
<
SieveGlobalVariableActionWidget
*>
(
widgets
().
constL
ast
());
if
(
w
->
isInitialized
())
{
addWidgetAfterThisWidget
(
widgets
().
l
ast
());
w
=
static_cast
<
SieveGlobalVariableActionWidget
*>
(
widgets
().
l
ast
());
addWidgetAfterThisWidget
(
widgets
().
constL
ast
());
w
=
static_cast
<
SieveGlobalVariableActionWidget
*>
(
widgets
().
constL
ast
());
}
w
->
loadScript
(
element
,
error
);
}
...
...
src/ksieveui/autocreatescripts/sieveincludewidget.cpp
View file @
0d0aafde
...
...
@@ -323,10 +323,10 @@ void SieveIncludeWidgetLister::loadScript(const QDomElement &element, QString &e
error
+=
QLatin1Char
(
'\n'
)
+
i18n
(
"We can not add more includes elements."
)
+
QLatin1Char
(
'\n'
);
return
;
}
SieveIncludeActionWidget
*
w
=
static_cast
<
SieveIncludeActionWidget
*>
(
widgets
().
l
ast
());
SieveIncludeActionWidget
*
w
=
static_cast
<
SieveIncludeActionWidget
*>
(
widgets
().
constL
ast
());
if
(
w
->
isInitialized
())
{
addWidgetAfterThisWidget
(
widgets
().
l
ast
());
w
=
static_cast
<
SieveIncludeActionWidget
*>
(
widgets
().
l
ast
());
addWidgetAfterThisWidget
(
widgets
().
constL
ast
());
w
=
static_cast
<
SieveIncludeActionWidget
*>
(
widgets
().
constL
ast
());
}
w
->
loadScript
(
element
,
error
);
}
...
...
src/ksieveui/editor/sievelinenumberarea.h
View file @
0d0aafde
...
...
@@ -28,6 +28,7 @@ class SieveTextEdit;
class
SieveLineNumberArea
:
public
QWidget
{
Q_OBJECT
public:
explicit
SieveLineNumberArea
(
SieveTextEdit
*
editor
);
...
...
src/ksieveui/vacation/autotests/vacationutilstest.cpp
View file @
0d0aafde
...
...
@@ -305,11 +305,13 @@ void VacationUtilsTest::testUpdateVacationBlock()
QStringList
linesA
=
scriptA
.
split
(
QLatin1Char
(
'\n'
));
QStringList
header
;
header
.
reserve
(
5
);
for
(
int
i
=
0
;
i
<
5
;
++
i
)
{
header
.
append
(
linesA
.
at
(
i
));
}
QStringList
vacation
;
vacation
.
reserve
(
linesA
.
count
()
-
5
);
for
(
int
i
=
5
;
i
<
linesA
.
count
();
++
i
)
{
vacation
.
append
(
linesA
.
at
(
i
));
}
...
...
src/ksieveui/vacation/multiimapvacationdialog.cpp
View file @
0d0aafde
...
...
@@ -121,9 +121,11 @@ void MultiImapVacationDialog::init()
QDialogButtonBox
*
buttonBox
=
Q_NULLPTR
;
const
QMap
<
QString
,
QUrl
>
list
=
d
->
mVacationManager
->
serverList
();
foreach
(
const
QString
&
serverName
,
list
.
keys
())
{
const
QUrl
url
=
list
.
value
(
serverName
);
createPage
(
serverName
,
url
);
QMapIterator
<
QString
,
QUrl
>
i
(
list
);
while
(
i
.
hasNext
())
{
i
.
next
();
const
QUrl
url
=
i
.
value
();
createPage
(
i
.
key
(),
url
);
foundOneImap
=
true
;
}
if
(
foundOneImap
)
{
...
...
src/ksieveui/vacation/vacationutils.cpp
View file @
0d0aafde
...
...
@@ -419,7 +419,6 @@ QString KSieveUi::VacationUtils::updateVacationBlock(const QString &oldScript, c
QStringList
lines
=
oldScript
.
split
(
QLatin1Char
(
'\n'
));
QString
script
;
if
(
parserOld
.
parse
()
&&
vdxOld
.
commandFound
())
{
startOld
=
vdxOld
.
lineStart
();
const
int
endOld
(
vdxOld
.
lineEnd
());
...
...
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