Update treefrog to version 1.21.0 (#3635)

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

@@ -5,10 +5,6 @@ ApplicationController::ApplicationController()
     : TActionController()
 { }
 
-ApplicationController::ApplicationController(const ApplicationController &)
-    : TActionController()
-{ }
-
 ApplicationController::~ApplicationController()
 { }
 
@@ -21,4 +17,4 @@ bool ApplicationController::preFilter()
 }
 
 // Don't remove below this line
-T_REGISTER_CONTROLLER(applicationcontroller)
+T_DEFINE_CONTROLLER(ApplicationController)

frameworks/C++/treefrog/controllers/applicationcontroller.h

@@ -12,7 +12,6 @@ class T_CONTROLLER_EXPORT ApplicationController : public TActionController
     Q_OBJECT
 public:
     ApplicationController();
-    ApplicationController(const ApplicationController &other);
     virtual ~ApplicationController();
 
 public slots:
@@ -22,6 +21,4 @@ protected:
     virtual bool preFilter();
 };
 
-T_DECLARE_CONTROLLER(ApplicationController, applicationcontroller)
-
 #endif // APPLICATIONCONTROLLER_H

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

@@ -12,9 +12,6 @@ static bool caseSensitiveMngFortuneLessThan(const MngFortune &f1, const MngFortu
     return f1.message() < f2.message();
 }
 
-FortuneController::FortuneController(const FortuneController &)
-    : ApplicationController()
-{ }
 
 void FortuneController::index()
 {
@@ -132,6 +129,5 @@ void FortuneController::remove(const QString &pk)
     redirect(urla("index"));
 }
 
-
 // Don't remove below this line
-T_REGISTER_CONTROLLER(fortunecontroller)
+T_DEFINE_CONTROLLER(FortuneController)

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

@@ -9,7 +9,6 @@ class T_CONTROLLER_EXPORT FortuneController : public ApplicationController
     Q_OBJECT
 public:
     FortuneController() { }
-    FortuneController(const FortuneController &other);
     bool sessionEnabled() const { return false; }
     bool transactionEnabled() const { return false; }
 
@@ -28,6 +27,4 @@ private:
     void renderEdit(const QVariantMap &fortune = QVariantMap());
 };
 
-T_DECLARE_CONTROLLER(FortuneController, fortunecontroller)
-
 #endif // FORTUNECONTROLLER_H

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

@@ -1,8 +1,5 @@
 #include "jsoncontroller.h"
 
-JsonController::JsonController(const JsonController &)
-    : ApplicationController()
-{ }
 
 void JsonController::index()
 {
@@ -17,4 +14,4 @@ void JsonController::json()
 }
 
 // Don't remove below this line
-T_REGISTER_CONTROLLER(jsoncontroller)
+T_DEFINE_CONTROLLER(JsonController)

frameworks/C++/treefrog/controllers/jsoncontroller.h

@@ -9,7 +9,6 @@ class T_CONTROLLER_EXPORT JsonController : public ApplicationController
     Q_OBJECT
 public:
     JsonController() { }
-    JsonController(const JsonController &other);
     bool sessionEnabled() const { return false; }
     bool transactionEnabled() const { return false; }
 
@@ -18,6 +17,4 @@ public slots:
     void json();
 };
 
-T_DECLARE_CONTROLLER(JsonController, jsoncontroller)
-
 #endif // JSONCONTROLLER_H

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

@@ -3,10 +3,6 @@
 #include "mngworld.h"
 
 
-WorldController::WorldController(const WorldController &)
-    : ApplicationController()
-{ }
-
 void WorldController::index()
 {
     QList<World> worldList = World::getAll();
@@ -207,4 +203,4 @@ void WorldController::mupdates(const QString &num)
 }
 
 // Don't remove below this line
-T_REGISTER_CONTROLLER(worldcontroller)
+T_DEFINE_CONTROLLER(WorldController)

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

@@ -9,7 +9,6 @@ class T_CONTROLLER_EXPORT WorldController : public ApplicationController
     Q_OBJECT
 public:
     WorldController() { }
-    WorldController(const WorldController &other);
     bool sessionEnabled() const { return false; }
     bool transactionEnabled() const { return false; }
 
@@ -40,6 +39,4 @@ private:
     void renderEdit(const QVariantMap &world = QVariantMap());
 };
 
-T_DECLARE_CONTROLLER(WorldController, worldcontroller)
-
 #endif // WORLDCONTROLLER_H

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.19.0
+ENV TFVER=1.21.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.19.0
+ENV TFVER=1.21.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.19.0
+ENV TFVER=1.21.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.19.0
+ENV TFVER=1.21.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 \