Move common supplier functionality into base class.

Change-Id: I7898b8b59d85c2d7392ea490ada63d4a26792f38
Reviewed-on: http://codereview.qt.nokia.com/3838
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: abcd <qt_abcd1@ovi.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

1 files changed, 2 insertions, 23 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
index a7a2856a..d833e838 100644
--- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
@@ -162,25 +162,6 @@ QDeclarativeReviewModel::~QDeclarativeReviewModel()
     qDeleteAll(m_suppliers);
 }
 
-void QDeclarativeReviewModel::clearData()
-{
-    qDeleteAll(m_suppliers);
-    m_suppliers.clear();
-    QDeclarativePlaceContentModel::clearData();
-}
-
-void QDeclarativeReviewModel::processContent(const QPlaceContent &content, int index)
-{
-    Q_UNUSED(index);
-
-    QPlaceReview review(content);
-
-    if (!m_suppliers.contains(review.supplier().supplierId())) {
-        m_suppliers.insert(review.supplier().supplierId(),
-                           new QDeclarativeSupplier(review.supplier(), this));
-    }
-}
-
 QVariant QDeclarativeReviewModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid())
@@ -208,8 +189,6 @@ QVariant QDeclarativeReviewModel::data(const QModelIndex &index, int role) const
         return review.mediaIds();
     case ReviewIdRole:
         return review.reviewId();
-    case SupplierRole:
-        return QVariant::fromValue(static_cast<QObject *>(m_suppliers.value(review.supplier().supplierId())));
     case TitleRole:
         return review.title();
     case UserIdRole:
@@ -218,9 +197,9 @@ QVariant QDeclarativeReviewModel::data(const QModelIndex &index, int role) const
         return review.userName();
     case OriginatorUrlRole:
         return review.originatorUrl();
-    default:
-        return QVariant();
     }
+
+    return QDeclarativePlaceContentModel::data(index, role);
 }
 
 QT_END_NAMESPACE