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
94e4c571
Commit
94e4c571
authored
Jun 15, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Coding style
parent
0ab254e5
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
23 additions
and
25 deletions
+23
-25
src/ksieveui/debug/sievedebugdialog.cpp
src/ksieveui/debug/sievedebugdialog.cpp
+1
-1
src/ksieveui/debug/sievedebugdialog.h
src/ksieveui/debug/sievedebugdialog.h
+2
-3
src/ksieveui/managesievescriptsdialog.h
src/ksieveui/managesievescriptsdialog.h
+1
-1
src/ksieveui/util/autotests/utilmethodtest.cpp
src/ksieveui/util/autotests/utilmethodtest.cpp
+3
-3
src/ksieveui/util/sieveimappasswordprovider.h
src/ksieveui/util/sieveimappasswordprovider.h
+1
-4
src/ksieveui/util/util.cpp
src/ksieveui/util/util.cpp
+2
-1
src/ksieveui/util/util_p.h
src/ksieveui/util/util_p.h
+2
-1
src/ksieveui/vacation/multiimapvacationmanager.cpp
src/ksieveui/vacation/multiimapvacationmanager.cpp
+1
-1
src/ksieveui/vacation/multiimapvacationmanager.h
src/ksieveui/vacation/multiimapvacationmanager.h
+2
-2
src/ksieveui/vacation/vacation.cpp
src/ksieveui/vacation/vacation.cpp
+1
-1
src/ksieveui/vacation/vacation.h
src/ksieveui/vacation/vacation.h
+2
-2
src/ksieveui/vacation/vacationmanager.cpp
src/ksieveui/vacation/vacationmanager.cpp
+1
-1
src/ksieveui/vacation/vacationmanager.h
src/ksieveui/vacation/vacationmanager.h
+1
-1
src/ksieveui/widgets/custommanagesievewidget.cpp
src/ksieveui/widgets/custommanagesievewidget.cpp
+1
-1
src/ksieveui/widgets/custommanagesievewidget.h
src/ksieveui/widgets/custommanagesievewidget.h
+2
-2
No files found.
src/ksieveui/debug/sievedebugdialog.cpp
View file @
94e4c571
...
...
@@ -32,7 +32,7 @@
using
namespace
KSieveUi
;
SieveDebugDialog
::
SieveDebugDialog
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
)
SieveDebugDialog
::
SieveDebugDialog
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
)
:
QDialog
(
parent
)
,
mSieveJob
(
nullptr
)
,
mPasswordProvider
(
passwordProvider
)
...
...
src/ksieveui/debug/sievedebugdialog.h
View file @
94e4c571
...
...
@@ -29,7 +29,6 @@ namespace KPIMTextEdit {
class
PlainTextEditorWidget
;
}
namespace
KSieveUi
{
class
SieveImapPasswordProvider
;
/**
...
...
@@ -40,7 +39,7 @@ class KSIEVEUI_EXPORT SieveDebugDialog : public QDialog
{
Q_OBJECT
public:
explicit
SieveDebugDialog
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
=
nullptr
);
explicit
SieveDebugDialog
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
=
nullptr
);
~
SieveDebugDialog
();
Q_SIGNALS:
...
...
@@ -61,7 +60,7 @@ private:
QUrl
mUrl
;
KSyntaxHighlighting
::
Repository
mRepo
;
SieveImapPasswordProvider
*
mPasswordProvider
;
SieveImapPasswordProvider
*
mPasswordProvider
;
KPIMTextEdit
::
PlainTextEditorWidget
*
mEdit
;
QStringList
mResourceIdentifier
;
QStringList
mScriptList
;
...
...
src/ksieveui/managesievescriptsdialog.h
View file @
94e4c571
...
...
@@ -39,7 +39,7 @@ class KSIEVEUI_EXPORT ManageSieveScriptsDialog : public QDialog
Q_OBJECT
public:
explicit
ManageSieveScriptsDialog
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
=
nullptr
);
explicit
ManageSieveScriptsDialog
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
=
nullptr
);
~
ManageSieveScriptsDialog
();
Q_SIGNALS:
...
...
src/ksieveui/util/autotests/utilmethodtest.cpp
View file @
94e4c571
...
...
@@ -30,16 +30,16 @@ class DataImapPasswordProvider : public KSieveUi::SieveImapPasswordProvider
{
public:
DataImapPasswordProvider
(
AkonadiImapSettingInterfaceDataTest
*
data
)
:
mData
(
data
)
:
mData
(
data
)
{
}
QString
password
(
const
QString
&
/*identifier*/
)
override
QString
password
(
const
QString
&
/*identifier*/
)
override
{
return
mData
->
password
;
}
QString
sieveCustomPassword
(
const
QString
&
/*identifier*/
)
override
QString
sieveCustomPassword
(
const
QString
&
/*identifier*/
)
override
{
return
mData
->
sieveCustomPassword
;
}
...
...
src/ksieveui/util/sieveimappasswordprovider.h
View file @
94e4c571
...
...
@@ -24,9 +24,7 @@
class
QString
;
namespace
KSieveUi
{
namespace
KSieveUi
{
class
KSIEVEUI_EXPORT
SieveImapPasswordProvider
{
public:
...
...
@@ -34,6 +32,5 @@ public:
virtual
QString
password
(
const
QString
&
identifier
)
=
0
;
virtual
QString
sieveCustomPassword
(
const
QString
&
identifier
)
=
0
;
};
}
#endif
src/ksieveui/util/util.cpp
View file @
94e4c571
...
...
@@ -61,7 +61,8 @@ KSieveUi::Util::AccountInfo KSieveUi::Util::fullAccountInfo(const QString &ident
return
accountInfo
;
}
KSieveUi
::
Util
::
AccountInfo
KSieveUi
::
Util
::
findAccountInfo
(
const
QString
&
identifier
,
SieveImapPasswordProvider
*
provider
,
bool
withVacationFileName
,
std
::
unique_ptr
<
KSieveUi
::
AbstractAkonadiImapSettingInterface
>
&
interface
)
KSieveUi
::
Util
::
AccountInfo
KSieveUi
::
Util
::
findAccountInfo
(
const
QString
&
identifier
,
SieveImapPasswordProvider
*
provider
,
bool
withVacationFileName
,
std
::
unique_ptr
<
KSieveUi
::
AbstractAkonadiImapSettingInterface
>
&
interface
)
{
KSieveUi
::
Util
::
AccountInfo
accountInfo
;
if
(
!
interface
)
{
...
...
src/ksieveui/util/util_p.h
View file @
94e4c571
...
...
@@ -80,7 +80,8 @@ bool hasKep14Support(const QStringList &sieveCapabilities, const QStringList &av
*/
bool
isKep14ProtectedName
(
const
QString
&
scriptName
);
KSIEVEUI_TESTS_EXPORT
KSieveUi
::
Util
::
AccountInfo
findAccountInfo
(
const
QString
&
identifier
,
SieveImapPasswordProvider
*
provider
,
bool
withVacationFileName
,
std
::
unique_ptr
<
KSieveUi
::
AbstractAkonadiImapSettingInterface
>
&
interface
);
KSIEVEUI_TESTS_EXPORT
KSieveUi
::
Util
::
AccountInfo
findAccountInfo
(
const
QString
&
identifier
,
SieveImapPasswordProvider
*
provider
,
bool
withVacationFileName
,
std
::
unique_ptr
<
KSieveUi
::
AbstractAkonadiImapSettingInterface
>
&
interface
);
/**
* Returns all sieve account info with the given @p identifier.
*/
...
...
src/ksieveui/vacation/multiimapvacationmanager.cpp
View file @
94e4c571
...
...
@@ -28,7 +28,7 @@
#include "libksieve_debug.h"
using
namespace
KSieveUi
;
MultiImapVacationManager
::
MultiImapVacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
)
MultiImapVacationManager
::
MultiImapVacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
)
:
QObject
(
parent
)
,
mPasswordProvider
(
passwordProvider
)
,
mNumberOfJobs
(
0
)
...
...
src/ksieveui/vacation/multiimapvacationmanager.h
View file @
94e4c571
...
...
@@ -35,7 +35,7 @@ class KSIEVEUI_EXPORT MultiImapVacationManager : public QObject
{
Q_OBJECT
public:
explicit
MultiImapVacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
=
nullptr
);
explicit
MultiImapVacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
=
nullptr
);
~
MultiImapVacationManager
();
void
checkVacation
();
...
...
@@ -52,7 +52,7 @@ private Q_SLOTS:
void
slotCheckKep14Ended
(
KSieveUi
::
CheckKolabKep14SupportJob
*
job
,
bool
success
);
private:
SieveImapPasswordProvider
*
mPasswordProvider
;
SieveImapPasswordProvider
*
mPasswordProvider
;
int
mNumberOfJobs
;
bool
mCheckInProgress
;
...
...
src/ksieveui/vacation/vacation.cpp
View file @
94e4c571
...
...
@@ -27,7 +27,7 @@
using
namespace
KSieveUi
;
Vacation
::
Vacation
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
,
bool
checkOnly
,
const
QUrl
&
url
)
Vacation
::
Vacation
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
,
bool
checkOnly
,
const
QUrl
&
url
)
:
QObject
(
parent
)
,
mPasswordProvider
(
passwordProvider
)
,
mSieveJob
(
nullptr
)
...
...
src/ksieveui/vacation/vacation.h
View file @
94e4c571
...
...
@@ -33,7 +33,7 @@ class Vacation : public QObject
Q_OBJECT
public:
explicit
Vacation
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
=
nullptr
,
bool
checkonly
=
false
,
const
QUrl
&
url
=
QUrl
());
explicit
Vacation
(
SieveImapPasswordProvider
*
passwordProvider
,
QObject
*
parent
=
nullptr
,
bool
checkonly
=
false
,
const
QUrl
&
url
=
QUrl
());
virtual
~
Vacation
();
bool
isUsable
()
const
;
...
...
@@ -59,7 +59,7 @@ protected Q_SLOTS:
void
slotPutInactiveResult
(
KManageSieve
::
SieveJob
*
,
bool
);
protected:
// IO:
SieveImapPasswordProvider
*
mPasswordProvider
;
SieveImapPasswordProvider
*
mPasswordProvider
;
KManageSieve
::
SieveJob
*
mSieveJob
;
QUrl
mUrl
;
QString
mServerName
;
...
...
src/ksieveui/vacation/vacationmanager.cpp
View file @
94e4c571
...
...
@@ -44,7 +44,7 @@ public:
bool
mQuestionAsked
;
};
VacationManager
::
VacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
)
VacationManager
::
VacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
)
:
QObject
(
parent
)
,
d
(
new
KSieveUi
::
VacationManagerPrivate
(
parent
))
{
...
...
src/ksieveui/vacation/vacationmanager.h
View file @
94e4c571
...
...
@@ -32,7 +32,7 @@ class KSIEVEUI_EXPORT VacationManager : public QObject
{
Q_OBJECT
public:
explicit
VacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
);
explicit
VacationManager
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
);
~
VacationManager
();
void
checkVacation
();
...
...
src/ksieveui/widgets/custommanagesievewidget.cpp
View file @
94e4c571
...
...
@@ -27,7 +27,7 @@
using
namespace
KSieveUi
;
CustomManageSieveWidget
::
CustomManageSieveWidget
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
)
CustomManageSieveWidget
::
CustomManageSieveWidget
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
)
:
KSieveUi
::
ManageSieveWidget
(
parent
)
,
mPasswordProvider
(
passwordProvider
)
{
...
...
src/ksieveui/widgets/custommanagesievewidget.h
View file @
94e4c571
...
...
@@ -26,14 +26,14 @@ class CustomManageSieveWidget : public KSieveUi::ManageSieveWidget
{
Q_OBJECT
public:
explicit
CustomManageSieveWidget
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
=
nullptr
);
explicit
CustomManageSieveWidget
(
SieveImapPasswordProvider
*
passwordProvider
,
QWidget
*
parent
=
nullptr
);
virtual
~
CustomManageSieveWidget
();
protected:
bool
refreshList
()
override
;
private:
SieveImapPasswordProvider
*
mPasswordProvider
;
SieveImapPasswordProvider
*
mPasswordProvider
;
};
}
...
...
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