cutelyst: Simplify JSON objects creation (#3101)

frameworks/C++/cutelyst/src/databaseupdatestest.cpp

@@ -4,7 +4,6 @@
 
 #include <QSqlQuery>
 
-#include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -54,7 +53,7 @@ void DatabaseUpdatesTest::processQuery(Context *c, QSqlQuery &query, QSqlQuery &
         int id = (qrand() % 10000) + 1;
 
         query.bindValue(QStringLiteral(":id"), id);
-        if (!query.exec() || !query.next()) {
+        if (Q_UNLIKELY(!query.exec() || !query.next())) {
             c->res()->setStatus(Response::InternalServerError);
             return;
         }
@@ -63,15 +62,15 @@ void DatabaseUpdatesTest::processQuery(Context *c, QSqlQuery &query, QSqlQuery &
         ids.append(id);
         randomNumbers.append(randomNumber);
 
-        QJsonObject obj;
-        obj.insert(QStringLiteral("id"), id);
-        obj.insert(QStringLiteral("randomNumber"), randomNumber);
-        array.append(obj);
+        array.append(QJsonObject{
+                         {QStringLiteral("id"), id},
+                         {QStringLiteral("randomNumber"), randomNumber}
+                     });
     }
 
     updateQuery.bindValue(QStringLiteral(":id"), ids);
     updateQuery.bindValue(QStringLiteral(":randomNumber"), randomNumbers);
-    if (!updateQuery.execBatch()) {
+    if (Q_UNLIKELY(!updateQuery.execBatch())) {
         c->res()->setStatus(Response::InternalServerError);
         return;
     }

frameworks/C++/cutelyst/src/fortunetest.cpp

@@ -4,8 +4,6 @@
 
 #include <QSqlQuery>
 
-#include <QThread>
-
 FortuneTest::FortuneTest(QObject *parent) : Controller(parent)
 {
 
@@ -33,7 +31,7 @@ FortuneList FortuneTest::processQuery(Context *c, QSqlQuery &query)
 {
     FortuneList fortunes;
 
-    if (!query.exec()) {
+    if (Q_UNLIKELY(!query.exec())) {
         c->res()->setStatus(Response::InternalServerError);
         return fortunes;
     }

frameworks/C++/cutelyst/src/jsontest.cpp

@@ -10,8 +10,7 @@ JsonTest::JsonTest(QObject *parent) : Controller(parent)
 
 void JsonTest::json(Context *c)
 {
-    QJsonObject obj;
-    obj.insert(QStringLiteral("message"), QStringLiteral("Hello, World!"));
-
-    c->response()->setJsonBody(QJsonDocument(obj));
+    c->response()->setJsonBody(QJsonDocument({
+                                                 {QStringLiteral("message"), QStringLiteral("Hello, World!")}
+                                             }));
 }

frameworks/C++/cutelyst/src/multipledatabasequeriestest.cpp

@@ -4,7 +4,6 @@
 
 #include <QSqlQuery>
 
-#include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -45,15 +44,15 @@ void MultipleDatabaseQueriesTest::processQuery(Context *c, QSqlQuery &query)
         int id = (qrand() % 10000) + 1;
 
         query.bindValue(QStringLiteral(":id"), id);
-        if (!query.exec() || !query.next()) {
+        if (Q_UNLIKELY(!query.exec() || !query.next())) {
             c->res()->setStatus(Response::InternalServerError);
             return;
         }
 
-        QJsonObject obj;
-        obj.insert(QStringLiteral("id"), query.value(0).toInt());
-        obj.insert(QStringLiteral("randomNumber"), query.value(1).toInt());
-        array.append(obj);
+        array.append(QJsonObject{
+                         {QStringLiteral("id"), query.value(0).toInt()},
+                         {QStringLiteral("randomNumber"), query.value(1).toInt()}
+                     });
     }
 
     c->response()->setJsonBody(QJsonDocument(array));

frameworks/C++/cutelyst/src/singledatabasequerytest.cpp

@@ -2,11 +2,10 @@
 
 #include <Cutelyst/Plugins/Utils/Sql>
 
-#include <QtSql/QSqlQuery>
+#include <QSqlQuery>
 
-#include <QtCore/QThread>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
+#include <QJsonDocument>
+#include <QJsonObject>
 
 SingleDatabaseQueryTest::SingleDatabaseQueryTest(QObject *parent) : Controller(parent)
 {
@@ -34,14 +33,13 @@ void SingleDatabaseQueryTest::processQuery(Context *c, QSqlQuery &query)
     int id = (qrand() % 10000) + 1;
 
     query.bindValue(QStringLiteral(":id"), id);
-    if (!query.exec() || !query.next()) {
+    if (Q_UNLIKELY(!query.exec() || !query.next())) {
         c->res()->setStatus(Response::InternalServerError);
         return;
     }
 
-    QJsonObject obj;
-    obj.insert(QStringLiteral("id"), query.value(0).toInt());
-    obj.insert(QStringLiteral("randomNumber"), query.value(1).toInt());
-
-    c->response()->setJsonBody(QJsonDocument(obj));
+    c->response()->setJsonBody(QJsonDocument({
+                                                 {QStringLiteral("id"), query.value(0).toInt()},
+                                                 {QStringLiteral("randomNumber"), query.value(1).toInt()}
+                                             }));
 }