Don't block unmounting when terminal panel's cwd is the mountpoint

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

diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index aa4b5a22a573bbc97e49a16b59bc01e74359b8c3..4c71aa3ec8d70f2e38a7ce287a230e5ab1d4ffc0 100644 (file)
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -20,23 +20,18 @@
 #include "trashsettingspage.h"
 
 #include <KCModuleProxy>
 #include "trashsettingspage.h"
 
 #include <KCModuleProxy>

-#include <KDialog>
-#include <QVBoxLayout>

 
 #include <QVBoxLayout>
 
 TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
         SettingsPageBase(parent)
 {
 
 #include <QVBoxLayout>
 
 TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
         SettingsPageBase(parent)
 {

-    const int spacing = KDialog::spacingHint();
-

     QVBoxLayout* topLayout = new QVBoxLayout(this);
     QWidget* vBox = new QWidget(this);
     QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
     vBoxVBoxLayout->setMargin(0);
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     QWidget* vBox = new QWidget(this);
     QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
     vBoxVBoxLayout->setMargin(0);

-    vBoxVBoxLayout->setSpacing(spacing);

 
 

-    m_proxy = new KCModuleProxy("kcmtrash");
+    m_proxy = new KCModuleProxy(QStringLiteral("kcmtrash"));

     topLayout->addWidget(m_proxy);
 
     // Add a dummy widget with no restriction regarding
     topLayout->addWidget(m_proxy);
 
     // Add a dummy widget with no restriction regarding