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
e061509b
Commit
e061509b
authored
Mar 24, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cppcheck warning
parent
611747b0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
11 deletions
+10
-11
src/ksieveui/util/util.cpp
src/ksieveui/util/util.cpp
+4
-4
src/ksieveui/vacation/vacationcreatescriptjob.cpp
src/ksieveui/vacation/vacationcreatescriptjob.cpp
+1
-2
src/ksieveui/vacation/vacationeditwidget.cpp
src/ksieveui/vacation/vacationeditwidget.cpp
+2
-2
src/ksieveui/vacation/vacationutils.cpp
src/ksieveui/vacation/vacationutils.cpp
+3
-3
No files found.
src/ksieveui/util/util.cpp
View file @
e061509b
...
...
@@ -209,11 +209,11 @@ KSieveUi::Util::AccountInfo KSieveUi::Util::findAccountInfo(const QString &ident
const
QString
resultCustomAuthentication
=
interface
->
sieveCustomAuthentification
();
if
(
resultCustomAuthentication
==
QLatin1String
(
"ImapUserPassword"
))
{
u
.
setUserName
(
interface
->
userName
());
const
QString
p
wd
=
provider
->
password
(
identifier
);
u
.
setPassword
(
p
wd
);
const
QString
imapP
wd
=
provider
->
password
(
identifier
);
u
.
setPassword
(
imapP
wd
);
}
else
if
(
resultCustomAuthentication
==
QLatin1String
(
"CustomUserPassword"
))
{
const
QString
p
wd
=
provider
->
sieveCustomPassword
(
identifier
);
u
.
setPassword
(
p
wd
);
const
QString
customP
wd
=
provider
->
sieveCustomPassword
(
identifier
);
u
.
setPassword
(
customP
wd
);
u
.
setUserName
(
interface
->
sieveCustomUsername
());
}
else
{
qCWarning
(
LIBKSIEVE_LOG
)
<<
"resultCustomAuthentication undefined "
<<
resultCustomAuthentication
;
...
...
src/ksieveui/vacation/vacationcreatescriptjob.cpp
View file @
e061509b
...
...
@@ -121,9 +121,8 @@ void VacationCreateScriptJob::slotGetScript(KManageSieve::SieveJob *job, bool su
Q_UNUSED
(
active
)
Q_ASSERT
(
job
==
mSieveJob
);
mSieveJob
=
nullptr
;
QString
script
=
mScript
;
if
(
success
||
!
oldScript
.
trimmed
().
isEmpty
())
{
script
=
VacationUtils
::
mergeRequireLine
(
oldScript
,
mScript
);
QString
script
=
VacationUtils
::
mergeRequireLine
(
oldScript
,
mScript
);
script
=
VacationUtils
::
updateVacationBlock
(
oldScript
,
script
);
}
if
(
mKep14Support
)
{
...
...
src/ksieveui/vacation/vacationeditwidget.cpp
View file @
e061509b
...
...
@@ -100,7 +100,7 @@ VacationEditWidget::VacationEditWidget(QWidget *parent)
mStartTime
=
new
KTimeComboBox
(
this
);
mStartTime
->
setObjectName
(
QStringLiteral
(
"mStartTime"
));
mStartTime
->
setOptions
(
KTimeComboBox
::
EditTime
|
KTimeComboBox
::
SelectTime
|
KTimeComboBox
::
EditTime
|
KTimeComboBox
::
WarnOnInvalid
);
mStartTime
->
setOptions
(
KTimeComboBox
::
EditTime
|
KTimeComboBox
::
SelectTime
|
KTimeComboBox
::
WarnOnInvalid
);
mStartTime
->
setEnabled
(
false
);
// Disable by default - we need an extension to support this
connect
(
mStartTime
,
&
KTimeComboBox
::
timeChanged
,
this
,
&
VacationEditWidget
::
setWasChanged
);
connect
(
mStartTime
,
&
KTimeComboBox
::
timeEdited
,
this
,
&
VacationEditWidget
::
setWasChanged
);
...
...
@@ -131,7 +131,7 @@ VacationEditWidget::VacationEditWidget(QWidget *parent)
mEndTime
=
new
KTimeComboBox
(
this
);
mEndTime
->
setObjectName
(
QStringLiteral
(
"mEndTime"
));
mEndTime
->
setOptions
(
KTimeComboBox
::
EditTime
|
KTimeComboBox
::
SelectTime
|
KTimeComboBox
::
EditTime
|
KTimeComboBox
::
WarnOnInvalid
);
mEndTime
->
setOptions
(
KTimeComboBox
::
EditTime
|
KTimeComboBox
::
SelectTime
|
KTimeComboBox
::
WarnOnInvalid
);
mEndTime
->
setEnabled
(
false
);
// Disable by default - we need an extension to support this
connect
(
mEndTime
,
&
KTimeComboBox
::
timeChanged
,
this
,
&
VacationEditWidget
::
setWasChanged
);
connect
(
mEndTime
,
&
KTimeComboBox
::
timeEdited
,
this
,
&
VacationEditWidget
::
setWasChanged
);
...
...
src/ksieveui/vacation/vacationutils.cpp
View file @
e061509b
...
...
@@ -205,10 +205,10 @@ VacationUtils::Vacation VacationUtils::parseScript(const QString &script)
if
(
!
vacation
.
active
&&
!
vdx
.
ifComment
().
isEmpty
())
{
const
QByteArray
newScript
=
QByteArrayLiteral
(
"if "
)
+
vdx
.
ifComment
().
toUtf8
()
+
QByteArrayLiteral
(
"{vacation;}"
);
tsb
=
KSieveExt
::
MultiScriptBuilder
(
&
sdx
,
&
drdx
,
&
dx
);
KSieve
::
Parser
p
arser
(
newScript
.
begin
(),
KSieve
::
Parser
activeScriptP
arser
(
newScript
.
begin
(),
newScript
.
begin
()
+
newScript
.
length
());
p
arser
.
setScriptBuilder
(
&
tsb
);
if
(
!
p
arser
.
parse
())
{
activeScriptP
arser
.
setScriptBuilder
(
&
tsb
);
if
(
!
activeScriptP
arser
.
parse
())
{
vacation
.
valid
=
false
;
return
vacation
;
}
...
...
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