Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
libksieve
Commits
7410024e
Commit
7410024e
authored
Aug 18, 2021
by
Laurent Montel
😁
Browse files
Port to KPluginFactory::instantiatePlugin
parent
4f8c2c48
Pipeline
#75554
passed with stage
in 17 minutes and 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/ksieveui/autocreatescripts/autocreatescriptutil.cpp
View file @
7410024e
...
...
@@ -10,6 +10,7 @@
#include <KPluginFactory>
#include <KPluginLoader>
#include <KPluginMetaData>
#include <QRegularExpression>
#include <QStringList>
...
...
@@ -20,6 +21,7 @@
#include <widgets/moveimapfolderwidget.h>
#include "kcoreaddons_version.h"
#include <autocreatescripts/sieveactions/widgets/addresslineedit.h>
using
namespace
KSieveUi
;
...
...
@@ -194,11 +196,19 @@ QString AutoCreateScriptUtil::indentation()
KSieveUi
::
AbstractMoveImapFolderWidget
*
AutoCreateScriptUtil
::
createImapFolderWidget
()
{
KSieveUi
::
AbstractMoveImapFolderWidget
*
edit
=
nullptr
;
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 86, 0)
KPluginLoader
loader
(
QStringLiteral
(
"libksieve/imapfoldercompletionplugin"
));
KPluginFactory
*
factory
=
loader
.
factory
();
if
(
factory
)
{
edit
=
factory
->
create
<
KSieveUi
::
AbstractMoveImapFolderWidget
>
();
#else
const
KPluginMetaData
editWidgetPlugin
(
QStringLiteral
(
"libksieve/imapfoldercompletionplugin"
));
const
auto
result
=
KPluginFactory
::
instantiatePlugin
<
KSieveUi
::
AbstractMoveImapFolderWidget
>
(
editWidgetPlugin
);
if
(
result
)
{
edit
=
result
.
plugin
;
}
else
{
#endif
edit
=
new
KSieveUi
::
MoveImapFolderWidget
;
}
return
edit
;
...
...
@@ -207,11 +217,19 @@ KSieveUi::AbstractMoveImapFolderWidget *AutoCreateScriptUtil::createImapFolderWi
KSieveUi
::
AbstractSelectEmailLineEdit
*
AutoCreateScriptUtil
::
createSelectEmailsWidget
()
{
KSieveUi
::
AbstractSelectEmailLineEdit
*
edit
=
nullptr
;
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 86, 0)
KPluginLoader
loader
(
QStringLiteral
(
"libksieve/emaillineeditplugin"
));
KPluginFactory
*
factory
=
loader
.
factory
();
if
(
factory
)
{
edit
=
factory
->
create
<
KSieveUi
::
AbstractSelectEmailLineEdit
>
();
#else
const
KPluginMetaData
editWidgetPlugin
(
QStringLiteral
(
"libksieve/emaillineeditplugin"
));
const
auto
result
=
KPluginFactory
::
instantiatePlugin
<
KSieveUi
::
AbstractSelectEmailLineEdit
>
(
editWidgetPlugin
);
if
(
result
)
{
edit
=
result
.
plugin
;
}
else
{
#endif
edit
=
new
AddressLineEdit
;
}
return
edit
;
...
...
@@ -220,10 +238,18 @@ KSieveUi::AbstractSelectEmailLineEdit *AutoCreateScriptUtil::createSelectEmailsW
AbstractRegexpEditorLineEdit
*
AutoCreateScriptUtil
::
createRegexpEditorLineEdit
(
QWidget
*
parent
)
{
KSieveUi
::
AbstractRegexpEditorLineEdit
*
edit
=
nullptr
;
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 86, 0)
KPluginLoader
loader
(
QStringLiteral
(
"libksieve/regexpeditorlineeditplugin"
));
KPluginFactory
*
factory
=
loader
.
factory
();
if
(
factory
)
{
edit
=
factory
->
create
<
KSieveUi
::
AbstractRegexpEditorLineEdit
>
(
parent
);
#else
const
KPluginMetaData
editWidgetPlugin
(
QStringLiteral
(
"libksieve/regexpeditorlineeditplugin"
));
const
auto
result
=
KPluginFactory
::
instantiatePlugin
<
KSieveUi
::
AbstractRegexpEditorLineEdit
>
(
editWidgetPlugin
,
parent
);
if
(
result
)
{
edit
=
result
.
plugin
;
#endif
}
else
{
edit
=
new
KSieveUi
::
RegexpEditorLineEdit
(
parent
);
}
...
...
src/ksieveui/autocreatescripts/commonwidgets/sievehelpbutton.cpp
View file @
7410024e
...
...
@@ -8,6 +8,7 @@
#include <KIO/JobUiDelegate>
#include <KIO/OpenUrlJob>
#include <KLocalizedString>
#include <KPluginLoader>
#include <QIcon>
#include <QWhatsThis>
#include <QWhatsThisClickedEvent>
...
...
src/ksieveui/vacation/vacationmailactionwidget.cpp
View file @
7410024e
...
...
@@ -9,7 +9,6 @@
#include "widgets/abstractselectemaillineedit.h"
#include "widgets/moveimapfolderwidget.h"
#include <KPluginFactory>
#include <KPluginLoader>
#include <QHBoxLayout>
#include <QStackedWidget>
...
...
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