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
Akonadi Data Import Wizard
Commits
250f808f
Commit
250f808f
authored
Aug 18, 2021
by
Laurent Montel
😁
Browse files
Port to KPluginFactory::instantiatePlugin
parent
c01c9913
Pipeline
#75565
failed with stage
in 5 minutes and 18 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/importmailpluginmanager.cpp
View file @
250f808f
...
...
@@ -7,7 +7,7 @@
#include
"importmailpluginmanager.h"
#include
"abstractimporter.h"
#include
"importwizard_debug.h"
#include
"kcoreaddons_version.h"
#include
<KPluginFactory>
#include
<KPluginLoader>
#include
<KPluginMetaData>
...
...
@@ -40,7 +40,11 @@ ImportMailPluginManager *ImportMailPluginManager::self()
bool
ImportMailPluginManager
::
initializePluginList
()
{
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 85, 0)
Nicolas Fella
@nicolasfella
·
Aug 18, 2021
Developer
This needs to be either < 5.86 or <= 5.85
This needs to be either < 5.86 or <= 5.85
Please
register
or
sign in
to reply
const
QVector
<
KPluginMetaData
>
plugins
=
KPluginLoader
::
findPlugins
(
QStringLiteral
(
"importwizard"
));
#else
const
QVector
<
KPluginMetaData
>
plugins
=
KPluginMetaData
::
findPlugins
(
QStringLiteral
(
"importwizard"
));
#endif
QVectorIterator
<
KPluginMetaData
>
i
(
plugins
);
i
.
toBack
();
...
...
@@ -69,11 +73,18 @@ bool ImportMailPluginManager::initializePluginList()
void
ImportMailPluginManager
::
loadPlugin
(
ImportMailPluginManagerInfo
*
item
)
{
#if KCOREADDONS_VERSION > QT_VERSION_CHECK(5, 85, 0)
const
auto
loadResult
=
KPluginFactory
::
instantiatePlugin
<
LibImportWizard
::
AbstractImporter
>
(
KPluginMetaData
(
item
->
metaDataFileName
),
this
);
if
(
loadResult
)
{
mPluginDataList
.
append
(
item
->
pluginData
);
}
#else
KPluginLoader
pluginLoader
(
item
->
metaDataFileName
);
if
(
pluginLoader
.
factory
())
{
item
->
plugin
=
pluginLoader
.
factory
()
->
create
<
LibImportWizard
::
AbstractImporter
>
(
this
,
QVariantList
()
<<
item
->
metaDataFileNameBaseName
);
mPluginDataList
.
append
(
item
->
pluginData
);
}
#endif
}
QVector
<
LibImportWizard
::
AbstractImporter
*>
ImportMailPluginManager
::
pluginsList
()
const
...
...
Write
Preview
Supports
Markdown
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