From e1ba299b29235f337b9cc415d874e5fe369d60fb Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 22 Jun 2018 15:20:38 +0200 Subject: [PATCH 1/4] don't use temporaries when uneeded --- src/panels/panel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp index 30cff509d..40f816158 100644 --- a/src/panels/panel.cpp +++ b/src/panels/panel.cpp @@ -64,8 +64,7 @@ void Panel::setUrl(const QUrl& url) const QUrl oldUrl = m_url; m_url = url; - const bool accepted = urlChanged(); - if (!accepted) { + if (!urlChanged()) { m_url = oldUrl; } } From f5ce8d865b7e9df3f84161734258707679c5b059 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 22 Jun 2018 15:21:00 +0200 Subject: [PATCH 2/4] Remove unused variable Compiled, Run. Trash still there. --- src/panels/places/placesitem.cpp | 3 --- src/panels/places/placesitem.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 10b87086c..9f9041bfa 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -38,7 +38,6 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : m_disc(), m_mtp(), m_signalHandler(nullptr), - m_trashDirLister(nullptr), m_bookmark() { m_signalHandler = new PlacesItemSignalHandler(this); @@ -48,7 +47,6 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : PlacesItem::~PlacesItem() { delete m_signalHandler; - delete m_trashDirLister; } void PlacesItem::setUrl(const QUrl &url) @@ -59,7 +57,6 @@ void PlacesItem::setUrl(const QUrl &url) // 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/placesitem.h b/src/panels/places/placesitem.h index 3de626983..1677cca19 100644 --- a/src/panels/places/placesitem.h +++ b/src/panels/places/placesitem.h @@ -105,7 +105,6 @@ private: QPointer m_disc; QPointer m_mtp; QPointer m_signalHandler; - QPointer m_trashDirLister; KBookmark m_bookmark; friend class PlacesItemSignalHandler; // Calls onAccessibilityChanged() From 6b72c67b096f23a40fa9a98617742560002f33c2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 22 Jun 2018 15:30:11 +0200 Subject: [PATCH 3/4] Use copy ellision --- src/panels/places/placesitemsignalhandler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp index b313f838f..1341b7413 100644 --- a/src/panels/places/placesitemsignalhandler.cpp +++ b/src/panels/places/placesitemsignalhandler.cpp @@ -45,8 +45,7 @@ void PlacesItemSignalHandler::onTearDownRequested(const QString& udi) if (m_item) { Solid::StorageAccess *tmp = m_item->device().as(); if (tmp) { - QString mountPath = tmp->filePath(); - emit tearDownExternallyRequested(mountPath); + emit tearDownExternallyRequested(tmp->filePath()); } } } From 088e692007363bb2c8cd98487cc36ad63186b2d4 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 22 Jun 2018 16:03:48 +0200 Subject: [PATCH 4/4] don't use temporaries when uneeded Summary: Remove unused variable Compiled, Run. Trash still there. Use copy ellision Remove uneeded code Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D13680 --- src/dolphindockwidget.cpp | 8 -------- src/dolphindockwidget.h | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index 726338377..32d25702a 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -58,14 +58,6 @@ DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt:: 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/dolphindockwidget.h b/src/dolphindockwidget.h index c4fcbf753..0b745f083 100644 --- a/src/dolphindockwidget.h +++ b/src/dolphindockwidget.h @@ -30,8 +30,7 @@ class DolphinDockWidget : public QDockWidget 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; /**