Browse Source

Merge pull request #1805 from treefrogframework/treefrog-1.9.2

Updated TreeFrog to version 1.9.2
Mike Smith 9 years ago
parent
commit
28a759f94e

+ 0 - 35
frameworks/C++/treefrog/controllers/applicationcontroller.cpp

@@ -20,40 +20,5 @@ bool ApplicationController::preFilter()
     return true;
 }
 
-QString ApplicationController::jsonEncode(const QVariantMap &obj)
-{
-    const QString JSON_OBJ_INT("\"%1\":%2, ");
-    const QString JSON_OBJ_STR("\"%1\":\"%2\", ");
-    QString ret("{");
-
-    for (QMap<QString, QVariant>::const_iterator i = obj.begin(); i != obj.end(); ++i) {
-        switch (i.value().type()) {
-        case QVariant::UInt:
-        case QVariant::Int:
-            ret += JSON_OBJ_INT.arg(i.key()).arg(i.value().toInt());
-            break;
-        default:
-            ret += JSON_OBJ_STR.arg(i.key()).arg(i.value().toString());
-            break;
-        }
-    }
-    ret.chop(2);
-    ret += QLatin1Char('}');
-    return ret;
-}
-
-QString ApplicationController::jsonEncode(const QList<QVariantMap> &lst)
-{
-    QString ret("[");
-
-    for (QListIterator<QVariantMap> it(lst); it.hasNext(); ) {
-        ret += jsonEncode(it.next());
-        ret += QLatin1String(", ");
-    }
-    ret.chop(2);
-    ret += QLatin1Char(']');
-    return ret;
-}
-
 // Don't remove below this line
 T_REGISTER_CONTROLLER(applicationcontroller)

+ 0 - 2
frameworks/C++/treefrog/controllers/applicationcontroller.h

@@ -14,8 +14,6 @@ public:
     ApplicationController();
     ApplicationController(const ApplicationController &other);
     virtual ~ApplicationController();
-    static QString jsonEncode(const QVariantMap &obj);
-    static QString jsonEncode(const QList<QVariantMap> &list);
 
 public slots:
     void staticInitialize();

+ 1 - 1
frameworks/C++/treefrog/controllers/controllers.pro

@@ -1,6 +1,6 @@
 TARGET = controller
 TEMPLATE = lib
-CONFIG += shared x86_64
+CONFIG += shared x86_64 c++11
 QT += network sql xml
 QT -= gui
 DEFINES += TF_DLL

+ 1 - 3
frameworks/C++/treefrog/controllers/jsoncontroller.cpp

@@ -13,9 +13,7 @@ void JsonController::json()
 {
     QVariantMap obj;
     obj["message"] = "Hello, World!";
-
-    setContentType("application/json; charset=UTF-8");
-    renderText(jsonEncode(obj), false);
+    renderJson(obj);
 }
 
 // Don't remove below this line

+ 11 - 9
frameworks/C++/treefrog/controllers/worldcontroller.cpp

@@ -32,23 +32,21 @@ void WorldController::queries()
 
 void WorldController::queries(const QString &num)
 {
-    QList<QVariantMap> worlds;
+    QVariantList worlds;
     int d = qMin(qMax(num.toInt(), 1), 500);
 
     for (int i = 0; i < d; ++i) {
         int id = Tf::random(9999) + 1;
         worlds << World::get(id).toVariantMap();
     }
-    setContentType("application/json; charset=UTF-8");
-    renderText(jsonEncode(worlds), false);
+    renderJson(worlds);
 }
 
 void WorldController::random()
 {
     int id = Tf::random(9999) + 1;
     World world = World::get(id);
-    setContentType("application/json; charset=UTF-8");
-    renderText(jsonEncode(world.toVariantMap()), false);
+    renderJson(world.toVariantMap());
 }
 
 void WorldController::entry()
@@ -125,10 +123,15 @@ void WorldController::renderEdit(const QVariantMap &world)
     render("edit");
 }
 
+void WorldController::updates()
+{
+    updates("1");
+}
+
 void WorldController::updates(const QString &num)
 {
-    QList<QVariantMap> worlds;
-    int d = num.toInt();
+    QVariantList worlds;
+    int d = qMin(qMax(num.toInt(), 1), 500);
     World world;
 
     for (int i = 0; i < d; ++i) {
@@ -138,8 +141,7 @@ void WorldController::updates(const QString &num)
         world.update();
 	worlds << world.toVariantMap();
     }
-    setContentType("application/json; charset=UTF-8");
-    renderText(jsonEncode(worlds), false);
+    renderJson(worlds);
 }
 
 void WorldController::remove(const QString &pk)

+ 1 - 0
frameworks/C++/treefrog/controllers/worldcontroller.h

@@ -25,6 +25,7 @@ public slots:
     void edit(const QString &pk);
     void save(const QString &pk);
     void updates(const QString &num);
+    void updates();
     void remove(const QString &pk);
 
 private:

+ 1 - 1
frameworks/C++/treefrog/helpers/helpers.pro

@@ -1,6 +1,6 @@
 TARGET = helper
 TEMPLATE = lib
-CONFIG += shared x86_64
+CONFIG += shared x86_64 c++11
 QT  -= gui
 QT  += 
 DEFINES += TF_DLL

+ 1 - 1
frameworks/C++/treefrog/models/models.pro

@@ -1,6 +1,6 @@
 TARGET = model
 TEMPLATE = lib
-CONFIG += shared x86_64
+CONFIG += shared x86_64 c++11
 QT += sql
 QT -= gui
 DEFINES += TF_DLL

+ 1 - 1
frameworks/C++/treefrog/setup.sh

@@ -16,4 +16,4 @@ make -j8
 rm -f log/*.log
 
 # 4. Start TreeFrog
-treefrog -d $TROOT &
+treefrog -d $TROOT

+ 1 - 1
frameworks/C++/treefrog/views/_src/_src.pro

@@ -1,6 +1,6 @@
 TARGET = view
 TEMPLATE = lib
-CONFIG += shared x86_64
+CONFIG += shared x86_64 c++11
 QT += network xml
 QT -= gui
 DEFINES += TF_DLL

+ 5 - 4
toolset/setup/linux/frameworks/treefrog.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
+TFVER=treefrog-1.9.2
 RETCODE=$(fw_exists ${IROOT}/treefrog.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/treefrog.installed
   return 0; }
 
-sudo apt-get install -y qt4-qmake libqt4-dev libqt4-sql-mysql libqt4-sql-psql g++
+sudo apt-get install -y qt5-qmake qt5-default qtbase5-dev qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql g++ 
 
-fw_get -O http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.7.tar.gz
-fw_untar treefrog-1.7.7.tar.gz
-cd treefrog-1.7.7
+fw_get -O http://downloads.sourceforge.net/project/treefrog/src/$TFVER.tar.gz
+fw_untar $TFVER.tar.gz
+cd $TFVER
 # TODO: Someday we can try this... I couldn't get it working
 #./configure --prefix=$IROOT/treefrog
 ./configure