mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Revert "Fix some compile warnings"
This reverts commit 533f050855
.
D10995 has not been approved.
This commit is contained in:
parent
48b58f830a
commit
2523442d4d
|
@ -428,7 +428,6 @@ 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.
|
||||
|
|
|
@ -410,8 +410,6 @@ 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;
|
||||
|
|
|
@ -92,10 +92,7 @@ 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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -246,6 +246,7 @@ 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) {
|
||||
|
@ -268,6 +269,9 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
|
|||
|
||||
bool isLocal;
|
||||
mostLocalUrls << item.mostLocalUrl(isLocal);
|
||||
if (!isLocal) {
|
||||
canUseMostLocalUrls = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -433,8 +433,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
|
||||
|
|
Loading…
Reference in a new issue