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
5410a2b3
Commit
5410a2b3
authored
May 30, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coding style
parent
419fd4b3
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
10 additions
and
14 deletions
+10
-14
src/ksieveui/autocreatescripts/autocreatescriptutil.cpp
src/ksieveui/autocreatescripts/autocreatescriptutil.cpp
+0
-1
src/ksieveui/autocreatescripts/autotests/sieveeditorgraphicalmodewidgettest.cpp
...escripts/autotests/sieveeditorgraphicalmodewidgettest.cpp
+0
-1
src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
...ui/autocreatescripts/sieveactions/sieveactionredirect.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
...tocreatescripts/sieveconditions/sieveconditionaddress.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
.../autocreatescripts/sieveconditions/sieveconditionbody.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
...eatescripts/sieveconditions/sieveconditioncurrentdate.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
.../autocreatescripts/sieveconditions/sieveconditiondate.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
...ocreatescripts/sieveconditions/sieveconditionenvelope.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
...utocreatescripts/sieveconditions/sieveconditionheader.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
...autocreatescripts/sieveconditions/sieveconditionihave.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
...ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
+0
-1
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
+1
-1
src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
+0
-1
src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
+1
-1
No files found.
src/ksieveui/autocreatescripts/autocreatescriptutil.cpp
View file @
5410a2b3
...
...
@@ -173,7 +173,6 @@ QString AutoCreateScriptUtil::fixListValue(QString valueStr)
if
(
!
(
valueStr
.
startsWith
(
QLatin1Char
(
'['
))
&&
valueStr
.
endsWith
(
QLatin1Char
(
']'
))))
{
valueStr
=
QStringLiteral
(
"
\"
%1
\"
"
).
arg
(
valueStr
);
}
else
if
(
valueStr
.
contains
(
QRegularExpression
(
QStringLiteral
(
"^
\\
[
\\
s*
\"
.*
\"\\
s*]$"
))))
{
;
}
else
{
valueStr
=
QStringLiteral
(
"
\"
%1
\"
"
).
arg
(
valueStr
);
}
...
...
src/ksieveui/autocreatescripts/autotests/sieveeditorgraphicalmodewidgettest.cpp
View file @
5410a2b3
...
...
@@ -83,7 +83,6 @@ void SieveEditorGraphicalModeWidgetTest::shouldLoadScripts()
QCOMPARE
(
hasError
,
!
error
.
isEmpty
());
generatedScript
=
w
.
currentscript
();
//Create generated file
QFile
f
(
generatedFile
);
QVERIFY
(
f
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Truncate
));
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
View file @
5410a2b3
...
...
@@ -98,7 +98,7 @@ bool SieveActionRedirect::setParamWidgetValue(const QDomElement &element, QWidge
}
else
if
(
tagName
==
QLatin1String
(
"crlf"
))
{
//nothing
}
else
if
(
tagName
==
QLatin1String
(
"comment"
))
{
setComment
(
e
.
text
());
setComment
(
e
.
text
());
//implement in the future ?
}
else
{
unknownTag
(
tagName
,
error
);
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
View file @
5410a2b3
...
...
@@ -90,7 +90,7 @@ QString SieveConditionAddress::code(QWidget *w) const
const
QLineEdit
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"editaddress"
));
const
QString
addressStr
=
AutoCreateScriptUtil
::
createAddressList
(
edit
->
text
().
trimmed
(),
false
);
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"address %1 %2 %3 %4"
).
arg
(
selectAddressPartStr
,
matchTypeStr
,
selectHeaderTypeStr
,
addressStr
)
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
QStringList
SieveConditionAddress
::
needRequires
(
QWidget
*
w
)
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
View file @
5410a2b3
...
...
@@ -72,7 +72,7 @@ QString SieveConditionBody::code(QWidget *w) const
QLineEdit
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"edit"
));
const
QString
editValue
=
AutoCreateScriptUtil
::
createAddressList
(
edit
->
text
().
trimmed
(),
false
);
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"body %1 %2 %3"
).
arg
(
bodyValue
,
matchValue
,
editValue
)
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
QStringList
SieveConditionBody
::
needRequires
(
QWidget
*
)
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
View file @
5410a2b3
...
...
@@ -65,7 +65,7 @@ QString SieveConditionCurrentDate::code(QWidget *w) const
const
QString
dateWidgetStr
=
dateWidget
->
code
();
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"currentdate %1 %2"
).
arg
(
matchTypeStr
,
dateWidgetStr
)
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
bool
SieveConditionCurrentDate
::
needCheckIfServerHasCapability
()
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
View file @
5410a2b3
...
...
@@ -80,7 +80,7 @@ QString SieveConditionDate::code(QWidget *w) const
const
QString
dateWidgetStr
=
dateWidget
->
code
();
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"date %1
\"
%2
\"
%3"
).
arg
(
matchTypeStr
,
headerStr
,
dateWidgetStr
)
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
bool
SieveConditionDate
::
needCheckIfServerHasCapability
()
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
View file @
5410a2b3
...
...
@@ -93,7 +93,7 @@ QString SieveConditionEnvelope::code(QWidget *w) const
const
QLineEdit
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"editaddress"
));
const
QString
addressStr
=
AutoCreateScriptUtil
::
createAddressList
(
edit
->
text
().
trimmed
(),
false
);
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"envelope %1 %2 %3 %4"
).
arg
(
selectAddressPartStr
,
matchTypeStr
,
selectHeaderTypeStr
,
addressStr
)
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
QStringList
SieveConditionEnvelope
::
needRequires
(
QWidget
*
w
)
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
View file @
5410a2b3
...
...
@@ -80,7 +80,7 @@ QString SieveConditionHeader::code(QWidget *w) const
valueStr
=
AutoCreateScriptUtil
::
fixListValue
(
valueStr
);
return
AutoCreateScriptUtil
::
negativeString
(
isNegative
)
+
QStringLiteral
(
"header %1 %2 %3"
).
arg
(
matchString
,
headerStr
,
valueStr
)
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
QString
SieveConditionHeader
::
help
()
const
...
...
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
View file @
5410a2b3
...
...
@@ -56,7 +56,7 @@ QString SieveConditionIhave::code(QWidget *w) const
const
QLineEdit
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"edit"
));
const
QString
editValue
=
edit
->
text
();
return
QStringLiteral
(
"ihave %1"
).
arg
(
AutoCreateScriptUtil
::
createList
(
editValue
,
QLatin1Char
(
','
)))
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
+
AutoCreateScriptUtil
::
generateConditionComment
(
comment
());
}
QStringList
SieveConditionIhave
::
needRequires
(
QWidget
*
)
const
...
...
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
View file @
5410a2b3
...
...
@@ -128,7 +128,6 @@ void SieveConditionWidget::initWidget()
mCommentButton
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"view-pim-notes"
)));
connect
(
mCommentButton
,
&
QToolButton
::
clicked
,
this
,
&
SieveConditionWidget
::
slotAddComment
);
mComboBox
->
addItem
(
QLatin1String
(
""
));
mLayout
->
addWidget
(
mComboBox
,
1
,
2
);
connect
(
mComboBox
,
static_cast
<
void
(
PimCommon
::
MinimumComboBox
::*
)(
int
)
>
(
&
PimCommon
::
MinimumComboBox
::
activated
),
this
,
&
SieveConditionWidget
::
slotConditionChanged
);
...
...
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
View file @
5410a2b3
...
...
@@ -51,7 +51,7 @@ private Q_SLOTS:
void
slotAddWidget
();
void
slotRemoveWidget
();
void
slotConditionChanged
(
int
index
);
void
slotHelp
();
void
slotHelp
();
void
slotAddComment
();
Q_SIGNALS:
...
...
src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
View file @
5410a2b3
...
...
@@ -81,7 +81,6 @@ QString SieveScriptListItem::generatedScript(QStringList &requires) const
{
QString
script
;
if
(
!
mDescription
.
trimmed
().
isEmpty
())
{
const
QStringList
commentList
=
mDescription
.
split
(
QLatin1Char
(
'\n'
));
for
(
const
QString
&
str
:
commentList
)
{
if
(
str
.
isEmpty
())
{
...
...
src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
View file @
5410a2b3
...
...
@@ -195,7 +195,7 @@ void VacationEditWidgetTest::shouldGetValues()
#if 0
KMime::Types::AddrSpecList mailAliases() const;
void setMailAliases(const KMime::Types::AddrSpecList &
aliases);
void setMailAliases(const KMime::Types::AddrSpecList &aliases);
void setMailAliases(const QString &aliases);
bool sendForSpam() const;
...
...
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