fix for Qt 5.9

src/colnod/entity.cpp

@@ -1,52 +1,52 @@
-#include <QJsonObject>
+#include <QJsonObject>
-#include "entity.h"
+#include "entity.h"
-
+
-const QUuid &Entity::getId() const {
+const QUuid &Entity::getId() const {
-    return id;
+    return id;
-}
+}
-
+
-void Entity::setId(const QUuid &id) {
+void Entity::setId(const QUuid &id) {
-    Entity::id = id;
+    Entity::id = id;
-}
+}
-
+
-const QString &Entity::getName() const {
+const QString &Entity::getName() const {
-    return name;
+    return name;
-}
+}
-
+
-void Entity::setName(const QString &name) {
+void Entity::setName(const QString &name) {
-    Entity::name = name;
+    Entity::name = name;
-}
+}
-
+
-const QString &Entity::getDescription() const {
+const QString &Entity::getDescription() const {
-    return description;
+    return description;
-}
+}
-
+
-void Entity::setDescription(const QString &description) {
+void Entity::setDescription(const QString &description) {
-    Entity::description = description;
+    Entity::description = description;
-}
+}
-
+
-uint64_t Entity::getLastUpdate() const {
+uint64_t Entity::getLastUpdate() const {
-    return lastUpdate;
+    return lastUpdate;
-}
+}
-
+
-void Entity::setLastUpdate(uint64_t lastUpdate) {
+void Entity::setLastUpdate(uint64_t lastUpdate) {
-    this->lastUpdate = lastUpdate;
+    this->lastUpdate = lastUpdate;
-}
+}
-
+
-void Entity::fromJSON(const QJsonObject &json) {
+void Entity::fromJSON(const QJsonObject &json) {
-    id = json.value("id").toString();
+    id = json.value("id").toString();
-    name = json.value("name").toString();
+    name = json.value("name").toString();
-    description = json.value("description").toString();
+    description = json.value("description").toString();
-    lastUpdate = json.value("lastUpdate").toDouble();
+    lastUpdate = json.value("lastUpdate").toDouble();
-}
+}
-
+
-QJsonObject Entity::toJSON() const {
+QJsonObject Entity::toJSON() const {
-    QJsonObject json;
+    QJsonObject json;
-
+
-    json.value("id") = id.toString(QUuid::WithoutBraces);
+    json.value("id") = id.toString();
-    json.value("name") = name;
+    json.value("name") = name;
-    json.value("description") = description;
+    json.value("description") = description;
-    json.value("lastUpdate") = lastUpdate;
+    json.value("lastUpdate") = lastUpdate;
-
+
-    return json;
+    return json;
-}
+}

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, [=]() {

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();
 

src/colnod/token.cpp

@@ -1,108 +1,108 @@
-#include "token.h"
+#include "token.h"
-
+
-#include <QJsonArray>
+#include <QJsonArray>
-
+
-void Token::fromJSON(const QJsonObject &json) {
+void Token::fromJSON(const QJsonObject &json) {
-    Entity::fromJSON(json);
+    Entity::fromJSON(json);
-
+
-    tokenType = json.value("tokenType").toString();
+    tokenType = json.value("tokenType").toString();
-    tokenBits = json.value("tokenBits").toInt();
+    tokenBits = json.value("tokenBits").toInt();
-    tokenData = json.value("tokenData").toString();
+    tokenData = json.value("tokenData").toString();
-    validFrom = json.value("validFrom").toDouble();
+    validFrom = json.value("validFrom").toDouble();
-    validTo = json.value("validTo").toDouble();
+    validTo = json.value("validTo").toDouble();
-    timeToLive = json.value("timeToLive").toInt();
+    timeToLive = json.value("timeToLive").toInt();
-    authErrors = json["authErrors"].toInt();
+    authErrors = json["authErrors"].toInt();
-    const auto &flagsArray = json["flags"].toArray();
+    const auto &flagsArray = json["flags"].toArray();
-    for(const auto &flag : flagsArray){
+    for(const auto &flag : flagsArray){
-        flags.insert(flag.toString());
+        flags.insert(flag.toString());
-    }
+    }
-    subjectId = json.value("subjectId").toString();
+    subjectId = json.value("subjectId").toString();
-}
+}
-
+
-QJsonObject Token::toJSON() const {
+QJsonObject Token::toJSON() const {
-    QJsonObject json = Entity::toJSON();
+    QJsonObject json = Entity::toJSON();
-
+
-    json.value("tokenType") = tokenType;
+    json.value("tokenType") = tokenType;
-    json.value("tokenBits") = tokenBits;
+    json.value("tokenBits") = tokenBits;
-    json.value("tokenData") = tokenData;
+    json.value("tokenData") = tokenData;
-    json.value("validFrom") = validFrom;
+    json.value("validFrom") = validFrom;
-    json.value("validTo") = validTo;
+    json.value("validTo") = validTo;
-    json.value("timeToLive") = timeToLive;
+    json.value("timeToLive") = timeToLive;
-    json.value("authErrors") = authErrors;
+    json.value("authErrors") = authErrors;
-    json.value("flags") = QJsonArray::fromStringList(flags.toList());
+    json.value("flags") = QJsonArray::fromStringList(flags.toList());
-    json.value("subjectId") = subjectId.toString(QUuid::WithoutBraces);
+    json.value("subjectId") = subjectId.toString();
-
+
-    return json;
+    return json;
-}
+}
-
+
-const QString &Token::getTokenType() const {
+const QString &Token::getTokenType() const {
-    return tokenType;
+    return tokenType;
-}
+}
-
+
-void Token::setTokenType(const QString &tokenType) {
+void Token::setTokenType(const QString &tokenType) {
-    Token::tokenType = tokenType;
+    Token::tokenType = tokenType;
-}
+}
-
+
-int Token::getTokenBits() const {
+int Token::getTokenBits() const {
-    return tokenBits;
+    return tokenBits;
-}
+}
-
+
-void Token::setTokenBits(int tokenBits) {
+void Token::setTokenBits(int tokenBits) {
-    Token::tokenBits = tokenBits;
+    Token::tokenBits = tokenBits;
-}
+}
-
+
-const QString &Token::getTokenData() const {
+const QString &Token::getTokenData() const {
-    return tokenData;
+    return tokenData;
-}
+}
-
+
-void Token::setTokenData(const QString &tokenData) {
+void Token::setTokenData(const QString &tokenData) {
-    Token::tokenData = tokenData;
+    Token::tokenData = tokenData;
-}
+}
-
+
-qint64 Token::getValidFrom() const {
+qint64 Token::getValidFrom() const {
-    return validFrom;
+    return validFrom;
-}
+}
-
+
-void Token::setValidFrom(qint64 validFrom) {
+void Token::setValidFrom(qint64 validFrom) {
-    Token::validFrom = validFrom;
+    Token::validFrom = validFrom;
-}
+}
-
+
-qint64 Token::getValidTo() const {
+qint64 Token::getValidTo() const {
-    return validTo;
+    return validTo;
-}
+}
-
+
-void Token::setValidTo(qint64 validTo) {
+void Token::setValidTo(qint64 validTo) {
-    Token::validTo = validTo;
+    Token::validTo = validTo;
-}
+}
-
+
-int Token::getTimeToLive() const {
+int Token::getTimeToLive() const {
-    return timeToLive;
+    return timeToLive;
-}
+}
-
+
-void Token::setTimeToLive(int timeToLive) {
+void Token::setTimeToLive(int timeToLive) {
-    Token::timeToLive = timeToLive;
+    Token::timeToLive = timeToLive;
-}
+}
-
+
-int Token::getAuthErrors() const {
+int Token::getAuthErrors() const {
-    return authErrors;
+    return authErrors;
-}
+}
-
+
-void Token::setAuthErrors(int authErrors) {
+void Token::setAuthErrors(int authErrors) {
-    Token::authErrors = authErrors;
+    Token::authErrors = authErrors;
-}
+}
-
+
-const QSet<QString> &Token::getFlags() const {
+const QSet<QString> &Token::getFlags() const {
-    return flags;
+    return flags;
-}
+}
-
+
-void Token::setFlags(const QSet<QString> &flags) {
+void Token::setFlags(const QSet<QString> &flags) {
-    Token::flags = flags;
+    Token::flags = flags;
-}
+}
-
+
-const QUuid &Token::getSubjectId() const {
+const QUuid &Token::getSubjectId() const {
-    return subjectId;
+    return subjectId;
-}
+}
-
+
-void Token::setSubjectId(const QUuid &subjectId) {
+void Token::setSubjectId(const QUuid &subjectId) {
-    Token::subjectId = subjectId;
+    Token::subjectId = subjectId;
-}
+}