[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover/Plasma/5.12] libdiscover/backends/FlatpakBackend: Simplify logic
From:       Aleix Pol <null () kde ! org>
Date:       2018-05-31 0:28:06
Message-ID: E1fOBRm-0002So-Oi () code ! kde ! org
[Download RAW message or body]

Git commit 898cddd9e8ccdd108778c45e0d3d4dd300d1acf3 by Aleix Pol.
Committed on 31/05/2018 at 00:27.
Pushed by apol into branch 'Plasma/5.12'.

Simplify logic

M  +3    -3    libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp

https://commits.kde.org/discover/898cddd9e8ccdd108778c45e0d3d4dd300d1acf3

diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp \
b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp index 4228b3fc..d9dad5ff \
                100644
--- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
+++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
@@ -1094,10 +1094,10 @@ ResultsStream * FlatpakBackend::search(const \
AbstractResourcesBackend::Filters &  fetchResourceJob->start();
 
         return stream;
-    } else if ((!filter.resourceUrl.isEmpty() && filter.resourceUrl.scheme() != \
                QLatin1String("appstream")) || !filter.extends.isEmpty())
-        return new ResultsStream(QStringLiteral("FlatpakStream-void"), {});
-    else if(filter.resourceUrl.scheme() == QLatin1String("appstream"))
+    } else if(filter.resourceUrl.scheme() == QLatin1String("appstream")) {
         return findResourceByPackageName(filter.resourceUrl);
+    } else if (!filter.resourceUrl.isEmpty() || !filter.extends.isEmpty())
+        return new ResultsStream(QStringLiteral("FlatpakStream-void"), {});
 
     QVector<AbstractResource*> ret;
     foreach(AbstractResource* r, m_resources) {


[prev in list] [next in list] [prev in thread] [next in thread]