diff options
| author | Elvis Angelaccio <[email protected]> | 2018-03-05 21:56:15 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2018-03-05 21:56:15 +0100 |
| commit | 2523442d4d67ac5a801728394653f38e0ee8a09a (patch) | |
| tree | 7b08e9d24e2792a9868803c84c400142e01806a4 /src/kitemviews | |
| parent | 48b58f830a585b773435c9af5ee2fe8f0c7c641d (diff) | |
Revert "Fix some compile warnings"
This reverts commit 533f050855a50212bba7be57a1590f9ce743e26d.
D10995 has not been approved.
Diffstat (limited to 'src/kitemviews')
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 4 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistcontroller.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index b6a001642..d4f356125 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -246,6 +246,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const // Copyright (C) 2006 David Faure <[email protected]> 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; + } } } diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 36d8e4671..672c31ae4 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -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 |
