Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / settings / trash / trashsettingspage.cpp

diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index e23028b082accd39936ccf55268f7cc2c78acbf2..4c71aa3ec8d70f2e38a7ce287a230e5ab1d4ffc0 100644 (file)
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -20,33 +20,31 @@
 #include "trashsettingspage.h"
 
 #include <KCModuleProxy>
-#include <kdialog.h>
-#include <kvbox.h>
-
-#include <settings/dolphinsettings.h>
 
 #include <QVBoxLayout>
 
 TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
         SettingsPageBase(parent)
 {
-    const int spacing = KDialog::spacingHint();
-
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
+    vBoxVBoxLayout->setMargin(0);
 
-    m_proxy = new KCModuleProxy("kcmtrash");
-    connect(m_proxy, SIGNAL(changed(bool)), this, SIGNAL(changed()));
+    m_proxy = new KCModuleProxy(QStringLiteral("kcmtrash"));
     topLayout->addWidget(m_proxy);
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
-    new QWidget(vBox);
+    QWidget *w = new QWidget(vBox);
+    vBoxVBoxLayout->addWidget(w);
+    
     topLayout->addWidget(vBox);
 
     loadSettings();
+
+    connect(m_proxy, static_cast<void(KCModuleProxy::*)(bool)>(&KCModuleProxy::changed), this, &TrashSettingsPage::changed);
 }
 
 TrashSettingsPage::~TrashSettingsPage()
@@ -68,4 +66,3 @@ void TrashSettingsPage::loadSettings()
     m_proxy->load();
 }
 
-#include "trashsettingspage.moc"