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

List:       kde-commits
Subject:    [discover] /: Merge branch 'Plasma/5.6'
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2016-05-04 14:41:59
Message-ID: E1axxzz-00020S-53 () scm ! kde ! org
[Download RAW message or body]

Git commit 48e0656167d4e2c1d6d460e4698294cfa527ee59 by Aleix Pol.
Committed on 04/05/2016 at 14:38.
Pushed by apol into branch 'master'.

Merge branch 'Plasma/5.6'

M  +1    -2    libdiscover/Category/Category.cpp
M  +3    -5    libdiscover/ReviewsBackend/Rating.cpp
M  +1    -1    libdiscover/ReviewsBackend/Rating.h
M  +1    -1    libdiscover/ReviewsBackend/ReviewsModel.cpp
M  +1    -3    libdiscover/UpdateModel/UpdateModel.cpp
M  +2    -3    libdiscover/backends/KNSBackend/KNSBackend.cpp
M  +2    -2    libdiscover/backends/KNSBackend/KNSBackend.h
M  +1    -3    libdiscover/backends/KNSBackend/KNSResource.cpp
M  +2    -2    libdiscover/backends/KNSBackend/KNSReviews.cpp
M  +1    -1    libdiscover/declarative/DiscoverDeclarativePlugin.cpp
M  +1    -3    notifier/DiscoverNotifier.cpp

http://commits.kde.org/discover/48e0656167d4e2c1d6d460e4698294cfa527ee59

diff --cc libdiscover/ReviewsBackend/Rating.cpp
index 83934e7,1e08d20..1292cb9
--- a/libdiscover/ReviewsBackend/Rating.cpp
+++ b/libdiscover/ReviewsBackend/Rating.cpp
@@@ -97,14 -97,21 +97,14 @@@ double dampenedRating(const QVector<int
  }
  =

  Rating::Rating(const QVariantMap &data)
 -    : QObject()
 -{
 -    init(data.value(QStringLiteral("package_name")).toString(),
 -         data.value(QStringLiteral("ratings_total")).toULongLong(), data.=
value(QStringLiteral("ratings_average")).toDouble() * 2, data.value(QString=
Literal("histogram")).toString());
 -}
 -
 -Rating::Rating(const QString& packageName, quint64 ratingCount, int ratin=
g, const QString& histogram)
 -    : QObject()
 +    : Rating(data.value(QStringLiteral("package_name")).toString(),
 +         data.value(QStringLiteral("ratings_total")).toULongLong(), data.=
value(QStringLiteral("ratings_average")).toDouble() * 2, data.value(QString=
Literal("histogram")).toString())
  {
 -    init(packageName, ratingCount, rating, histogram);
  }
  =

- Rating::Rating(const QString& packageName, int inst, int /*vote*/, int /*=
old*/, int /*recent*/)
+ Rating::Rating(QString packageName, int inst, int /*vote*/, int /*old*/, =
int /*recent*/)
      : QObject()
-     , m_packageName(packageName)
+     , m_packageName(std::move(packageName))
      , m_ratingCount(inst)
      , m_rating(0)
      , m_ratingPoints(0)

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