Commit 533f0508 authored by Roman Inflianskas's avatar Roman Inflianskas

Fix some compile warnings

Reviewers: #dolphin, markg

Reviewed By: markg

Subscribers: elvisangelaccio, #dolphin

Differential Revision: https://phabricator.kde.org/D10995
parent 848abc59
......@@ -431,6 +431,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.
......
......@@ -411,6 +411,8 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
case QDialogButtonBox::No:
// Close only the current tab
m_tabWidget->closeTab();
// Do not quit, ignore quit event
// fall through
default:
event->ignore();
return;
......
......@@ -91,7 +91,10 @@ void DolphinTabWidget::readProperties(const KConfigGroup& group)
} else {
// Tab state created with Dolphin <= 4.14.x
const QByteArray state = group.readEntry("Tab " % QString::number(i), QByteArray());
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
tabPageAt(i)->restoreStateV1(state);
#pragma GCC diagnostic pop
}
}
......
......@@ -248,7 +248,6 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
// Copyright (C) 2006 David Faure <faure@kde.org>
QList<QUrl> urls;
QList<QUrl> mostLocalUrls;
bool canUseMostLocalUrls = true;
const ItemData* lastAddedItem = nullptr;
for (int index : indexes) {
......@@ -271,9 +270,6 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
bool isLocal;
mostLocalUrls << item.mostLocalUrl(isLocal);
if (!isLocal) {
canUseMostLocalUrls = false;
}
}
}
......
......@@ -435,8 +435,8 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
}
}
}
// Fall through to the default case and add the Space to the current search string.
// 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
......
......@@ -23,7 +23,10 @@
#include <Phonon/AudioOutput>
#include <Phonon/MediaObject>
#include <Phonon/SeekSlider>
#pragma GCC diagnostic push // Phonon doesn't use C++11 compiler by default, so override
#pragma GCC diagnostic ignored "-Wsuggest-override" // specifier is not available. Remove this pragmas after fixing it.
#include <Phonon/VideoWidget>
#pragma GCC diagnostic pop
#include <QVBoxLayout>
#include <QShowEvent>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment