X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/02c08351489ed7b649e6409bf529773bab5136d8..87e8d0ba:/src/panels/places/placesitemeditdialog.cpp

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 93a4d21f4..4a56ce908 100644
--- 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>
@@ -46,10 +44,11 @@ PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
     m_text(),
     m_url(),
     m_allowGlobal(false),
-    m_urlEdit(0),
-    m_textEdit(0),
-    m_iconButton(0),
-    m_appLocal(0)
+    m_urlEdit(nullptr),
+    m_textEdit(nullptr),
+    m_iconButton(nullptr),
+    m_appLocal(nullptr),
+    m_buttonBox(nullptr)
 {
 }
 
@@ -108,7 +107,7 @@ bool PlacesItemEditDialog::event(QEvent* event)
 
 void PlacesItemEditDialog::slotUrlChanged(const QString& text)
 {
-    m_okButton->setEnabled(!text.isEmpty());
+    m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
 }
 
 PlacesItemEditDialog::~PlacesItemEditDialog()
@@ -117,20 +116,16 @@ PlacesItemEditDialog::~PlacesItemEditDialog()
 
 void PlacesItemEditDialog::initialize()
 {
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    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()));
+    m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel, this);
+    connect(m_buttonBox, &QDialogButtonBox::accepted, this, &PlacesItemEditDialog::accept);
+    connect(m_buttonBox, &QDialogButtonBox::rejected, this, &PlacesItemEditDialog::reject);
     setModal(true);
-    m_okButton->setDefault(true);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     QWidget* mainWidget = new QWidget(this);
     mainLayout->addWidget(mainWidget);
-    mainLayout->addWidget(buttonBox);
+    mainLayout->addWidget(m_buttonBox);
 
     QVBoxLayout* vBox = new QVBoxLayout(mainWidget);
 
@@ -161,13 +156,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);