From 0c9343d614872b88da59a7c1a18d19c8df83739f Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Thu, 8 Mar 2018 12:21:13 +0300 Subject: [PATCH] Fix some compile warnings Reviewers: markg, elvisangelaccio Reviewed By: markg, elvisangelaccio Subscribers: chehrlic, rkflx, elvisangelaccio, #dolphin Differential Revision: https://phabricator.kde.org/D10995 --- CMakeLists.txt | 2 +- src/dolphincontextmenu.cpp | 1 + src/dolphinmainwindow.cpp | 1 + src/kitemviews/kfileitemmodel.cpp | 4 ---- src/kitemviews/kitemlistcontroller.cpp | 3 +-- src/panels/information/phononwidget.cpp | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1dd08c50c..677d1bc160 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set (KDE_APPLICATIONS_VERSION_MICRO "70") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) -set(QT_MIN_VERSION "5.5.0") +set(QT_MIN_VERSION "5.8.0") set(KF5_MIN_VERSION "5.43.0") set(ECM_MIN_VERSION "1.6.0") diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 94c1d7ce89..c35f442cba 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -428,6 +428,7 @@ void DolphinContextMenu::addShowMenuBarAction() bool DolphinContextMenu::placeExists(const QUrl& url) const { + Q_UNUSED(url) // Creating up a PlacesItemModel to find out if 'url' is one of the Places // can be expensive because the model asks Solid for the devices which are // available, which can take some time. diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 762e21f940..87f974fc15 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -410,6 +410,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) case QDialogButtonBox::No: // Close only the current tab m_tabWidget->closeTab(); + Q_FALLTHROUGH(); default: event->ignore(); return; diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index d4f3561257..b6a0016428 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -246,7 +246,6 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const // Copyright (C) 2006 David Faure QList urls; QList mostLocalUrls; - bool canUseMostLocalUrls = true; const ItemData* lastAddedItem = nullptr; for (int index : indexes) { @@ -269,9 +268,6 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const bool isLocal; mostLocalUrls << item.mostLocalUrl(isLocal); - if (!isLocal) { - canUseMostLocalUrls = false; - } } } diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 672c31ae4f..bde2bb26c1 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -433,8 +433,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) } } } - // Fall through to the default case and add the Space to the current search string. - + Q_FALLTHROUGH(); // fall through to the default case and add the Space to the current search string. default: m_keyboardManager->addKeys(event->text()); // Make sure unconsumed events get propagated up the chain. #302329 diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index fed6b0ee28..494429b8c2 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -167,7 +167,7 @@ void PhononWidget::stateChanged(Phonon::State newstate) m_videoPlayer->hide(); } emit hasVideoChanged(false); - // fall through + Q_FALLTHROUGH(); default: m_stopButton->hide(); m_playButton->show();