diff --git a/src/dolphindockwidget.h b/src/dolphindockwidget.h --- a/src/dolphindockwidget.h +++ b/src/dolphindockwidget.h @@ -30,8 +30,7 @@ Q_OBJECT public: - explicit DolphinDockWidget(const QString& title, QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); - explicit DolphinDockWidget(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit DolphinDockWidget(const QString& title = QString(), QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); ~DolphinDockWidget() override; /** diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -58,14 +58,6 @@ setFeatures(DefaultDockWidgetFeatures); } -DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_locked(false), - m_dockTitleBar(nullptr) -{ - setFeatures(DefaultDockWidgetFeatures); -} - DolphinDockWidget::~DolphinDockWidget() { } diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp --- a/src/panels/panel.cpp +++ b/src/panels/panel.cpp @@ -64,8 +64,7 @@ const QUrl oldUrl = m_url; m_url = url; - const bool accepted = urlChanged(); - if (!accepted) { + if (!urlChanged()) { m_url = oldUrl; } } diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h --- a/src/panels/places/placesitem.h +++ b/src/panels/places/placesitem.h @@ -105,7 +105,6 @@ QPointer m_disc; QPointer m_mtp; QPointer m_signalHandler; - QPointer m_trashDirLister; KBookmark m_bookmark; friend class PlacesItemSignalHandler; // Calls onAccessibilityChanged() diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -38,7 +38,6 @@ m_disc(), m_mtp(), m_signalHandler(nullptr), - m_trashDirLister(nullptr), m_bookmark() { m_signalHandler = new PlacesItemSignalHandler(this); @@ -48,7 +47,6 @@ PlacesItem::~PlacesItem() { delete m_signalHandler; - delete m_trashDirLister; } void PlacesItem::setUrl(const QUrl &url) @@ -59,7 +57,6 @@ // setting an equal URL results in an itemsChanged() // signal. if (dataValue("url").toUrl() != url) { - delete m_trashDirLister; if (url.scheme() == QLatin1String("trash")) { QObject::connect(&Trash::instance(), &Trash::emptinessChanged, m_signalHandler.data(), &PlacesItemSignalHandler::onTrashEmptinessChanged); } diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp --- a/src/panels/places/placesitemsignalhandler.cpp +++ b/src/panels/places/placesitemsignalhandler.cpp @@ -45,8 +45,7 @@ if (m_item) { Solid::StorageAccess *tmp = m_item->device().as(); if (tmp) { - QString mountPath = tmp->filePath(); - emit tearDownExternallyRequested(mountPath); + emit tearDownExternallyRequested(tmp->filePath()); } } }