fix compilation errors for msvc.

Author: treefrogframework

CHANGELOG.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+## 2.0.2
+ - Updated the scaffold generator to generate WebAPI codes.
+ - Modified the scaffold generator to generate service classes for the model
+   layer.
+
 ## 2.0.1
  - Support for Qt version 6.
  - Modified not to use obsolete functions of Qt.

defaults/appbase.pri

@@ -4,7 +4,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
 } else {
   CONFIG += c++17
   QT += core5compat
-  windows:QMAKE_CXXFLAGS += /std:c++17
+  windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
 }
 
 windows {

installer/create_installer.bat

@@ -7,7 +7,7 @@
 :: 10行目、21行目、22行目を編集
 
 
-set VERSION=2.0.1
+set VERSION=2.0.2
 set QTBASE=C:\Qt
 set TFDIR=C:\TreeFrog\%VERSION%
 
@@ -25,7 +25,7 @@ set LIB=
 set PATH=C:\WINDOWS\system32;C:\WINDOWS
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-call :build_msi "%QTBASE%\6.1.0\msvc2019_64\bin\qtenv2.bat"      6.1
+call :build_msi "%QTBASE%\6.2.0\msvc2019_64\bin\qtenv2.bat"      6.2
 
 :: Clear environment variables
 set VCToolsVersion=
@@ -36,7 +36,7 @@ set LIB=
 set PATH=C:\WINDOWS\system32;C:\WINDOWS
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-call :build_msi "%QTBASE%\6.0.4\msvc2019_64\bin\qtenv2.bat"      6.0
+call :build_msi "%QTBASE%\6.1.1\msvc2019_64\bin\qtenv2.bat"      6.1
 
 call :build_setup treefrog-%VERSION%-msvc_64-setup.exe
 

installer/msi/TreeFrog.wxs

@@ -5,11 +5,11 @@
   <!-- *** 基本的に 9行目,10行目,42行目,54行目も修正する (guidgen使用) *** -->
 
   <!-- プロダクト情報 -->
-  <Product Name='TreeFrog Framework 2.0.1'
-           Id="43A746F5-087B-412E-BCAF-35E9C9640F56"
-           UpgradeCode="A8AEF838-23A0-4A07-A7CD-BCA05C1BE09A"
+  <Product Name='TreeFrog Framework 2.0.2'
+           Id="B8DEB6FC-1076-46F4-86B8-4B5DDF4955AE"
+           UpgradeCode="3DEA47C6-8228-479B-996A-951FC4E14CF7"
            Language='1041' Codepage='932'
-           Version='2.0.1' Manufacturer='TreeFrog Framework Project'>
+           Version='2.0.2' Manufacturer='TreeFrog Framework Project'>
 
     <!-- パッケージ情報 -->
     <Package Id='*' Keywords='Installer'
@@ -27,21 +27,21 @@
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='WINDOWSVOLUME'>
         <Directory Id='INSTALLDIR' Name='TreeFrog'>
-          <Directory Id='VERSIONDIR' Name='2.0.1'>
+          <Directory Id='VERSIONDIR' Name='2.0.2'>
           </Directory>
         </Directory>
       </Directory>
       <Directory Id="DesktopFolder"  SourceName="Desktop"/>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.0.1"/>
+        <Directory Id="ApplicationProgramsFolder" Name="TreeFrog Framework 2.0.2"/>
       </Directory>
     </Directory>
 
     <!-- デスクトップショートカット -->
     <DirectoryRef Id="DesktopFolder">
-      <Component Id="DesktopShortcut" Guid="59AFEA0F-365F-4DF5-B50E-F2379B3FA511">
+      <Component Id="DesktopShortcut" Guid="BA682D1B-678F-4E53-AF4C-71792F90AC07">
         <Shortcut Id="PromptDesktopShortcut"
-                  Name="TreeFrog Prompt 2.0.1"
+                  Name="TreeFrog Prompt 2.0.2"
                   Description="TreeFrog Framework Prompt"
                   Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
                   WorkingDirectory="PersonalFolder"/>
@@ -51,12 +51,12 @@
 
     <!-- プログラムメニューショートカット -->
     <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="ApplicationShortcut" Guid="28FCB4B4-C71B-4E06-BF03-CE6F964039A4">
+      <Component Id="ApplicationShortcut" Guid="39D13752-A674-45EF-9107-46256C332A96">
         <CreateFolder Directory="ApplicationProgramsFolder"/>
 
         <!-- Shortcut to TF prompt-->
         <Shortcut Id="PromptProgramMenuShortcut"
-                  Name="TreeFrog Prompt 2.0.1"
+                  Name="TreeFrog Prompt 2.0.2"
                   Description="TreeFrog Framework Prompt"
                   Target="[SystemFolder]cmd.exe" Arguments="/K [VERSIONDIR]bin\\tfenv.bat"
                   WorkingDirectory="PersonalFolder"/>

installer/treefrog-setup/treefrog-setup/MainForm.h

@@ -47,8 +47,8 @@ namespace treefrogsetup {
         //
         // バージョン
         //
-        static initonly String^ VERSION_STR600 = L"6.0";
-        static initonly String^ VERSION_STR601 = L"6.1";
+        static initonly String^ VERSION_STR6_NEW  = L"6.2";
+        static initonly String^ VERSION_STR6_PREV = L"6.1";
 
     public:
         MainForm(void)
@@ -169,7 +169,7 @@ namespace treefrogsetup {
             this->label->Name = L"label";
             this->label->Size = System::Drawing::Size(309, 15);
             this->label->TabIndex = 4;
-            this->label->Text = L"Specify a base folder of Qt version " + VERSION_STR601 + " or " + VERSION_STR600 + ".";
+            this->label->Text = L"Specify a base folder of Qt version " + VERSION_STR6_NEW + " or " + VERSION_STR6_PREV + ".";
             // 
             // label1
             // 
@@ -180,7 +180,7 @@ namespace treefrogsetup {
             this->label1->Name = L"label1";
             this->label1->Size = System::Drawing::Size(162, 15);
             this->label1->TabIndex = 5;
-            this->label1->Text = L"Example:  C:\\Qt\\" + VERSION_STR601 + ".0\\msvc2019_64";
+            this->label1->Text = L"Example:  C:\\Qt\\" + VERSION_STR6_NEW + ".0\\msvc2019_64";
             // 
             // labeltop
             // 
@@ -389,12 +389,12 @@ namespace treefrogsetup {
 
             // Get msi file from resource
             int rcid = 0;
-            if (version->IndexOf("Qt version " + VERSION_STR601, StringComparison::OrdinalIgnoreCase) > 0) {
+            if (version->IndexOf("Qt version " + VERSION_STR6_NEW, StringComparison::OrdinalIgnoreCase) > 0) {
+                rcid = IDR_TREEFROG_QT602_MSI;
+            } else if (version->IndexOf("Qt version " + VERSION_STR6_PREV, StringComparison::OrdinalIgnoreCase) > 0) {
                 rcid = IDR_TREEFROG_QT601_MSI;
-            } else if (version->IndexOf("Qt version " + VERSION_STR600, StringComparison::OrdinalIgnoreCase) > 0) {
-                rcid = IDR_TREEFROG_QT600_MSI;
             } else {
-                abort("Not found Qt version " + VERSION_STR601 + " or " + VERSION_STR600 + ".", "Abort");
+                abort("Not found Qt version " + VERSION_STR6_NEW + " or " + VERSION_STR6_PREV + ".", "Abort");
                 return;
             }
 

installer/treefrog-setup/treefrog-setup/resource.h

@@ -6,9 +6,6 @@
 #define IDC_BROWSE1		                        1003
 #define IDS_APP_TITLE                           1004
 
-#define IDR_TREEFROG_QT514_MSI                  10514
-#define IDR_TREEFROG_QT515_MSI                  10515
-#define IDR_TREEFROG_QT600_MSI                  10600
 #define IDR_TREEFROG_QT601_MSI                  10601
 #define IDR_TREEFROG_QT602_MSI                  10602
 #define IDR_TREEFROG_QT603_MSI                  10603

src/corelib.pro

@@ -9,7 +9,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
 } else {
   CONFIG += c++17
   QT += core5compat
-  windows:QMAKE_CXXFLAGS += /std:c++17
+  windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
 }
 
 DEFINES *= QT_USE_QSTRINGBUILDER

src/tglobal.h

@@ -1,7 +1,7 @@
 #pragma once
 constexpr auto TF_VERSION_STR = "2.0.2";
 constexpr auto TF_VERSION_NUMBER = 0x020002;
-constexpr auto TF_SRC_REVISION = 2384;
+constexpr auto TF_SRC_REVISION = 2392;
 
 #include <QMetaType>
 #include <QIODevice>

tools/tfmanager/tfmanager.pro

@@ -11,7 +11,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
 } else {
   CONFIG += c++17
   QT += core5compat
-  windows:QMAKE_CXXFLAGS += /std:c++17
+  windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
 }
 
 DEFINES *= QT_USE_QSTRINGBUILDER

tools/tfserver/tfserver.pro

@@ -11,7 +11,7 @@ lessThan(QT_MAJOR_VERSION, 6) {
 } else {
   CONFIG += c++17
   QT += core5compat
-  windows:QMAKE_CXXFLAGS += /std:c++17
+  windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++17
 }
 
 DEFINES *= QT_USE_QSTRINGBUILDER