From c1a594a88684159fb4466d96e1f62c05e39e4636 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sun, 3 Jun 2018 11:32:19 +0200 Subject: [PATCH] Drop obsolete version checks We already depend on KF5 >= 5.43 --- src/dolphinviewcontainer.cpp | 5 ----- src/statusbar/statusbarspaceinfo.cpp | 2 -- 2 files changed, 7 deletions(-) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 7b995955f5..f473752dc1 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -161,12 +161,7 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : connect(m_urlNavigator, &KUrlNavigator::returnPressed, this, &DolphinViewContainer::slotReturnPressed); connect(m_urlNavigator, &KUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) { -#if KIO_VERSION >= QT_VERSION_CHECK(5, 37, 0) m_view->dropUrls(destination, event, m_urlNavigator->dropWidget()); -#else - // TODO: remove as soon as we can hard-depend of KF5 >= 5.37 - m_view->dropUrls(destination, event, m_view); -#endif }); connect(m_view, &DolphinView::directoryLoadingCompleted, this, [this]() { diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 9b8d249fb9..65af174909 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -77,9 +77,7 @@ void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event) // Note that this object must live long enough in case the user opens // the "Configure..." dialog KMoreToolsMenuFactory menuFactory(QStringLiteral("dolphin/statusbar-diskspace-menu")); -#if KNEWSTUFF_VERSION >= QT_VERSION_CHECK(5, 37, 0) menuFactory.setParentWidget(this); -#endif auto menu = menuFactory.createMenuFromGroupingNames( { "disk-usage", "more:", "disk-partitions" }, m_url);