update version strings.

Author: treefrogframework

configure.bat

@@ -1,7 +1,7 @@
 @echo off
 @setlocal
 
-set VERSION=2.11.3
+set VERSION=2.12.0
 set TFDIR=C:\TreeFrog\%VERSION%
 set MONBOC_VERSION=2.1.0
 set LZ4_VERSION=1.10.0

installer/create_installer.bat

@@ -7,7 +7,7 @@
 :: 10行目、28行目、39行目を編集
 
 
-set VERSION=2.11.3
+set VERSION=2.12.0
 set QTBASE=C:\Qt
 set TFDIR=C:\TreeFrog\%VERSION%
 

installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp

@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
 // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
 // 既定値にすることができます:
 
-[assembly:AssemblyVersionAttribute("2.11.3")];
+[assembly:AssemblyVersionAttribute("2.12.0")];
 
 [assembly:ComVisible(false)];
 

src/tactioncontroller.cpp

@@ -225,9 +225,7 @@ const QStringList &TActionController::availableControllers()
         QStringList controllers;
         for (auto it = Tf::objectFactories()->cbegin(); it != Tf::objectFactories()->cend(); ++it) {
             if (it.key().endsWith("controller")) {
-            //if (it->first.endsWith("controller")) {
                 controllers << QString::fromLatin1(it.key());
-                //controllers << QString::fromLatin1(it->first);
             }
         }
         std::sort(controllers.begin(), controllers.end());

src/tcachesqlitestore.cpp

@@ -67,7 +67,6 @@ bool TCacheSQLiteStore::createTable(const QString &table)
     bool ret = queryNonTrx(db->sqlDatabase(), QStringLiteral("CREATE TABLE IF NOT EXISTS %1 (%2 TEXT PRIMARY KEY, %3 INTEGER, %4 BLOB)").arg(table, KEY_COLUMN, TIMESTAMP_COLUMN, BLOB_COLUMN));
     queryNonTrx(db->sqlDatabase(), QStringLiteral("VACUUM"));
 
-    //TSqlDatabasePool::instance()->pool(db);
     return ret;
 }
 

src/tglobal.h

@@ -1,7 +1,7 @@
 #pragma once
-constexpr auto TF_VERSION_STR = "2.11.3";
-constexpr auto TF_VERSION_NUMBER = 0x020b03;
-constexpr auto TF_SRC_REVISION = 3082;
+constexpr auto TF_VERSION_STR = "2.12.0";
+constexpr auto TF_VERSION_NUMBER = 0x020c00;
+constexpr auto TF_SRC_REVISION = 3133;
 
 #include <QMetaType>
 #include <QIODevice>

src/thttprequest.h

@@ -20,6 +20,8 @@ class T_CORE_EXPORT THttpRequestData {
 public:
     THttpRequestData() = default;
     ~THttpRequestData() = default;
+    THttpRequestData(const THttpRequestData &) = delete;
+    THttpRequestData &operator=(const THttpRequestData &) = delete;
     THttpRequestData(THttpRequestData &&) = default;
     THttpRequestData &operator=(THttpRequestData &&) = default;
 
@@ -30,8 +32,6 @@ class T_CORE_EXPORT THttpRequestData {
     std::unique_ptr<TMultipartFormData> multipartFormData;
     std::unique_ptr<QJsonDocument> jsonData;
     QHostAddress clientAddress;
-
-    T_DISABLE_COPY(THttpRequestData)
 };
 
 
@@ -40,11 +40,11 @@ class T_CORE_EXPORT THttpRequest {
     THttpRequest();
     THttpRequest(const THttpRequestHeader &header, const QByteArray &body, const QHostAddress &clientAddress, TActionContext *context);
     THttpRequest(const QByteArray &header, const QString &filePath, const QHostAddress &clientAddress, TActionContext *context);
+    virtual ~THttpRequest() = default;
     THttpRequest(const THttpRequest &) = delete;
     THttpRequest &operator=(const THttpRequest &) = delete;
     THttpRequest(THttpRequest &&) = default;
     THttpRequest &operator=(THttpRequest &&) = default;
-    virtual ~THttpRequest() = default;
 
     const THttpRequestHeader &header() const { return d->header; }
     Tf::HttpMethod method() const;

src/tsqlobject.h

@@ -41,8 +41,4 @@ class T_CORE_EXPORT TSqlObject : public TModelObject, public QSqlRecord {
     TSqlDatabase &getDatabase();
 
     QSqlError sqlError;
-
-private:
-    //QSqlDatabase _database;
-    //TSqlDatabase _database;  これに変えたい
 };

src/tsqlquery.h

@@ -36,7 +36,6 @@ class T_CORE_EXPORT TSqlQuery : public QSqlQuery {
     static QString formatValue(const QVariant &val, const QSqlDatabase &database) { return formatValue(val, database.driver()); }
 
 private:
-    //QString _connectionName;
     int _databaseId {0};
     QVariantList _boundValues;  // For prepared query
 };

tfbase.pri

@@ -1,4 +1,4 @@
 TF_VER_MAJ=2
-TF_VER_MIN=11
-TF_VER_PAT=3
+TF_VER_MIN=12
+TF_VER_PAT=0
 TF_VERSION=$${TF_VER_MAJ}.$${TF_VER_MIN}.$${TF_VER_PAT}