From 2523442d4d67ac5a801728394653f38e0ee8a09a Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Mon, 5 Mar 2018 21:56:15 +0100
Subject: Revert "Fix some compile warnings"

This reverts commit 533f050855a50212bba7be57a1590f9ce743e26d.

D10995 has not been approved.
---
 src/kitemviews/kfileitemmodel.cpp      | 4 ++++
 src/kitemviews/kitemlistcontroller.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/kitemviews')

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 <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;
+            }
         }
     }
 
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
-- 
cgit v1.3.1