From 1859d6455daaa8163fd451e26ffd34cc86738464 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Wed, 21 Mar 2018 15:53:59 +0100
Subject: [PATCH 1/2] [DolphinContextMenu] Fix excluding ourself from Open With
 menu

The desktop file name changed to org.kde.dolphin a long time ago. To avoid this breaking again, just use qApp->desktopFileName()

BUG: 391997

Differential Revision: https://phabricator.kde.org/D11540
---
 src/dolphincontextmenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 4801aa3afc..bedc835c2a 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -474,7 +474,7 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu
-    fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != 'dolphin'"));
+    fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != '%1'").arg(qApp->desktopFileName()));
 
     // insert 'Actions' sub menu
     fileItemActions.addServiceActionsTo(this);

From 8d1cc850de7f9c4b0115df20ba6fe40b3f5915ab Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Thu, 29 Mar 2018 22:29:56 +0200
Subject: [PATCH 2/2] Fix enum-compare-switch clang warnings

We were comparing a value of type `KStandardItemListView::ItemLayout`
with values of type `KStandardItemListWidget::Layout`.
---
 src/kitemviews/kstandarditemlistwidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index d396e58f8d..1aca250dd8 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -51,15 +51,15 @@ KStandardItemListWidgetInformant::~KStandardItemListWidgetInformant()
 void KStandardItemListWidgetInformant::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const
 {
     switch (static_cast<const KStandardItemListView*>(view)->itemLayout()) {
-    case KStandardItemListWidget::IconsLayout:
+    case KStandardItemListView::IconsLayout:
         calculateIconsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
         break;
 
-    case KStandardItemListWidget::CompactLayout:
+    case KStandardItemListView::CompactLayout:
         calculateCompactLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
         break;
 
-    case KStandardItemListWidget::DetailsLayout:
+    case KStandardItemListView::DetailsLayout:
         calculateDetailsLayoutItemSizeHints(logicalHeightHints, logicalWidthHint, view);
         break;