Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
libksieve
Commits
d4bb2f3a
Commit
d4bb2f3a
authored
Nov 01, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modernize code (raw string literal + auto)
parent
a6ed01bb
Pipeline
#39254
passed with stage
in 26 minutes and 49 seconds
Changes
112
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
112 changed files
with
489 additions
and
489 deletions
+489
-489
autotests/lexertest.cpp
autotests/lexertest.cpp
+3
-3
autotests/parsertest.cpp
autotests/parsertest.cpp
+1
-1
kioslave/src/sieve/sieve.cpp
kioslave/src/sieve/sieve.cpp
+1
-1
src/kmanagesieve/sessionthread.cpp
src/kmanagesieve/sessionthread.cpp
+2
-2
src/kmanagesieve/sievejob.cpp
src/kmanagesieve/sievejob.cpp
+8
-8
src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
+2
-2
src/ksieveui/autocreatescripts/autotests/regexpeditorlineedittest.cpp
.../autocreatescripts/autotests/regexpeditorlineedittest.cpp
+2
-2
src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp
...i/autocreatescripts/autotests/selectheadersdialogtest.cpp
+6
-6
src/ksieveui/autocreatescripts/autotests/sievepreviewgeneratedcodewidgettest.cpp
...scripts/autotests/sievepreviewgeneratedcodewidgettest.cpp
+2
-2
src/ksieveui/autocreatescripts/autotests/sievescriptlistboxtest.cpp
...ui/autocreatescripts/autotests/sievescriptlistboxtest.cpp
+2
-2
src/ksieveui/autocreatescripts/commonwidgets/sievehelpbutton.cpp
...eveui/autocreatescripts/commonwidgets/sievehelpbutton.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
...tocreatescripts/sieveactions/sieveactionabstractflags.cpp
+4
-4
src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
...i/autocreatescripts/sieveactions/sieveactionaddheader.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
...eveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
...eui/autocreatescripts/sieveactions/sieveactionconvert.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
...utocreatescripts/sieveactions/sieveactiondeleteheader.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
...eui/autocreatescripts/sieveactions/sieveactionenclose.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveactions/sieveactionereject.cpp
...eui/autocreatescripts/sieveactions/sieveactionereject.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
...autocreatescripts/sieveactions/sieveactionextracttext.cpp
+5
-5
src/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
...ui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
+4
-4
src/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
...ieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
+4
-4
src/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp
...veui/autocreatescripts/sieveactions/sieveactionnotify.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
...ui/autocreatescripts/sieveactions/sieveactionredirect.cpp
+4
-4
src/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
...veui/autocreatescripts/sieveactions/sieveactionreject.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
...eui/autocreatescripts/sieveactions/sieveactionreplace.cpp
+6
-6
src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
...autocreatescripts/sieveactions/sieveactionsetvariable.cpp
+10
-10
src/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
...ui/autocreatescripts/sieveactions/sieveactionvacation.cpp
+10
-10
src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.cpp
...utocreatescripts/sieveactions/widgets/addresslineedit.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
...ocreatescripts/sieveactions/widgets/selectflagswidget.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
+8
-8
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
...tocreatescripts/sieveconditions/sieveconditionaddress.cpp
+14
-14
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
.../autocreatescripts/sieveconditions/sieveconditionbody.cpp
+10
-10
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
...tocreatescripts/sieveconditions/sieveconditionconvert.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
...eatescripts/sieveconditions/sieveconditioncurrentdate.cpp
+5
-5
src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
.../autocreatescripts/sieveconditions/sieveconditiondate.cpp
+8
-8
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
...ocreatescripts/sieveconditions/sieveconditionenvelope.cpp
+12
-12
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
...eatescripts/sieveconditions/sieveconditionenvironment.cpp
+6
-6
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp
...utocreatescripts/sieveconditions/sieveconditionexists.cpp
+6
-6
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.cpp
...autocreatescripts/sieveconditions/sieveconditionfalse.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp
...tocreatescripts/sieveconditions/sieveconditionhasflag.cpp
+8
-8
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
...utocreatescripts/sieveconditions/sieveconditionheader.cpp
+9
-9
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
...autocreatescripts/sieveconditions/sieveconditionihave.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.cpp
...tescripts/sieveconditions/sieveconditionmailboxexists.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
...ocreatescripts/sieveconditions/sieveconditionmetadata.cpp
+8
-8
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
...escripts/sieveconditions/sieveconditionmetadataexists.cpp
+4
-4
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
...escripts/sieveconditions/sieveconditionservermetadata.cpp
+9
-9
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.cpp
...ts/sieveconditions/sieveconditionservermetadataexists.cpp
+3
-3
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
.../autocreatescripts/sieveconditions/sieveconditionsize.cpp
+5
-5
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp
...ocreatescripts/sieveconditions/sieveconditionspamtest.cpp
+8
-8
src/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp
.../autocreatescripts/sieveconditions/sieveconditiontrue.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp
...createscripts/sieveconditions/sieveconditionvirustest.cpp
+7
-7
src/ksieveui/autocreatescripts/sieveconditions/widgets/regexpeditorlineedit.cpp
...escripts/sieveconditions/widgets/regexpeditorlineedit.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp
...escripts/sieveconditions/widgets/selectbodytypewidget.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
...reatescripts/sieveconditions/widgets/selectdatewidget.cpp
+4
-4
src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
...ipts/sieveconditions/widgets/selectheadertypecombobox.cpp
+6
-6
src/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp
...pts/sieveconditions/widgets/selectrelationalmatchtype.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.cpp
...reatescripts/sieveconditions/widgets/selectsizewidget.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
...ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
+6
-6
src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
...veui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
+1
-1
src/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp
src/ksieveui/autocreatescripts/sieveforeverypartwidget.cpp
+2
-2
src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
src/ksieveui/autocreatescripts/sieveglobalvariablewidget.cpp
+6
-6
src/ksieveui/autocreatescripts/sieveincludewidget.cpp
src/ksieveui/autocreatescripts/sieveincludewidget.cpp
+6
-6
src/ksieveui/autocreatescripts/sievepreviewgeneratedcodewidget.cpp
...eui/autocreatescripts/sievepreviewgeneratedcodewidget.cpp
+1
-1
src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
+4
-4
src/ksieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
...ieveui/autocreatescripts/sievescriptdescriptiondialog.cpp
+1
-1
src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
+8
-8
src/ksieveui/autocreatescripts/sievescriptpage.cpp
src/ksieveui/autocreatescripts/sievescriptpage.cpp
+3
-3
src/ksieveui/autocreatescripts/sievescriptparsingerrordialog.cpp
...eveui/autocreatescripts/sievescriptparsingerrordialog.cpp
+2
-2
src/ksieveui/autocreatescripts/sievescripttabwidget.cpp
src/ksieveui/autocreatescripts/sievescripttabwidget.cpp
+1
-1
src/ksieveui/autocreatescripts/tests/autocreatescripts_gui.cpp
...sieveui/autocreatescripts/tests/autocreatescripts_gui.cpp
+1
-1
src/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp
src/ksieveui/autocreatescripts/tests/parsingscript_gui.cpp
+1
-1
src/ksieveui/debug/sievedebugdialog.cpp
src/ksieveui/debug/sievedebugdialog.cpp
+2
-2
src/ksieveui/editor/autotests/sieveinfodialogtest.cpp
src/ksieveui/editor/autotests/sieveinfodialogtest.cpp
+2
-2
src/ksieveui/editor/autotests/sievetexteditwidgettest.cpp
src/ksieveui/editor/autotests/sievetexteditwidgettest.cpp
+2
-2
src/ksieveui/editor/sieveeditor.cpp
src/ksieveui/editor/sieveeditor.cpp
+2
-2
src/ksieveui/editor/sieveeditortabwidget.cpp
src/ksieveui/editor/sieveeditortabwidget.cpp
+5
-5
src/ksieveui/editor/sieveeditortextmodewidget.cpp
src/ksieveui/editor/sieveeditortextmodewidget.cpp
+10
-10
src/ksieveui/editor/sieveeditorwidget.cpp
src/ksieveui/editor/sieveeditorwidget.cpp
+4
-4
src/ksieveui/editor/sieveinfowidget.cpp
src/ksieveui/editor/sieveinfowidget.cpp
+1
-1
src/ksieveui/editor/sievetextedit.cpp
src/ksieveui/editor/sievetextedit.cpp
+3
-3
src/ksieveui/editor/sievetexteditwidget.cpp
src/ksieveui/editor/sievetexteditwidget.cpp
+1
-1
src/ksieveui/editor/tests/editorsieve_gui.cpp
src/ksieveui/editor/tests/editorsieve_gui.cpp
+1
-1
src/ksieveui/editor/webengine/autotests/sieveeditorhelphtmlwidgettest.cpp
...tor/webengine/autotests/sieveeditorhelphtmlwidgettest.cpp
+2
-2
src/ksieveui/editor/webengine/findbar/autotests/findbarbasetest.cpp
...ui/editor/webengine/findbar/autotests/findbarbasetest.cpp
+10
-10
src/ksieveui/editor/webengine/findbar/findbarbase.cpp
src/ksieveui/editor/webengine/findbar/findbarbase.cpp
+4
-4
src/ksieveui/editor/webengine/sieveeditorhelphtmlwidget.cpp
src/ksieveui/editor/webengine/sieveeditorhelphtmlwidget.cpp
+1
-1
src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp
src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp
+5
-5
src/ksieveui/managesievescriptsdialog.cpp
src/ksieveui/managesievescriptsdialog.cpp
+5
-5
src/ksieveui/scriptsparsing/parsingresultdialog.cpp
src/ksieveui/scriptsparsing/parsingresultdialog.cpp
+2
-2
src/ksieveui/sieveimapinstance/autotests/sieveimapinstanceinterfacemanagertest.cpp
...tance/autotests/sieveimapinstanceinterfacemanagertest.cpp
+1
-1
src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerdialogtest.cpp
...criptdebugger/autotests/sievescriptdebuggerdialogtest.cpp
+8
-8
src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp
...ugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp
+9
-9
src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerwidgettest.cpp
...criptdebugger/autotests/sievescriptdebuggerwidgettest.cpp
+1
-1
src/ksieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
...sieveui/sievescriptdebugger/sievescriptdebuggerdialog.cpp
+1
-1
src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
...sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
+7
-7
src/ksieveui/sievescriptdebugger/sievescriptdebuggertextedit.cpp
...eveui/sievescriptdebugger/sievescriptdebuggertextedit.cpp
+1
-1
src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
...sieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
+1
-1
src/ksieveui/templates/sievetemplateeditdialog.cpp
src/ksieveui/templates/sievetemplateeditdialog.cpp
+5
-5
src/ksieveui/templates/sievetemplatewidget.cpp
src/ksieveui/templates/sievetemplatewidget.cpp
+2
-2
src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
src/ksieveui/vacation/autotests/vacationeditwidgettest.cpp
+29
-29
src/ksieveui/vacation/autotests/vacationmailactionwidgettest.cpp
...eveui/vacation/autotests/vacationmailactionwidgettest.cpp
+5
-5
src/ksieveui/vacation/multiimapvacationdialog.cpp
src/ksieveui/vacation/multiimapvacationdialog.cpp
+6
-6
src/ksieveui/vacation/multiimapvacationmanager.cpp
src/ksieveui/vacation/multiimapvacationmanager.cpp
+2
-2
src/ksieveui/vacation/vacationeditwidget.cpp
src/ksieveui/vacation/vacationeditwidget.cpp
+3
-3
src/ksieveui/vacation/vacationmailactionwidget.cpp
src/ksieveui/vacation/vacationmailactionwidget.cpp
+1
-1
src/ksieveui/vacation/vacationpagewidget.cpp
src/ksieveui/vacation/vacationpagewidget.cpp
+3
-3
src/ksieveui/widgets/autotests/includefilelineedittest.cpp
src/ksieveui/widgets/autotests/includefilelineedittest.cpp
+1
-1
src/ksieveui/widgets/autotests/moveimapfolderwidgettest.cpp
src/ksieveui/widgets/autotests/moveimapfolderwidgettest.cpp
+3
-3
src/ksieveui/widgets/custommanagesievewidget.cpp
src/ksieveui/widgets/custommanagesievewidget.cpp
+1
-1
src/ksieveui/widgets/managesievewidget.cpp
src/ksieveui/widgets/managesievewidget.cpp
+8
-8
src/ksieveui/widgets/moveimapfolderwidget.cpp
src/ksieveui/widgets/moveimapfolderwidget.cpp
+1
-1
src/parser/parser.cpp
src/parser/parser.cpp
+1
-1
No files found.
autotests/lexertest.cpp
View file @
d4bb2f3a
...
...
@@ -266,17 +266,17 @@ static const TestCase testcases[] = {
Error
::
None
,
0
,
0
},
{
"Quoted string, escaped '
\"
'"
,
"
\
"
foo
\
\\
"
bar
\
"
"
,
"Quoted string, escaped '
\"
'"
,
R"(
"foo\"bar"
)
"
,
{
{
Lexer
::
QuotedString
,
"foo
\"
bar"
},
{
Lexer
::
None
,
nullptr
}
},
Error
::
None
,
0
,
0
},
{
"Quoted string, escaped '
\\
'"
,
"
\
"
foo
\\
\
\
bar
\
"
"
,
"Quoted string, escaped '
\\
'"
,
R"(
"foo\\bar"
)
"
,
{
{
Lexer
::
QuotedString
,
"foo
\\
bar"
},
{
Lexer
::
None
,
nullptr
}
},
Error
::
None
,
0
,
0
},
{
"Quoted string, excessive escapes"
,
"
\"\\
fo
\\
o
\"
"
,
"Quoted string, excessive escapes"
,
R"("\fo\o")
"
,
{
{
Lexer
::
QuotedString
,
"foo"
},
{
Lexer
::
None
,
nullptr
}
},
Error
::
None
,
0
,
0
},
...
...
autotests/parsertest.cpp
View file @
d4bb2f3a
...
...
@@ -252,7 +252,7 @@ static struct TestCase {
{
"single two-element string list argument - quoted strings"
,
"
command [
\
"
string
\
"
,
\
"
string
\
"
];"
,
R"(
command ["string","string"];
)
"
,
{
{
CommandStart
,
"command"
,
false
},
{
StringListArgumentStart
,
nullptr
,
false
},
{
StringListEntry
,
"string"
,
false
/*quoted*/
},
...
...
kioslave/src/sieve/sieve.cpp
View file @
d4bb2f3a
...
...
@@ -936,7 +936,7 @@ void kio_sieveProtocol::listDir(const QUrl &url)
bool
kio_sieveProtocol
::
saslInteract
(
void
*
in
,
AuthInfo
&
ai
)
{
ksDebug
<<
"sasl_interact"
<<
returnEndLine
();
sasl_interact_t
*
interact
=
(
sasl_interact_t
*
)
in
;
auto
*
interact
=
(
sasl_interact_t
*
)
in
;
//some mechanisms do not require username && pass, so it doesn't need a popup
//window for getting this info
...
...
src/kmanagesieve/sessionthread.cpp
View file @
d4bb2f3a
...
...
@@ -44,7 +44,7 @@ SessionThread::SessionThread(Session *session, QObject *parent)
saslInitialized
=
true
;
}
QThread
*
thread
=
new
QThread
();
auto
*
thread
=
new
QThread
();
moveToThread
(
thread
);
thread
->
start
();
QMetaObject
::
invokeMethod
(
this
,
"doInit"
);
...
...
@@ -305,7 +305,7 @@ bool SessionThread::saslInteract(void *in)
Q_ASSERT
(
QThread
::
currentThread
()
==
thread
());
qCDebug
(
KMANAGERSIEVE_LOG
)
<<
"SessionThread::saslInteract"
;
sasl_interact_t
*
interact
=
(
sasl_interact_t
*
)
in
;
auto
*
interact
=
(
sasl_interact_t
*
)
in
;
//some mechanisms do not require username && pass, so it doesn't need a popup
//window for getting this info
...
...
src/kmanagesieve/sievejob.cpp
View file @
d4bb2f3a
...
...
@@ -291,7 +291,7 @@ SieveJob *SieveJob::put(const QUrl &destination, const QString &script, bool mak
commands
.
push
(
Private
::
Put
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
destination
;
job
->
d
->
mScript
=
script
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -306,7 +306,7 @@ SieveJob *SieveJob::get(const QUrl &source)
commands
.
push
(
Private
::
Get
);
commands
.
push
(
Private
::
SearchActive
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
source
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -319,7 +319,7 @@ SieveJob *SieveJob::list(const QUrl &source)
QStack
<
Private
::
Command
>
commands
;
commands
.
push
(
Private
::
List
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
source
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -332,7 +332,7 @@ SieveJob *SieveJob::del(const QUrl &url)
QStack
<
Private
::
Command
>
commands
;
commands
.
push
(
Private
::
Delete
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
url
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -344,7 +344,7 @@ SieveJob *SieveJob::deactivate(const QUrl &url)
{
QStack
<
Private
::
Command
>
commands
;
commands
.
push
(
Private
::
Deactivate
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
url
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -357,7 +357,7 @@ SieveJob *SieveJob::rename(const QUrl &url, const QString &newName)
QStack
<
Private
::
Command
>
commands
;
commands
.
push
(
Private
::
Rename
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
url
;
job
->
d
->
mNewName
=
newName
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -371,7 +371,7 @@ SieveJob *SieveJob::check(const QUrl &url, const QString &script)
QStack
<
Private
::
Command
>
commands
;
commands
.
push
(
Private
::
Check
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
url
;
job
->
d
->
mScript
=
script
;
job
->
d
->
mCommands
=
commands
;
...
...
@@ -385,7 +385,7 @@ SieveJob *SieveJob::activate(const QUrl &url)
QStack
<
Private
::
Command
>
commands
;
commands
.
push
(
Private
::
Activate
);
SieveJob
*
job
=
new
SieveJob
;
auto
*
job
=
new
SieveJob
;
job
->
d
->
mUrl
=
url
;
job
->
d
->
mCommands
=
commands
;
...
...
src/ksieveui/autocreatescripts/autocreatescriptdialog.cpp
View file @
d4bb2f3a
...
...
@@ -25,7 +25,7 @@ AutoCreateScriptDialog::AutoCreateScriptDialog(QWidget *parent)
,
mEditor
(
new
SieveEditorGraphicalModeWidget
(
this
))
{
setWindowTitle
(
i18nc
(
"@title:window"
,
"Create Sieve Filter"
));
QVBoxLayo
ut
*
mainLayout
=
new
QVBoxLayout
(
this
);
a
ut
o
*
mainLayout
=
new
QVBoxLayout
(
this
);
QDialogButtonBox
*
buttonBox
=
new
QDialogButtonBox
(
QDialogButtonBox
::
Ok
|
QDialogButtonBox
::
Cancel
,
this
);
QPushButton
*
okButton
=
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
okButton
->
setDefault
(
true
);
...
...
@@ -87,7 +87,7 @@ bool AutoCreateScriptDialog::event(QEvent *e)
{
const
bool
shortCutOverride
=
(
e
->
type
()
==
QEvent
::
ShortcutOverride
);
if
(
shortCutOverride
||
e
->
type
()
==
QEvent
::
KeyPress
)
{
QKeyEvent
*
kev
=
static_cast
<
QKeyEvent
*
>
(
e
);
auto
*
kev
=
static_cast
<
QKeyEvent
*
>
(
e
);
if
(
kev
->
key
()
==
Qt
::
Key_Escape
)
{
e
->
ignore
();
return
true
;
...
...
src/ksieveui/autocreatescripts/autotests/regexpeditorlineedittest.cpp
View file @
d4bb2f3a
...
...
@@ -18,10 +18,10 @@ RegexpEditorLineEditTest::RegexpEditorLineEditTest(QObject *parent)
void
RegexpEditorLineEditTest
::
shouldHaveDefaultValue
()
{
KSieveUi
::
RegexpEditorLineEdit
w
;
QLineEdit
*
mLineEdit
=
w
.
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"lineedit"
));
auto
*
mLineEdit
=
w
.
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"lineedit"
));
QVERIFY
(
mLineEdit
);
QHBoxLayo
ut
*
mainLayout
=
w
.
findChild
<
QHBoxLayout
*>
(
QStringLiteral
(
"mainlayout"
));
a
ut
o
*
mainLayout
=
w
.
findChild
<
QHBoxLayout
*>
(
QStringLiteral
(
"mainlayout"
));
QVERIFY
(
mainLayout
);
QCOMPARE
(
mainLayout
->
contentsMargins
(),
QMargins
(
0
,
0
,
0
,
0
));
}
...
...
src/ksieveui/autocreatescripts/autotests/selectheadersdialogtest.cpp
View file @
d4bb2f3a
...
...
@@ -29,25 +29,25 @@ void SelectHeadersDialogTest::shouldHaveDefaultValue()
KSieveUi
::
SelectHeadersDialog
dlg
;
QVERIFY
(
!
dlg
.
windowTitle
().
isEmpty
());
QDialogButtonBox
*
buttonBox
=
dlg
.
findChild
<
QDialogButtonBox
*>
(
QStringLiteral
(
"buttonbox"
));
auto
*
buttonBox
=
dlg
.
findChild
<
QDialogButtonBox
*>
(
QStringLiteral
(
"buttonbox"
));
QVERIFY
(
buttonBox
);
QVBoxLayo
ut
*
lay
=
dlg
.
findChild
<
QVBoxLayout
*>
(
QStringLiteral
(
"widgetlayout"
));
a
ut
o
*
lay
=
dlg
.
findChild
<
QVBoxLayout
*>
(
QStringLiteral
(
"widgetlayout"
));
QVERIFY
(
lay
);
QCOMPARE
(
lay
->
contentsMargins
(),
QMargins
(
0
,
0
,
0
,
0
));
KSieveUi
::
SelectHeadersWidget
*
mListWidget
=
dlg
.
findChild
<
KSieveUi
::
SelectHeadersWidget
*>
(
QStringLiteral
(
"listwidget"
));
auto
*
mListWidget
=
dlg
.
findChild
<
KSieveUi
::
SelectHeadersWidget
*>
(
QStringLiteral
(
"listwidget"
));
QVERIFY
(
mListWidget
);
QLabel
*
lab
=
dlg
.
findChild
<
QLabel
*>
(
QStringLiteral
(
"label"
));
auto
*
lab
=
dlg
.
findChild
<
QLabel
*>
(
QStringLiteral
(
"label"
));
QVERIFY
(
lab
);
QVERIFY
(
!
lab
->
text
().
isEmpty
());
QLineEdit
*
mNewHeader
=
dlg
.
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"newheader"
));
auto
*
mNewHeader
=
dlg
.
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"newheader"
));
QVERIFY
(
mNewHeader
);
QVERIFY
(
mNewHeader
->
isClearButtonEnabled
());
QPushBut
to
n
*
mAddNewHeader
=
dlg
.
findChild
<
QPushButton
*>
(
QStringLiteral
(
"addnewheader"
));
au
to
*
mAddNewHeader
=
dlg
.
findChild
<
QPushButton
*>
(
QStringLiteral
(
"addnewheader"
));
QVERIFY
(
mAddNewHeader
);
QVERIFY
(
!
mAddNewHeader
->
isEnabled
());
}
...
...
src/ksieveui/autocreatescripts/autotests/sievepreviewgeneratedcodewidgettest.cpp
View file @
d4bb2f3a
...
...
@@ -19,11 +19,11 @@ void SievePreviewGeneratedCodeWidgetTest::shouldHaveDefaultValues()
{
KSieveUi
::
SievePreviewGeneratedCodeWidget
w
;
QHBoxLayo
ut
*
mainLayout
=
w
.
findChild
<
QHBoxLayout
*>
(
QStringLiteral
(
"mainLayout"
));
a
ut
o
*
mainLayout
=
w
.
findChild
<
QHBoxLayout
*>
(
QStringLiteral
(
"mainLayout"
));
QVERIFY
(
mainLayout
);
QCOMPARE
(
mainLayout
->
contentsMargins
(),
QMargins
(
0
,
0
,
0
,
0
));
QTextEdit
*
mTextEdit
=
w
.
findChild
<
QTextEdit
*>
(
QStringLiteral
(
"mTextEdit"
));
auto
*
mTextEdit
=
w
.
findChild
<
QTextEdit
*>
(
QStringLiteral
(
"mTextEdit"
));
QVERIFY
(
mTextEdit
);
QVERIFY
(
mTextEdit
->
isReadOnly
());
}
src/ksieveui/autocreatescripts/autotests/sievescriptlistboxtest.cpp
View file @
d4bb2f3a
...
...
@@ -17,10 +17,10 @@ SieveScriptListBoxTest::SieveScriptListBoxTest(QObject *parent)
void
SieveScriptListBoxTest
::
shouldHaveDefaultValues
()
{
KSieveUi
::
SieveScriptListBox
lst
(
QStringLiteral
(
"foo"
));
QVBoxLayo
ut
*
layout
=
lst
.
findChild
<
QVBoxLayout
*>
(
QStringLiteral
(
"layout"
));
a
ut
o
*
layout
=
lst
.
findChild
<
QVBoxLayout
*>
(
QStringLiteral
(
"layout"
));
QVERIFY
(
layout
);
QListWidget
*
mSieveListScript
=
lst
.
findChild
<
QListWidget
*>
(
QStringLiteral
(
"mSieveListScript"
));
auto
*
mSieveListScript
=
lst
.
findChild
<
QListWidget
*>
(
QStringLiteral
(
"mSieveListScript"
));
QVERIFY
(
mSieveListScript
);
QCOMPARE
(
mSieveListScript
->
dragDropMode
(),
QAbstractItemView
::
InternalMove
);
}
src/ksieveui/autocreatescripts/commonwidgets/sievehelpbutton.cpp
View file @
d4bb2f3a
...
...
@@ -27,7 +27,7 @@ SieveHelpButton::~SieveHelpButton()
bool
SieveHelpButton
::
event
(
QEvent
*
event
)
{
if
(
event
->
type
()
==
QEvent
::
WhatsThisClicked
)
{
QWhatsThisClickedEvent
*
clicked
=
static_cast
<
QWhatsThisClickedEvent
*>
(
event
);
auto
*
clicked
=
static_cast
<
QWhatsThisClickedEvent
*>
(
event
);
KIO
::
OpenUrlJob
*
job
=
new
KIO
::
OpenUrlJob
(
QUrl
(
clicked
->
href
()));
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
this
));
job
->
start
();
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
View file @
d4bb2f3a
...
...
@@ -21,10 +21,10 @@ SieveActionAbstractFlags::SieveActionAbstractFlags(SieveEditorGraphicalModeWidge
QWidget
*
SieveActionAbstractFlags
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QHBoxLayo
ut
*
lay
=
new
QHBoxLayout
;
a
ut
o
*
lay
=
new
QHBoxLayout
;
lay
->
setContentsMargins
({});
w
->
setLayout
(
lay
);
SelectFlagsWidget
*
flagsWidget
=
new
SelectFlagsWidget
;
auto
*
flagsWidget
=
new
SelectFlagsWidget
;
connect
(
flagsWidget
,
&
SelectFlagsWidget
::
valueChanged
,
this
,
&
SieveActionAbstractFlags
::
valueChanged
);
flagsWidget
->
setObjectName
(
QStringLiteral
(
"flagswidget"
));
lay
->
addWidget
(
flagsWidget
);
...
...
@@ -36,10 +36,10 @@ void SieveActionAbstractFlags::setParamWidgetValue(QXmlStreamReader &element, QW
while
(
element
.
readNextStartElement
())
{
const
QStringRef
tagName
=
element
.
name
();
if
(
tagName
==
QLatin1String
(
"list"
))
{
SelectFlagsWidget
*
flagsWidget
=
w
->
findChild
<
SelectFlagsWidget
*>
(
QStringLiteral
(
"flagswidget"
));
auto
*
flagsWidget
=
w
->
findChild
<
SelectFlagsWidget
*>
(
QStringLiteral
(
"flagswidget"
));
flagsWidget
->
setFlags
(
AutoCreateScriptUtil
::
listValue
(
element
));
}
else
if
(
tagName
==
QLatin1String
(
"str"
))
{
SelectFlagsWidget
*
flagsWidget
=
w
->
findChild
<
SelectFlagsWidget
*>
(
QStringLiteral
(
"flagswidget"
));
auto
*
flagsWidget
=
w
->
findChild
<
SelectFlagsWidget
*>
(
QStringLiteral
(
"flagswidget"
));
flagsWidget
->
setFlags
(
QStringList
()
<<
element
.
readElementText
());
}
else
if
(
tagName
==
QLatin1String
(
"crlf"
))
{
element
.
skipCurrentElement
();
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
View file @
d4bb2f3a
...
...
@@ -26,11 +26,11 @@ SieveActionAddHeader::SieveActionAddHeader(SieveEditorGraphicalModeWidget *sieve
QWidget
*
SieveActionAddHeader
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QGridLayo
ut
*
grid
=
new
QGridLayout
;
a
ut
o
*
grid
=
new
QGridLayout
;
grid
->
setContentsMargins
({});
w
->
setLayout
(
grid
);
SelectAddHeaderPositionCombobox
*
combo
=
new
SelectAddHeaderPositionCombobox
;
auto
*
combo
=
new
SelectAddHeaderPositionCombobox
;
combo
->
setObjectName
(
QStringLiteral
(
"selectposition"
));
connect
(
combo
,
&
SelectAddHeaderPositionCombobox
::
valueChanged
,
this
,
&
SieveActionAddHeader
::
valueChanged
);
grid
->
addWidget
(
combo
,
0
,
0
);
...
...
@@ -38,7 +38,7 @@ QWidget *SieveActionAddHeader::createParamWidget(QWidget *parent) const
QLabel
*
lab
=
new
QLabel
(
i18n
(
"header:"
));
grid
->
addWidget
(
lab
,
0
,
1
);
QLineEdit
*
headerEdit
=
new
QLineEdit
;
auto
*
headerEdit
=
new
QLineEdit
;
connect
(
headerEdit
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionAddHeader
::
valueChanged
);
headerEdit
->
setObjectName
(
QStringLiteral
(
"headeredit"
));
grid
->
addWidget
(
headerEdit
,
0
,
2
);
...
...
@@ -46,7 +46,7 @@ QWidget *SieveActionAddHeader::createParamWidget(QWidget *parent) const
lab
=
new
QLabel
(
i18n
(
"value:"
));
grid
->
addWidget
(
lab
,
1
,
1
);
QLineEdit
*
valueEdit
=
new
QLineEdit
;
auto
*
valueEdit
=
new
QLineEdit
;
connect
(
valueEdit
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionAddHeader
::
valueChanged
);
valueEdit
->
setObjectName
(
QStringLiteral
(
"valueedit"
));
grid
->
addWidget
(
valueEdit
,
1
,
2
);
...
...
@@ -60,14 +60,14 @@ void SieveActionAddHeader::setParamWidgetValue(QXmlStreamReader &element, QWidge
while
(
element
.
readNextStartElement
())
{
const
QStringRef
tagName
=
element
.
name
();
if
(
tagName
==
QLatin1String
(
"tag"
))
{
SelectAddHeaderPositionCombobox
*
combo
=
w
->
findChild
<
SelectAddHeaderPositionCombobox
*>
(
QStringLiteral
(
"selectposition"
));
auto
*
combo
=
w
->
findChild
<
SelectAddHeaderPositionCombobox
*>
(
QStringLiteral
(
"selectposition"
));
combo
->
setCode
(
AutoCreateScriptUtil
::
tagValue
(
element
.
readElementText
()),
name
(),
error
);
}
else
if
(
tagName
==
QLatin1String
(
"str"
))
{
if
(
index
==
0
)
{
QLineEdit
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"headeredit"
));
auto
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"headeredit"
));
edit
->
setText
(
element
.
readElementText
());
}
else
if
(
index
==
1
)
{
QLineEdit
*
value
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"valueedit"
));
auto
*
value
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"valueedit"
));
value
->
setText
(
AutoCreateScriptUtil
::
quoteStr
(
element
.
readElementText
()));
}
else
{
tooManyArguments
(
tagName
,
index
,
2
,
error
);
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
View file @
d4bb2f3a
...
...
@@ -24,14 +24,14 @@ SieveActionBreak::SieveActionBreak(SieveEditorGraphicalModeWidget *sieveGraphica
QWidget
*
SieveActionBreak
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QHBoxLayo
ut
*
lay
=
new
QHBoxLayout
;
a
ut
o
*
lay
=
new
QHBoxLayout
;
lay
->
setContentsMargins
({});
w
->
setLayout
(
lay
);
QLabel
*
lab
=
new
QLabel
(
i18n
(
"Name (optional):"
));
lay
->
addWidget
(
lab
);
QLineEdit
*
subject
=
new
QLineEdit
;
auto
*
subject
=
new
QLineEdit
;
subject
->
setObjectName
(
QStringLiteral
(
"name"
));
connect
(
subject
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionBreak
::
valueChanged
);
lay
->
addWidget
(
subject
);
...
...
@@ -45,7 +45,7 @@ void SieveActionBreak::setParamWidgetValue(QXmlStreamReader &element, QWidget *w
if
(
tagName
==
QLatin1String
(
"tag"
))
{
const
QString
tagValue
=
element
.
readElementText
();
if
(
tagValue
==
QLatin1String
(
"name"
))
{
QLineEdit
*
name
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"name"
));
auto
*
name
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"name"
));
name
->
setText
(
AutoCreateScriptUtil
::
strValue
(
element
));
}
else
{
unknownTagValue
(
tagValue
,
error
);
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
View file @
d4bb2f3a
...
...
@@ -24,14 +24,14 @@ SieveActionConvert::SieveActionConvert(SieveEditorGraphicalModeWidget *sieveGrap
QWidget
*
SieveActionConvert
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QGridLayo
ut
*
lay
=
new
QGridLayout
;
a
ut
o
*
lay
=
new
QGridLayout
;
lay
->
setContentsMargins
({});
w
->
setLayout
(
lay
);
QLabel
*
lab
=
new
QLabel
(
i18n
(
"From:"
));
lay
->
addWidget
(
lab
,
0
,
0
);
SelectMimeTypeComboBox
*
fromMimeType
=
new
SelectMimeTypeComboBox
;
auto
*
fromMimeType
=
new
SelectMimeTypeComboBox
;
connect
(
fromMimeType
,
&
SelectMimeTypeComboBox
::
valueChanged
,
this
,
&
SieveActionConvert
::
valueChanged
);
fromMimeType
->
setObjectName
(
QStringLiteral
(
"from"
));
lay
->
addWidget
(
fromMimeType
,
0
,
1
);
...
...
@@ -39,7 +39,7 @@ QWidget *SieveActionConvert::createParamWidget(QWidget *parent) const
lab
=
new
QLabel
(
i18n
(
"To:"
));
lay
->
addWidget
(
lab
,
0
,
2
);
SelectMimeTypeComboBox
*
toMimeType
=
new
SelectMimeTypeComboBox
;
auto
*
toMimeType
=
new
SelectMimeTypeComboBox
;
connect
(
toMimeType
,
&
SelectMimeTypeComboBox
::
valueChanged
,
this
,
&
SieveActionConvert
::
valueChanged
);
toMimeType
->
setObjectName
(
QStringLiteral
(
"to"
));
lay
->
addWidget
(
toMimeType
,
0
,
3
);
...
...
@@ -47,7 +47,7 @@ QWidget *SieveActionConvert::createParamWidget(QWidget *parent) const
lab
=
new
QLabel
(
i18n
(
"Parameters:"
));
lay
->
addWidget
(
lab
,
1
,
0
);
SelectConvertParameterWidget
*
params
=
new
SelectConvertParameterWidget
;
auto
*
params
=
new
SelectConvertParameterWidget
;
connect
(
params
,
&
SelectConvertParameterWidget
::
valueChanged
,
this
,
&
SieveActionConvert
::
valueChanged
);
params
->
setObjectName
(
QStringLiteral
(
"params"
));
lay
->
addWidget
(
params
,
1
,
1
,
2
,
3
);
...
...
@@ -62,10 +62,10 @@ void SieveActionConvert::setParamWidgetValue(QXmlStreamReader &element, QWidget
const
QStringRef
tagName
=
element
.
name
();
if
(
tagName
==
QLatin1String
(
"str"
))
{
if
(
index
==
0
)
{
SelectMimeTypeComboBox
*
fromMimeType
=
w
->
findChild
<
SelectMimeTypeComboBox
*>
(
QStringLiteral
(
"from"
));
auto
*
fromMimeType
=
w
->
findChild
<
SelectMimeTypeComboBox
*>
(
QStringLiteral
(
"from"
));
fromMimeType
->
setCode
(
element
.
readElementText
(),
name
(),
error
);
}
else
if
(
index
==
1
)
{
SelectMimeTypeComboBox
*
toMimeType
=
w
->
findChild
<
SelectMimeTypeComboBox
*>
(
QStringLiteral
(
"to"
));
auto
*
toMimeType
=
w
->
findChild
<
SelectMimeTypeComboBox
*>
(
QStringLiteral
(
"to"
));
toMimeType
->
setCode
(
element
.
readElementText
(),
name
(),
error
);
}
else
{
tooManyArguments
(
tagName
,
index
,
2
,
error
);
...
...
@@ -73,7 +73,7 @@ void SieveActionConvert::setParamWidgetValue(QXmlStreamReader &element, QWidget
}
++
index
;
}
else
if
(
tagName
==
QLatin1String
(
"list"
))
{
SelectConvertParameterWidget
*
params
=
w
->
findChild
<
SelectConvertParameterWidget
*>
(
QStringLiteral
(
"params"
));
auto
*
params
=
w
->
findChild
<
SelectConvertParameterWidget
*>
(
QStringLiteral
(
"params"
));
params
->
setCode
(
AutoCreateScriptUtil
::
listValue
(
element
),
error
);
}
else
if
(
tagName
==
QLatin1String
(
"crlf"
))
{
element
.
skipCurrentElement
();
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
View file @
d4bb2f3a
...
...
@@ -27,11 +27,11 @@ SieveActionDeleteHeader::SieveActionDeleteHeader(SieveEditorGraphicalModeWidget
QWidget
*
SieveActionDeleteHeader
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QGridLayo
ut
*
grid
=
new
QGridLayout
;
a
ut
o
*
grid
=
new
QGridLayout
;
grid
->
setContentsMargins
({});
w
->
setLayout
(
grid
);
SelectMatchTypeComboBox
*
matchType
=
new
SelectMatchTypeComboBox
(
mSieveGraphicalModeWidget
);
auto
*
matchType
=
new
SelectMatchTypeComboBox
(
mSieveGraphicalModeWidget
);
matchType
->
setObjectName
(
QStringLiteral
(
"matchtype"
));
connect
(
matchType
,
&
SelectMatchTypeComboBox
::
valueChanged
,
this
,
&
SieveActionDeleteHeader
::
valueChanged
);
grid
->
addWidget
(
matchType
,
0
,
0
);
...
...
@@ -39,7 +39,7 @@ QWidget *SieveActionDeleteHeader::createParamWidget(QWidget *parent) const
QLabel
*
lab
=
new
QLabel
(
i18n
(
"header:"
));
grid
->
addWidget
(
lab
,
0
,
1
);
QLineEdit
*
headerEdit
=
new
QLineEdit
;
auto
*
headerEdit
=
new
QLineEdit
;
headerEdit
->
setObjectName
(
QStringLiteral
(
"headeredit"
));
connect
(
headerEdit
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionDeleteHeader
::
valueChanged
);
grid
->
addWidget
(
headerEdit
,
0
,
2
);
...
...
@@ -47,7 +47,7 @@ QWidget *SieveActionDeleteHeader::createParamWidget(QWidget *parent) const
lab
=
new
QLabel
(
i18n
(
"value:"
));
grid
->
addWidget
(
lab
,
1
,
1
);
QLineEdit
*
valueEdit
=
new
QLineEdit
;
auto
*
valueEdit
=
new
QLineEdit
;
valueEdit
->
setObjectName
(
QStringLiteral
(
"valueedit"
));
connect
(
valueEdit
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionDeleteHeader
::
valueChanged
);
grid
->
addWidget
(
valueEdit
,
1
,
2
);
...
...
@@ -69,14 +69,14 @@ void SieveActionDeleteHeader::parseValue(QXmlStreamReader &element, QWidget *w,
element
.
skipCurrentElement
();
return
;
}
else
if
(
tagName
==
QLatin1String
(
"tag"
))
{
SelectMatchTypeComboBox
*
combo
=
w
->
findChild
<
SelectMatchTypeComboBox
*>
(
QStringLiteral
(
"matchtype"
));
auto
*
combo
=
w
->
findChild
<
SelectMatchTypeComboBox
*>
(
QStringLiteral
(
"matchtype"
));
combo
->
setCode
(
AutoCreateScriptUtil
::
tagValueWithCondition
(
element
.
readElementText
(),
isNegative
),
name
(),
error
);
}
else
if
(
tagName
==
QLatin1String
(
"str"
))
{
if
(
index
==
0
)
{
QLineEdit
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"headeredit"
));
auto
*
edit
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"headeredit"
));
edit
->
setText
(
element
.
readElementText
());
}
else
if
(
index
==
1
)
{
QLineEdit
*
value
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"valueedit"
));
auto
*
value
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"valueedit"
));
value
->
setText
(
element
.
readElementText
());
}
else
{
tooManyArguments
(
tagName
,
index
,
2
,
error
);
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
View file @
d4bb2f3a
...
...
@@ -25,14 +25,14 @@ SieveActionEnclose::SieveActionEnclose(SieveEditorGraphicalModeWidget *sieveGrap
QWidget
*
SieveActionEnclose
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QGridLayo
ut
*
grid
=
new
QGridLayout
;
a
ut
o
*
grid
=
new
QGridLayout
;
grid
->
setContentsMargins
({});
w
->
setLayout
(
grid
);
QLabel
*
lab
=
new
QLabel
(
i18n
(
"Subject:"
));
grid
->
addWidget
(
lab
,
0
,
0
);
QLineEdit
*
subject
=
new
QLineEdit
;
auto
*
subject
=
new
QLineEdit
;
subject
->
setObjectName
(
QStringLiteral
(
"subject"
));
connect
(
subject
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionEnclose
::
valueChanged
);
grid
->
addWidget
(
subject
,
0
,
1
);
...
...
@@ -40,7 +40,7 @@ QWidget *SieveActionEnclose::createParamWidget(QWidget *parent) const
lab
=
new
QLabel
(
i18n
(
"headers:"
));
grid
->
addWidget
(
lab
,
1
,
0
);
QLineEdit
*
headers
=
new
QLineEdit
;
auto
*
headers
=
new
QLineEdit
;
headers
->
setObjectName
(
QStringLiteral
(
"headers"
));
connect
(
headers
,
&
QLineEdit
::
textChanged
,
this
,
&
SieveActionEnclose
::
valueChanged
);
grid
->
addWidget
(
headers
,
1
,
1
);
...
...
@@ -48,7 +48,7 @@ QWidget *SieveActionEnclose::createParamWidget(QWidget *parent) const
lab
=
new
QLabel
(
i18n
(
"text:"
));
grid
->
addWidget
(
lab
,
2
,
0
);
MultiLineEdit
*
text
=
new
MultiLineEdit
;
auto
*
text
=
new
MultiLineEdit
;
text
->
setObjectName
(
QStringLiteral
(
"text"
));
connect
(
text
,
&
MultiLineEdit
::
valueChanged
,
this
,
&
SieveActionEnclose
::
valueChanged
);
grid
->
addWidget
(
text
,
2
,
1
);
...
...
@@ -65,13 +65,13 @@ void SieveActionEnclose::setParamWidgetValue(QXmlStreamReader &element, QWidget
if
(
tagValue
==
QLatin1String
(
"headers"
))
{
const
QString
strValue
=
AutoCreateScriptUtil
::
strValue
(
element
);
if
(
!
strValue
.
isEmpty
())
{
QLineEdit
*
subject
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"headers"
));
auto
*
subject
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"headers"
));
subject
->
setText
(
strValue
);
}
}
else
if
(
tagValue
==
QLatin1String
(
"subject"
))
{
const
QString
strValue
=
AutoCreateScriptUtil
::
strValue
(
element
);
if
(
!
strValue
.
isEmpty
())
{
QLineEdit
*
headers
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"subject"
));
auto
*
headers
=
w
->
findChild
<
QLineEdit
*>
(
QStringLiteral
(
"subject"
));
headers
->
setText
(
strValue
);
}
}
else
{
...
...
@@ -79,7 +79,7 @@ void SieveActionEnclose::setParamWidgetValue(QXmlStreamReader &element, QWidget
qCDebug
(
LIBKSIEVE_LOG
)
<<
" SieveActionEnclose::setParamWidgetValue unknown tag value:"
<<
tagValue
;
}
}
else
if
(
tagName
==
QLatin1String
(
"str"
))
{
MultiLineEdit
*
edit
=
w
->
findChild
<
MultiLineEdit
*>
(
QStringLiteral
(
"text"
));
auto
*
edit
=
w
->
findChild
<
MultiLineEdit
*>
(
QStringLiteral
(
"text"
));
edit
->
setPlainText
(
element
.
readElementText
());
}
else
if
(
tagName
==
QLatin1String
(
"crlf"
))
{
element
.
skipCurrentElement
();
...
...
src/ksieveui/autocreatescripts/sieveactions/sieveactionereject.cpp
View file @
d4bb2f3a
...
...
@@ -24,13 +24,13 @@ SieveActionEReject::SieveActionEReject(SieveEditorGraphicalModeWidget *sieveGrap
QWidget
*
SieveActionEReject
::
createParamWidget
(
QWidget
*
parent
)
const
{
QWidget
*
w
=
new
QWidget
(
parent
);
QHBoxLayo
ut
*
lay
=
new
QHBoxLayout
;
a
ut
o
*
lay
=
new
QHBoxLayout
;
lay
->
setContentsMargins
({});
w
->
setLayout
(
lay
);
QLabel
*
lab
=
new
QLabel
(
i18n
(
"text:"
));
lay
->
addWidget
(
lab
);
MultiLineEdit
*
edit
=
new
MultiLineEdit
;
auto
*
edit
=
new
MultiLineEdit
;
connect
(
edit
,
&
MultiLineEdit
::
textChanged
,
this
,
&
SieveActionEReject
::
valueChanged
);
edit
->
setObjectName
(
QStringLiteral
(
"rejectmessage"
));
lay
->
addWidget
(
edit
);
...
...
@@ -43,7 +43,7 @@ void SieveActionEReject::setParamWidgetValue(QXmlStreamReader &element, QWidget
const
QStringRef
tagName
=
element
.
name
();
if
(
tagName
==
QLatin1String
(
"str"
))
{
const
QString
tagValue
=
element
.
readElementText
();
MultiLineEdit
*
edit
=
w
->
findChild
<
MultiLineEdit
*>
(
QStringLiteral
(
"rejectmessage"
));
auto
*
edit
=
w
->
findChild
<
MultiLineEdit
*>
(
QStringLiteral
(
"rejectmessage"
));
edit
->
setPlainText
(
tagValue
);
}
else
if
(
tagName
==
QLatin1String
(
"crlf"
))
{