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

List:       kde-commits
Subject:    [discover] libdiscover/backends/PackageKitBackend: Merge branch 'Plasma/5.8'
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2016-11-10 17:13:17
Message-ID: E1c4sub-0005ly-Dq () code ! kde ! org
[Download RAW message or body]

Git commit a906e8e074d7a8f8fb5b55ae088bd682869f29d4 by Aleix Pol.
Committed on 10/11/2016 at 17:13.
Pushed by apol into branch 'master'.

Merge branch 'Plasma/5.8'

M  +2    -13   libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp

http://commits.kde.org/discover/a906e8e074d7a8f8fb5b55ae088bd682869f29d4

diff --cc libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
index 7b116b7,a6fd7af..52e4583
--- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
@@@ -68,7 -74,21 +68,6 @@@ QVariant AppPackageKitResource::icon() 
                  break;
          }
      }
 -#else
 -    const auto icons = m_appdata.iconUrls();
 -    if (icons.isEmpty())
 -        return m_appdata.name();
 -    else {
 -        for (auto it = icons.constBegin(), itEnd = icons.constEnd(); it!=itEnd; ++it) {
 -            if (it->isLocalFile())
 -                ret.addFile(it->toLocalFile(), it.key());
 -        }
 -    }
--
 -    if (ret.isNull()) {
 -        ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
 -    }
 -#endif
      return ret;
  }
  
@@@ -80,7 -100,7 +79,7 @@@ QString AppPackageKitResource::license(
  
  QStringList AppPackageKitResource::mimetypes() const
  {
-     return findProvides(AppStream::Provided::KindMimetype);
 -    return findProvides(Appstream::Provides::KindMimetype);
++    return m_appdata.provided(AppStream::Provided::KindMimetype).items();
  }
  
  QStringList AppPackageKitResource::categories()
@@@ -117,7 -141,7 +116,7 @@@ bool AppPackageKitResource::isTechnical
  
  QStringList AppPackageKitResource::executables() const
  {
-     return findProvides(AppStream::Provided::KindBinary);
 -    return findProvides(Appstream::Provides::KindBinary);
++    return m_appdata.provided(AppStream::Provided::KindBinary).items();
  }
  
  void AppPackageKitResource::invokeApplication() const
@@@ -152,8 -176,11 +151,7 @@@ static QUrl screenshot(const AppStream:
  
  QUrl AppPackageKitResource::screenshotUrl()
  {
 -#ifdef NEWAPPSTREAM
 -    return screenshot(m_appdata, Appstream::Image::KindSource);
 -#else
 -    return screenshot(m_appdata, Appstream::Image::Plain);
 -#endif
 +    return screenshot(m_appdata, AppStream::Image::KindSource);
- 
  }
  
  QUrl AppPackageKitResource::thumbnailUrl()
@@@ -183,15 -219,19 +181,6 @@@ bool AppPackageKitResource::canExecute(
      return !executables().isEmpty();
  }
  
- QStringList AppPackageKitResource::findProvides(AppStream::Provided::Kind kind) const
 -QStringList AppPackageKitResource::findProvides(Appstream::Provides::Kind kind) const
--{
 -#ifdef NEWAPPSTREAM
 -    return m_appdata.provided(kind).items();
 -#else
--    QStringList ret;
-     Q_FOREACH (AppStream::Provided p, m_appdata.provided())
 -    Q_FOREACH (Appstream::Provides p, m_appdata.provides())
--        if (p.kind() == kind)
-             ret += p.items();
 -            ret += p.value();
--    return ret;
 -#endif
--}
--
  QStringList AppPackageKitResource::allPackageNames() const
  {
      return m_appdata.packageNames();
[prev in list] [next in list] [prev in thread] [next in thread]