diff options
Diffstat (limited to 'examples/oauth/redditclient/redditmodel.cpp')
-rw-r--r-- | examples/oauth/redditclient/redditmodel.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/examples/oauth/redditclient/redditmodel.cpp b/examples/oauth/redditclient/redditmodel.cpp index 45d754f..17469fe 100644 --- a/examples/oauth/redditclient/redditmodel.cpp +++ b/examples/oauth/redditclient/redditmodel.cpp @@ -3,8 +3,12 @@ #include "redditmodel.h" -#include <QtCore> -#include <QtNetwork> +#include <QtNetwork/qnetworkreply.h> + +#include <QtCore/qjsonarray.h> +#include <QtCore/qjsondocument.h> + +using namespace Qt::StringLiterals; RedditModel::RedditModel(QObject *parent) : QAbstractTableModel(parent) {} @@ -35,9 +39,9 @@ QVariant RedditModel::data(const QModelIndex &index, int role) const if (role == Qt::DisplayRole) { const auto childrenObject = threads.at(index.row()); - Q_ASSERT(childrenObject.value("data").isObject()); - const auto dataObject = childrenObject.value("data").toObject(); - return dataObject.value("title").toString(); + Q_ASSERT(childrenObject.value("data"_L1).isObject()); + const auto dataObject = childrenObject.value("data"_L1).toObject(); + return dataObject.value("title"_L1).toString(); } return QVariant(); } @@ -52,7 +56,7 @@ void RedditModel::update() { auto reply = redditWrapper.requestHotThreads(); - connect(reply, &QNetworkReply::finished, [=]() { + connect(reply, &QNetworkReply::finished, this, [=]() { reply->deleteLater(); if (reply->error() != QNetworkReply::NoError) { emit error(reply->errorString()); @@ -62,11 +66,11 @@ void RedditModel::update() const auto document = QJsonDocument::fromJson(json); Q_ASSERT(document.isObject()); const auto rootObject = document.object(); - Q_ASSERT(rootObject.value("kind").toString() == "Listing"); - const auto dataValue = rootObject.value("data"); + Q_ASSERT(rootObject.value("kind"_L1).toString() == "Listing"_L1); + const auto dataValue = rootObject.value("data"_L1); Q_ASSERT(dataValue.isObject()); const auto dataObject = dataValue.toObject(); - const auto childrenValue = dataObject.value("children"); + const auto childrenValue = dataObject.value("children"_L1); Q_ASSERT(childrenValue.isArray()); const auto childrenArray = childrenValue.toArray(); |