Update treefrog to version 1.24.0 (#4715)

* Update treefrog to version 1.24.0

* brushed up code

* brushed up code

frameworks/C++/treefrog/controllers/fortunecontroller.cpp

@@ -17,7 +17,7 @@ void FortuneController::index()
 {
     QList<Fortune> fortuneList = Fortune::getAll();
     Fortune fortune;
-    fortune.setMessage(QLatin1String("Additional fortune added at request time."));
+    fortune.setMessage(QStringLiteral("Additional fortune added at request time."));
     fortuneList << fortune;
     // Sort
     qSort(fortuneList.begin(), fortuneList.end(), caseSensitiveLessThan);
@@ -29,7 +29,7 @@ void FortuneController::mindex()
 {
     QList<MngFortune> fortuneList = MngFortune::getAll();
     MngFortune fortune;
-    fortune.setMessage(QLatin1String("Additional fortune added at request time."));
+    fortune.setMessage(QStringLiteral("Additional fortune added at request time."));
     fortuneList << fortune;
     // Sort
     qSort(fortuneList.begin(), fortuneList.end(), caseSensitiveMngFortuneLessThan);

frameworks/C++/treefrog/controllers/worldcontroller.cpp

@@ -12,8 +12,8 @@ void WorldController::index()
 
 void WorldController::plain()
 {
-    setContentType("text/plain");
-    renderText(QLatin1String("Hello, World!"));
+    setContentType(QByteArrayLiteral("text/plain"));
+    renderText(QStringLiteral("Hello, World!"));
 }
 
 void WorldController::show(const QString &pk)
@@ -34,7 +34,7 @@ void WorldController::queries(const QString &num)
     int d = qMin(qMax(num.toInt(), 1), 500);
 
     for (int i = 0; i < d; ++i) {
-        int id = Tf::random(9999) + 1;
+        int id = Tf::random(1, 10000);
         worlds << World::get(id).toVariantMap();
     }
     renderJson(worlds);
@@ -42,7 +42,7 @@ void WorldController::queries(const QString &num)
 
 void WorldController::random()
 {
-    int id = Tf::random(9999) + 1;
+    int id = Tf::random(1, 10000);
     World world = World::get(id);
     renderJson(world.toVariantMap());
 }
@@ -133,9 +133,9 @@ void WorldController::updates(const QString &num)
     World world;
 
     for (int i = 0; i < d; ++i) {
-        int id = Tf::random(9999) + 1;
+        int id = Tf::random(1, 10000);
         world = World::get(id);
-        world.setRandomNumber( Tf::random(9999) + 1 );
+        world.setRandomNumber( Tf::random(1, 10000) );
         world.update();
         worlds << world.toVariantMap();
     }
@@ -169,7 +169,7 @@ void WorldController::mqueries(const QString &num)
     int d = qMin(qMax(num.toInt(), 1), 500);
 
     for (int i = 0; i < d; ++i) {
-        QString id = QString::number(Tf::random(9999) + 1);
+        QString id = QString::number(Tf::random(1, 10000));
         worlds << MngWorld::get(id).toVariantMap();
     }
     renderJson(worlds);
@@ -177,8 +177,8 @@ void WorldController::mqueries(const QString &num)
 
 void WorldController::mrandom()
 {
-    int id = Tf::random(9999) + 1;
-    World world = World::get(id);
+    QString id = QString::number(Tf::random(1, 10000));
+    auto world = MngWorld::get(id);
     renderJson(world.toVariantMap());
 }
 
@@ -194,9 +194,9 @@ void WorldController::mupdates(const QString &num)
     MngWorld world;
 
     for (int i = 0; i < d; ++i) {
-        QString id = QString::number(Tf::random(9999) + 1);
+        QString id = QString::number(Tf::random(1, 10000));
         world = MngWorld::get(id);
-        world.setRandomNumber( Tf::random(9999) + 1 );
+        world.setRandomNumber( Tf::random(1, 10000) );
         world.update();
         worlds << world.toVariantMap();
     }

frameworks/C++/treefrog/models/fortune.cpp

@@ -78,7 +78,7 @@ int Fortune::count()
 QList<Fortune> Fortune::getAll()
 {
     TSqlQueryORMapper<FortuneObject> mapper;
-    mapper.prepare("SELECT * from Fortune");
+    mapper.prepare(QStringLiteral("SELECT * from Fortune"));
 
     QList<Fortune> fortunes;
     if (mapper.exec()) {

frameworks/C++/treefrog/models/sqlobjects/fortuneobject.h

@@ -8,7 +8,7 @@
 class T_MODEL_EXPORT FortuneObject : public TSqlObject, public QSharedData
 {
 public:
-    uint id;
+    uint id {0};
     QString message;
 
     enum PropertyIndex {
@@ -16,9 +16,9 @@ public:
         Message,
     };
 
-    int primaryKeyIndex() const { return Id; }
-    int autoValueIndex() const { return Id; }
-    QString tableName() const { return QStringLiteral("Fortune"); }
+    int primaryKeyIndex() const override { return Id; }
+    int autoValueIndex() const override { return Id; }
+    QString tableName() const override { return QStringLiteral("fortune"); }
 
 private:    /*** Don't modify below this line ***/
     Q_OBJECT

frameworks/C++/treefrog/models/sqlobjects/worldobject.h

@@ -8,17 +8,17 @@
 class T_MODEL_EXPORT WorldObject : public TSqlObject, public QSharedData
 {
 public:
-    uint id;
-    int randomNumber;
+    uint id {0};
+    int randomNumber {0};
 
     enum PropertyIndex {
         Id = 0,
         RandomNumber,
     };
 
-    int primaryKeyIndex() const { return Id; }
-    int autoValueIndex() const { return Id; }
-    QString tableName() const { return QStringLiteral("World"); }
+    int primaryKeyIndex() const override { return Id; }
+    int autoValueIndex() const override { return Id; }
+    QString tableName() const override { return QStringLiteral("world"); }
 
 private:    /*** Don't modify below this line ***/
     Q_OBJECT

frameworks/C++/treefrog/models/world.cpp

@@ -47,7 +47,7 @@ World &World::operator=(const World &other)
 bool World::update()
 {
     TSqlQueryORMapper<WorldObject> mapper;
-    mapper.prepare("UPDATE World SET randomNumber=? WHERE id=?");
+    mapper.prepare(QStringLiteral("UPDATE World SET randomNumber=? WHERE id=?"));
     mapper.addBind(randomNumber()).addBind(id());
     return mapper.exec();
 }
@@ -75,7 +75,7 @@ World World::create(const QVariantMap &values)
 World World::get(uint id)
 {
     TSqlQueryORMapper<WorldObject> mapper;
-    mapper.prepare("SELECT * from World WHERE id=?");
+    mapper.prepare(QStringLiteral("SELECT * from World WHERE id=?"));
     mapper.addBind(id);
     return World(mapper.execFirst());
 }

frameworks/C++/treefrog/treefrog-hybrid.dockerfile

@@ -2,7 +2,7 @@ FROM buildpack-deps:xenial
 
 RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-ENV TFVER=1.21.0
+ENV TFVER=1.24.0
 
 RUN apt install -yqq g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \

frameworks/C++/treefrog/treefrog-mongodb.dockerfile

@@ -2,7 +2,7 @@ FROM buildpack-deps:xenial
 
 RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-ENV TFVER=1.21.0
+ENV TFVER=1.24.0
 
 RUN apt install -yqq g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \

frameworks/C++/treefrog/treefrog-postgres.dockerfile

@@ -2,7 +2,7 @@ FROM buildpack-deps:xenial
 
 RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-ENV TFVER=1.21.0
+ENV TFVER=1.24.0
 
 RUN apt install -yqq g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \

frameworks/C++/treefrog/treefrog.dockerfile

@@ -2,7 +2,7 @@ FROM buildpack-deps:xenial
 
 RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-ENV TFVER=1.21.0
+ENV TFVER=1.24.0
 
 RUN apt install -yqq g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \