X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/080498368502bfbdc4e13427ba3a9a21cefcafdf..b44b4806cb1a16cf8b414b504de6f46cf45dc52f:/src/settings/general/configurepreviewplugindialog.cpp diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index bc3cca706..a391812df 100644 --- a/src/settings/general/configurepreviewplugindialog.cpp +++ b/src/settings/general/configurepreviewplugindialog.cpp @@ -1,30 +1,19 @@ -/*************************************************************************** - * Copyright (C) 2011 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2011 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "configurepreviewplugindialog.h" +#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 87) + #include #include #include #include #include -#include +#include #include #include @@ -32,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())); } } @@ -51,7 +38,6 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin setMinimumWidth(400); auto layout = new QVBoxLayout(this); - setLayout(layout); if (previewPlugin) { auto configurationWidget = previewPlugin->createConfigurationWidget(); @@ -78,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