diff options
Diffstat (limited to 'src/location/declarativeplaces')
4 files changed, 47 insertions, 33 deletions
diff --git a/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp b/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp index df619742..6f7d7bd4 100644 --- a/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp @@ -153,10 +153,14 @@ void QDeclarativePlaceContentModel::initializeCollection(int totalCount, const Q continue; m_content.insert(i.key(), content); - if (!m_suppliers.contains(content.supplier().supplierId())) - m_suppliers.insert(content.supplier().supplierId(), content.supplier()); - if (!m_users.contains(content.user().userId())) - m_users.insert(content.user().userId(), content.user()); + const auto supplier = content.value(QPlaceContent::ContentSupplier) + .value<QPlaceSupplier>(); + if (!m_suppliers.contains(supplier.supplierId())) + m_suppliers.insert(supplier.supplierId(), supplier); + const auto user = content.value(QPlaceContent::ContentUser) + .value<QPlaceUser>(); + if (!m_users.contains(user.userId())) + m_users.insert(user.userId(), user); } m_contentCount = totalCount; @@ -193,11 +197,13 @@ QVariant QDeclarativePlaceContentModel::data(const QModelIndex &index, int role) switch (role) { case SupplierRole: - return QVariant::fromValue(m_suppliers.value(content.supplier().supplierId())); + return QVariant::fromValue(m_suppliers.value(content.value(QPlaceContent::ContentSupplier) + .value<QPlaceSupplier>().supplierId())); case PlaceUserRole: - return QVariant::fromValue(m_users.value(content.user().userId())); + return QVariant::fromValue(m_users.value(content.value(QPlaceContent::ContentUser) + .value<QPlaceUser>().userId())); case AttributionRole: - return content.attribution(); + return content.value(QPlaceContent::ContentAttribution); default: return QVariant(); } @@ -333,10 +339,14 @@ void QDeclarativePlaceContentModel::fetchFinished() const QPlaceContent &content = contents.value(i); m_content.insert(i, content); - if (!m_suppliers.contains(content.supplier().supplierId())) - m_suppliers.insert(content.supplier().supplierId(), content.supplier()); - if (!m_users.contains(content.user().userId())) - m_users.insert(content.user().userId(), content.user()); + const auto supplier = content.value(QPlaceContent::ContentSupplier) + .value<QPlaceSupplier>(); + if (!m_suppliers.contains(supplier.supplierId())) + m_suppliers.insert(supplier.supplierId(), supplier); + const auto user = content.value(QPlaceContent::ContentUser) + .value<QPlaceUser>(); + if (!m_users.contains(user.userId())) + m_users.insert(user.userId(), user); } endInsertRows(); startIndex = -1; @@ -356,10 +366,14 @@ void QDeclarativePlaceContentModel::fetchFinished() for (int i = startIndex; i <= currentIndex; ++i) { const QPlaceContent &content = contents.value(i); m_content.insert(i, content); - if (!m_suppliers.contains(content.supplier().supplierId())) - m_suppliers.insert(content.supplier().supplierId(), content.supplier()); - if (!m_users.contains(content.user().userId())) - m_users.insert(content.user().userId(), content.user()); + const auto supplier = content.value(QPlaceContent::ContentSupplier) + .value<QPlaceSupplier>(); + if (!m_suppliers.contains(supplier.supplierId())) + m_suppliers.insert(supplier.supplierId(), supplier); + const auto user = content.value(QPlaceContent::ContentUser) + .value<QPlaceUser>(); + if (!m_users.contains(user.userId())) + m_users.insert(user.userId(), user); } emit dataChanged(index(startIndex),index(currentIndex)); startIndex = -1; diff --git a/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp index 5e280ab5..3dffeec5 100644 --- a/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp @@ -40,7 +40,7 @@ #include "qdeclarativeplaceeditorialmodel_p.h" #include <QtCore/QUrl> -#include <QtLocation/QPlaceEditorial> +#include <QtLocation/QPlaceContent> QT_BEGIN_NAMESPACE @@ -146,15 +146,15 @@ QVariant QDeclarativePlaceEditorialModel::data(const QModelIndex &index, int rol if (index.row() >= rowCount(index.parent()) || index.row() < 0) return QVariant(); - const QPlaceEditorial &description = m_content.value(index.row()); + const QPlaceContent &content = m_content.value(index.row()); switch (role) { case TextRole: - return description.text(); + return content.value(QPlaceContent::EditorialText); case TitleRole: - return description.title(); + return content.value(QPlaceContent::EditorialTitle); case LanguageRole: - return description.language(); + return content.value(QPlaceContent::EditorialLanguage); } return QDeclarativePlaceContentModel::data(index, role); diff --git a/src/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp b/src/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp index 54698928..b32a1292 100644 --- a/src/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp +++ b/src/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp @@ -40,7 +40,7 @@ #include "qdeclarativeplaceimagemodel_p.h" #include <QtCore/QUrl> -#include <QtLocation/QPlaceImage> +#include <QtLocation/QPlaceContent> QT_BEGIN_NAMESPACE @@ -145,15 +145,15 @@ QVariant QDeclarativePlaceImageModel::data(const QModelIndex &index, int role) c if (index.row() >= rowCount(index.parent()) || index.row() < 0) return QVariant(); - const QPlaceImage &image = m_content.value(index.row()); + const QPlaceContent &image = m_content.value(index.row()); switch (role) { case UrlRole: - return image.url(); + return image.value(QPlaceContent::ImageUrl); case ImageIdRole: - return image.imageId(); + return image.value(QPlaceContent::ImageId); case MimeTypeRole: - return image.mimeType(); + return image.value(QPlaceContent::ImageMimeType); } return QDeclarativePlaceContentModel::data(index, role); diff --git a/src/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/location/declarativeplaces/qdeclarativereviewmodel.cpp index e8c597ac..2c4997ce 100644 --- a/src/location/declarativeplaces/qdeclarativereviewmodel.cpp +++ b/src/location/declarativeplaces/qdeclarativereviewmodel.cpp @@ -40,7 +40,7 @@ #include "qdeclarativereviewmodel_p.h" #include <QtCore/QDateTime> -#include <QtLocation/QPlaceReview> +#include <QtLocation/QPlaceContent> QT_BEGIN_NAMESPACE @@ -149,21 +149,21 @@ QVariant QDeclarativeReviewModel::data(const QModelIndex &index, int role) const if (index.row() >= rowCount(index.parent()) || index.row() < 0) return QVariant(); - const QPlaceReview &review = m_content.value(index.row()); + const QPlaceContent &content = m_content.value(index.row()); switch (role) { case DateTimeRole: - return review.dateTime(); + return content.value(QPlaceContent::ReviewDateTime); case TextRole: - return review.text(); + return content.value(QPlaceContent::ReviewText); case LanguageRole: - return review.language(); + return content.value(QPlaceContent::ReviewLanguage); case RatingRole: - return review.rating(); + return content.value(QPlaceContent::ReviewRating); case ReviewIdRole: - return review.reviewId(); + return content.value(QPlaceContent::ReviewId); case TitleRole: - return review.title(); + return content.value(QPlaceContent::ReviewTitle); } return QDeclarativePlaceContentModel::data(index, role); |