Load KFileItemAction plugins with json metadata

[dolphin.git] / src / panels / places / placesitemeditdialog.cpp

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 93a4d21f40ef25fc390ccc858a099a10dce583b4..7d365310f6f7e0275be4f2741edd396d19afb0f6 100644 (file)
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -23,15 +23,13 @@
 
 #include "placesitemeditdialog.h"
 
-#include <k4aboutdata.h>
-#include <KDebug>
+#include <KAboutData>
+#include "dolphindebug.h"
 #include <KFile>
-#include <KGlobal>
 #include <KIconButton>
 #include <KLocalizedString>
 #include <QMimeDatabase>
 #include <KUrlRequester>
-#include <KComponentData>
 #include <QCheckBox>
 #include <QEvent>
 #include <QFormLayout>
@@ -121,8 +119,8 @@ void PlacesItemEditDialog::initialize()
     m_okButton = buttonBox->button(QDialogButtonBox::Ok);
     m_okButton->setDefault(true);
     m_okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &PlacesItemEditDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &PlacesItemEditDialog::reject);
     setModal(true);
     m_okButton->setDefault(true);
 
@@ -161,13 +159,7 @@ void PlacesItemEditDialog::initialize()
     }
 
     if (m_allowGlobal) {
-        QString appName;
-        if (KGlobal::mainComponent().aboutData()) {
-            appName = KGlobal::mainComponent().aboutData()->programName();
-        }
-        if (appName.isEmpty()) {
-            appName = KGlobal::mainComponent().componentName();
-        }
+        const QString appName = KAboutData::applicationData().displayName();
         m_appLocal = new QCheckBox( i18n("&Only show when using this application (%1)",  appName ), mainWidget );
         m_appLocal->setChecked(false);
         vBox->addWidget(m_appLocal);