From ce060a425ff5989ede358ae56931746036b0ebf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Thu, 3 Oct 2019 13:35:44 +0200 Subject: [PATCH] fix for Qt 5.9 --- src/colnod/entity.cpp | 104 ++++++++-------- src/colnod/requestmanager.cpp | 6 +- src/colnod/subject.cpp | 2 +- src/colnod/token.cpp | 216 +++++++++++++++++----------------- 4 files changed, 166 insertions(+), 162 deletions(-) diff --git a/src/colnod/entity.cpp b/src/colnod/entity.cpp index f90314f..96eb597 100644 --- a/src/colnod/entity.cpp +++ b/src/colnod/entity.cpp @@ -1,52 +1,52 @@ -#include -#include "entity.h" - -const QUuid &Entity::getId() const { - return id; -} - -void Entity::setId(const QUuid &id) { - Entity::id = id; -} - -const QString &Entity::getName() const { - return name; -} - -void Entity::setName(const QString &name) { - Entity::name = name; -} - -const QString &Entity::getDescription() const { - return description; -} - -void Entity::setDescription(const QString &description) { - Entity::description = description; -} - -uint64_t Entity::getLastUpdate() const { - return lastUpdate; -} - -void Entity::setLastUpdate(uint64_t lastUpdate) { - this->lastUpdate = lastUpdate; -} - -void Entity::fromJSON(const QJsonObject &json) { - id = json.value("id").toString(); - name = json.value("name").toString(); - description = json.value("description").toString(); - lastUpdate = json.value("lastUpdate").toDouble(); -} - -QJsonObject Entity::toJSON() const { - QJsonObject json; - - json.value("id") = id.toString(QUuid::WithoutBraces); - json.value("name") = name; - json.value("description") = description; - json.value("lastUpdate") = lastUpdate; - - return json; -} +#include +#include "entity.h" + +const QUuid &Entity::getId() const { + return id; +} + +void Entity::setId(const QUuid &id) { + Entity::id = id; +} + +const QString &Entity::getName() const { + return name; +} + +void Entity::setName(const QString &name) { + Entity::name = name; +} + +const QString &Entity::getDescription() const { + return description; +} + +void Entity::setDescription(const QString &description) { + Entity::description = description; +} + +uint64_t Entity::getLastUpdate() const { + return lastUpdate; +} + +void Entity::setLastUpdate(uint64_t lastUpdate) { + this->lastUpdate = lastUpdate; +} + +void Entity::fromJSON(const QJsonObject &json) { + id = json.value("id").toString(); + name = json.value("name").toString(); + description = json.value("description").toString(); + lastUpdate = json.value("lastUpdate").toDouble(); +} + +QJsonObject Entity::toJSON() const { + QJsonObject json; + + json.value("id") = id.toString(); + json.value("name") = name; + json.value("description") = description; + json.value("lastUpdate") = lastUpdate; + + return json; +} diff --git a/src/colnod/requestmanager.cpp b/src/colnod/requestmanager.cpp index d72660b..8b24aa5 100644 --- a/src/colnod/requestmanager.cpp +++ b/src/colnod/requestmanager.cpp @@ -70,12 +70,16 @@ void RequestManager::getRequest(QString endpoint) qDebug() << authHeader; request.setRawHeader("Authorization", authHeader.toLocal8Bit()); //request.setRawHeader("User-Agent", "curl/7.65.3"); + //request.setRawHeader("Accept", "*/*"); + //request.setRawHeader("Accept-Encoding", "*"); + // request.setRawHeader("Accept-Language", "*"); + QNetworkReply* reply = manager->post(request, QByteArray()); // //QEventLoop loop; //QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); - //loop.exec(); + // loop.exec(); // QObject::connect(reply, &QNetworkReply::finished, [=]() { diff --git a/src/colnod/subject.cpp b/src/colnod/subject.cpp index 22dd172..6ddff51 100644 --- a/src/colnod/subject.cpp +++ b/src/colnod/subject.cpp @@ -11,7 +11,7 @@ QString Subject::getEmail() const { void Subject::fromJSON(const QJsonObject &json) { Entity::fromJSON(json); - attributes = json["attributes"]["items"].toObject(); + //attributes = json["attributes"]["items"].toObject(); attributes = json.value("attributes").toObject().value("items").toObject(); diff --git a/src/colnod/token.cpp b/src/colnod/token.cpp index cf07779..bf306bf 100644 --- a/src/colnod/token.cpp +++ b/src/colnod/token.cpp @@ -1,108 +1,108 @@ -#include "token.h" - -#include - -void Token::fromJSON(const QJsonObject &json) { - Entity::fromJSON(json); - - tokenType = json.value("tokenType").toString(); - tokenBits = json.value("tokenBits").toInt(); - tokenData = json.value("tokenData").toString(); - validFrom = json.value("validFrom").toDouble(); - validTo = json.value("validTo").toDouble(); - timeToLive = json.value("timeToLive").toInt(); - authErrors = json["authErrors"].toInt(); - const auto &flagsArray = json["flags"].toArray(); - for(const auto &flag : flagsArray){ - flags.insert(flag.toString()); - } - subjectId = json.value("subjectId").toString(); -} - -QJsonObject Token::toJSON() const { - QJsonObject json = Entity::toJSON(); - - json.value("tokenType") = tokenType; - json.value("tokenBits") = tokenBits; - json.value("tokenData") = tokenData; - json.value("validFrom") = validFrom; - json.value("validTo") = validTo; - json.value("timeToLive") = timeToLive; - json.value("authErrors") = authErrors; - json.value("flags") = QJsonArray::fromStringList(flags.toList()); - json.value("subjectId") = subjectId.toString(QUuid::WithoutBraces); - - return json; -} - -const QString &Token::getTokenType() const { - return tokenType; -} - -void Token::setTokenType(const QString &tokenType) { - Token::tokenType = tokenType; -} - -int Token::getTokenBits() const { - return tokenBits; -} - -void Token::setTokenBits(int tokenBits) { - Token::tokenBits = tokenBits; -} - -const QString &Token::getTokenData() const { - return tokenData; -} - -void Token::setTokenData(const QString &tokenData) { - Token::tokenData = tokenData; -} - -qint64 Token::getValidFrom() const { - return validFrom; -} - -void Token::setValidFrom(qint64 validFrom) { - Token::validFrom = validFrom; -} - -qint64 Token::getValidTo() const { - return validTo; -} - -void Token::setValidTo(qint64 validTo) { - Token::validTo = validTo; -} - -int Token::getTimeToLive() const { - return timeToLive; -} - -void Token::setTimeToLive(int timeToLive) { - Token::timeToLive = timeToLive; -} - -int Token::getAuthErrors() const { - return authErrors; -} - -void Token::setAuthErrors(int authErrors) { - Token::authErrors = authErrors; -} - -const QSet &Token::getFlags() const { - return flags; -} - -void Token::setFlags(const QSet &flags) { - Token::flags = flags; -} - -const QUuid &Token::getSubjectId() const { - return subjectId; -} - -void Token::setSubjectId(const QUuid &subjectId) { - Token::subjectId = subjectId; -} +#include "token.h" + +#include + +void Token::fromJSON(const QJsonObject &json) { + Entity::fromJSON(json); + + tokenType = json.value("tokenType").toString(); + tokenBits = json.value("tokenBits").toInt(); + tokenData = json.value("tokenData").toString(); + validFrom = json.value("validFrom").toDouble(); + validTo = json.value("validTo").toDouble(); + timeToLive = json.value("timeToLive").toInt(); + authErrors = json["authErrors"].toInt(); + const auto &flagsArray = json["flags"].toArray(); + for(const auto &flag : flagsArray){ + flags.insert(flag.toString()); + } + subjectId = json.value("subjectId").toString(); +} + +QJsonObject Token::toJSON() const { + QJsonObject json = Entity::toJSON(); + + json.value("tokenType") = tokenType; + json.value("tokenBits") = tokenBits; + json.value("tokenData") = tokenData; + json.value("validFrom") = validFrom; + json.value("validTo") = validTo; + json.value("timeToLive") = timeToLive; + json.value("authErrors") = authErrors; + json.value("flags") = QJsonArray::fromStringList(flags.toList()); + json.value("subjectId") = subjectId.toString(); + + return json; +} + +const QString &Token::getTokenType() const { + return tokenType; +} + +void Token::setTokenType(const QString &tokenType) { + Token::tokenType = tokenType; +} + +int Token::getTokenBits() const { + return tokenBits; +} + +void Token::setTokenBits(int tokenBits) { + Token::tokenBits = tokenBits; +} + +const QString &Token::getTokenData() const { + return tokenData; +} + +void Token::setTokenData(const QString &tokenData) { + Token::tokenData = tokenData; +} + +qint64 Token::getValidFrom() const { + return validFrom; +} + +void Token::setValidFrom(qint64 validFrom) { + Token::validFrom = validFrom; +} + +qint64 Token::getValidTo() const { + return validTo; +} + +void Token::setValidTo(qint64 validTo) { + Token::validTo = validTo; +} + +int Token::getTimeToLive() const { + return timeToLive; +} + +void Token::setTimeToLive(int timeToLive) { + Token::timeToLive = timeToLive; +} + +int Token::getAuthErrors() const { + return authErrors; +} + +void Token::setAuthErrors(int authErrors) { + Token::authErrors = authErrors; +} + +const QSet &Token::getFlags() const { + return flags; +} + +void Token::setFlags(const QSet &flags) { + Token::flags = flags; +} + +const QUuid &Token::getSubjectId() const { + return subjectId; +} + +void Token::setSubjectId(const QUuid &subjectId) { + Token::subjectId = subjectId; +}