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

List:       kde-commits
Subject:    [bodega-client/terietor/ratings] /: don't segfault
From:       Giorgos Tsiapaliokas <terietor () gmail ! com>
Date:       2013-08-01 20:45:45
Message-ID: E1V4zkn-0007pG-IH () scm ! kde ! org
[Download RAW message or body]

Git commit 10eca294706aa1bf9ab67ce77aefe4f8bcfd776e by Giorgos Tsiapaliokas.
Committed on 01/08/2013 at 20:44.
Pushed by tsiapaliwkas into branch 'terietor/ratings'.

don't segfault

M  +2    -2    activeclient/package/contents/ui/settings/ParticipantRatings=
.qml
M  +2    -0    lib/bodega/participantratingsjobmodel.cpp

http://commits.kde.org/bodega-client/10eca294706aa1bf9ab67ce77aefe4f8bcfd77=
6e

diff --git a/activeclient/package/contents/ui/settings/ParticipantRatings.q=
ml b/activeclient/package/contents/ui/settings/ParticipantRatings.qml
index ed45e19..59cb8c4 100644
--- a/activeclient/package/contents/ui/settings/ParticipantRatings.qml
+++ b/activeclient/package/contents/ui/settings/ParticipantRatings.qml
@@ -55,14 +55,14 @@ PlasmaComponents.Page {
                 Column {
                     spacing: 0
                     PlasmaComponents.Label {
-                        text: model.AssetId//model.AssetName
+                        text: model.AssetName
                         wrapMode: Text.Wrap
                         width: root.width
                         visible: text.length > 0
                     }
 =

                     PlasmaComponents.Label {
-                        text: model.AttributeId//model.AttributeName
+                        text: model.AttributeName
                         wrapMode: Text.Wrap
                         width: root.width
                         visible: text.length > 0
diff --git a/lib/bodega/participantratingsjobmodel.cpp b/lib/bodega/partici=
pantratingsjobmodel.cpp
index 47f3e9a..4a5abe4 100644
--- a/lib/bodega/participantratingsjobmodel.cpp
+++ b/lib/bodega/participantratingsjobmodel.cpp
@@ -139,6 +139,7 @@ QString ParticipantRatingsJobModel::Private::findAssetN=
ame(const QString &assetI
             return asset.name;
         }
     }
+    return QString();
 }
 =

 QString ParticipantRatingsJobModel::Private::findAttributeName(const QStri=
ng &attributeId) const
@@ -148,6 +149,7 @@ QString ParticipantRatingsJobModel::Private::findAttrib=
uteName(const QString &at
             return attribute.name;
         }
     }
+    return QString();
 }
 =

 ParticipantRatingsJobModel::ParticipantRatingsJobModel(QObject *parent)
[prev in list] [next in list] [prev in thread] [next in thread]