X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/462982faa361c79daab43ce526ae64646b1ea63c..b44b4806cb1a16cf8b414b504de6f46cf45dc52f:/src/settings/general/configurepreviewplugindialog.cpp diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index d29b63b7d..a391812df 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -6,12 +6,14 @@ #include "configurepreviewplugindialog.h" +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) + #include #include #include #include #include -#include +#include #include #include @@ -19,17 +21,15 @@ #include #include -ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName, - const QString& desktopEntryName, - QWidget* parent) : - QDialog(parent) +ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString &pluginName, const QString &desktopEntryName, QWidget *parent) + : QDialog(parent) { QSharedPointer previewPlugin; - const QString pluginPath = KPluginLoader::findPlugin(desktopEntryName); + const QString pluginPath = QPluginLoader(desktopEntryName).fileName(); if (!pluginPath.isEmpty()) { newCreator create = (newCreator)QLibrary::resolve(pluginPath, "new_creator"); if (create) { - previewPlugin.reset(dynamic_cast(create())); + previewPlugin.reset(dynamic_cast(create())); } } @@ -38,7 +38,6 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin setMinimumWidth(400); auto layout = new QVBoxLayout(this); - setLayout(layout); if (previewPlugin) { auto configurationWidget = previewPlugin->createConfigurationWidget(); @@ -65,6 +64,8 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin layout->addWidget(buttonBox); auto okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setShortcut(Qt::CTRL + Qt::Key_Return); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); okButton->setDefault(true); } + +#endif // KIO_VERSION