updated

Author: treefrogframework

.github/workflows/actions.yml

@@ -342,54 +342,3 @@ jobs:
       run: |
         cd tools\test\releasetest
         .\releasetest.bat
-
-  build-windows-qt62-msvc2019:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@main
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v4
-      with:
-        version: '6.2.2'
-        host: 'windows'
-        target: 'desktop'
-    - name: Install VisualStudio tools
-      run: |
-        choco install visualstudio2019community -y
-        choco install visualstudio2019-workload-nativedesktop -y
-        choco install sqlite -y
-    - name: Build for debug mode
-      shell: cmd
-      run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-        set CL=/MP
-        qmake -version
-        call configure.bat --enable-debug
-        cd src
-        nmake
-        nmake install
-        cd ..\tools
-        nmake
-        nmake install
-    - name: Test modules
-      shell: cmd
-      run: |
-        cd src/test
-        call testall.bat
-    - name: Build for release mode
-      shell: cmd
-      run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-        set CL=/MP
-        call configure.bat
-        cd src
-        nmake
-        nmake install
-        cd ..\tools
-        nmake
-        nmake install
-    - name: Test release
-      shell: cmd
-      run: |
-        cd tools\test\releasetest
-        .\releasetest.bat

src/test/rand/main.cpp

@@ -1,9 +1,7 @@
 #include <QTest>
 #include <QtCore>
 #include <QHostInfo>
-#if QT_VERSION >= 0x050a00
 #include <QRandomGenerator>
-#endif
 #include <tglobal.h>
 #include <stdio.h>
 #include <random>
@@ -53,10 +51,8 @@ private slots:
     void minstd_rand();
     void ranlux24_base();
     void ranlux48_base();
-#if QT_VERSION >= 0x050a00
     void rand_QRandomGenerator_global();
     void rand_QRandomGenerator_system();
-#endif
     void randomstring1();
     void randomstring2();
 
@@ -161,7 +157,7 @@ void TestRand::ranlux48_base()
     }
 }
 
-#if QT_VERSION >= 0x050a00
+
 void TestRand::rand_QRandomGenerator_global()
 {
     QBENCHMARK {
@@ -180,7 +176,7 @@ void TestRand::rand_QRandomGenerator_system()
         mutex.unlock();
     }
 }
-#endif
+
 
 void TestRand::randomstring1()
 {

tools/tfmanager/main.cpp

@@ -16,9 +16,6 @@
 #include <TWebApplication>
 #include <tfcore.h>
 #include <tprocessinfo.h>
-#if QT_VERSION < 0x060000
-# include <QTextCodec>
-#endif
 #include <cinttypes>
 
 #ifdef Q_OS_UNIX
@@ -63,36 +60,6 @@ enum CommandOption {
     ShowSettings,
 };
 
-
-#if QT_VERSION < 0x050400
-#ifdef Q_OS_WIN
-const QMap<int, QString> winVersion = {
-    {QSysInfo::WV_XP, "Windows XP"},
-    {QSysInfo::WV_2003, "Windows Server 2003"},
-    {QSysInfo::WV_VISTA, "Windows Vista or Windows Server 2008"},
-    {QSysInfo::WV_WINDOWS7, "Windows 7 or Windows Server 2008 R2"},
-    {QSysInfo::WV_WINDOWS8, "Windows 8 or Windows Server 2012"},
-#if QT_VERSION >= 0x050200
-    {QSysInfo::WV_WINDOWS8_1, "Windows 8.1 or Windows Server 2012 R2"},
-#endif
-};
-#endif
-
-#ifdef Q_OS_DARWIN
-const QMap<int, QString> macxVersion = {
-    {QSysInfo::MV_10_3, "Mac OS X 10.3 Panther"},
-    {QSysInfo::MV_10_4, "Mac OS X 10.4 Tiger"},
-    {QSysInfo::MV_10_5, "Mac OS X 10.5 Leopard"},
-    {QSysInfo::MV_10_6, "Mac OS X 10.6 Snow Leopard"},
-    {QSysInfo::MV_10_7, "Mac OS X 10.7 Lion"},
-    {QSysInfo::MV_10_8, "Mac OS X 10.8 Mountain Lion"},
-#if QT_VERSION >= 0x050100
-    {QSysInfo::MV_10_9, "Mac OS X 10.9 Mavericks"},
-#endif
-};
-#endif
-#endif
-
 const QMap<QString, int> options = {
     {"-e", EnvironmentSpecified},
     {"-s", SocketSpecified},
@@ -189,20 +156,7 @@ void writeStartupLog()
     tSystemInfo("TreeFrog Framework version {}", TF_VERSION_STR);
 
     QString qtversion = QLatin1String("Execution environment: Qt ") + qVersion();
-#if QT_VERSION >= 0x050400
     qtversion += QLatin1String(" / ") + QSysInfo::prettyProductName();
-#else
-#if defined(Q_OS_WIN)
-    qtversion += QLatin1String(" / ") + winVersion.value(QSysInfo::WindowsVersion, "Windows");
-#elif defined(Q_OS_DARWIN)
-    qtversion += QLatin1String(" / ") + macxVersion()->value(QSysInfo::MacintoshVersion, "Mac OS X");
-#elif defined(Q_OS_UNIX)
-    struct utsname uts;
-    if (uname(&uts) == 0) {
-        qtversion += QString(" / %1 %2").arg(uts.sysname).arg(uts.release);
-    }
-#endif
-#endif
     tSystemInfo("{}", (const char *)qtversion.toLatin1().data());
 }
 
@@ -467,12 +421,6 @@ int managerMain(int argc, char *argv[])
 {
     TWebApplication app(argc, argv);
 
-#if QT_VERSION < 0x060000
-    // Sets codec
-    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
-    QTextCodec::setCodecForLocale(codec);
-#endif
-
     if (!checkArguments()) {
         return 1;
     }

tools/tfserver/main.cpp

@@ -21,9 +21,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <glog/logging.h>
-#if QT_VERSION < 0x060000
-# include <QTextCodec>
-#endif
+
 
 constexpr auto DEBUG_MODE_OPTION = "--debug";
 constexpr auto SOCKET_OPTION = "-s";
@@ -229,12 +227,6 @@ int main(int argc, char *argv[])
         tSystemInfo("Application's default locale: {}", qUtf8Printable(locale.name()));
     }
 
-#if QT_VERSION < 0x060000
-    // Sets codec
-    QTextCodec *codec = webapp.codecForInternal();
-    QTextCodec::setCodecForLocale(codec);
-#endif
-
     if (!webapp.webRootExists()) {
         tSystemError("No such directory");
         std::fprintf(stderr, "No such directory\n");

tools/tmake/main.cpp

@@ -11,12 +11,8 @@
 #include <QMap>
 #include <QSettings>
 #include <QString>
-#if QT_VERSION < 0x060000
-# include <QTextCodec>
-#endif
 
 constexpr auto DEFAULT_OUTPUT_DIR = "viewcodes";
-
 extern QString devIni;
 extern int defaultTrimMode;
 
@@ -69,19 +65,6 @@ int main(int argc, char *argv[])
     QSettings appSetting(appIni, QSettings::IniFormat);
     QSettings devSetting(devIni, QSettings::IniFormat);
 
-    // Default codec
-#if QT_VERSION < 0x060000
-    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
-    QString codecName = appSetting.value("InternalEncoding").toString();
-    if (!codecName.isEmpty()) {
-        QTextCodec *c = QTextCodec::codecForName(codecName.toLatin1().constData());
-        if (c) {
-            codec = c;
-        }
-    }
-    QTextCodec::setCodecForLocale(codec);
-#endif
-
     defaultTrimMode = devSetting.value("Erb.DefaultTrimMode", "1").toInt();
     std::printf("Erb.DefaultTrimMode: %d\n", defaultTrimMode);
 

tools/tmake/test/tmaketest.cpp

@@ -60,9 +60,6 @@ void TestTfpconverter::parse()
     QFile file(fileName);
     QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream ts(&file);
-#if QT_VERSION < 0x060000
-    ts.setCodec("UTF-8");
-#endif
     QString html = ts.readAll();
 
     THtmlParser parser;
@@ -72,9 +69,6 @@ void TestTfpconverter::parse()
     QFile res("result.phtm");
     res.open(QIODevice::WriteOnly | QIODevice::Truncate);
     QTextStream rests(&res);
-#if QT_VERSION < 0x060000
-    rests.setCodec("UTF-8");
-#endif
     rests << result;
     res.close();
 
@@ -131,23 +125,14 @@ void TestTfpconverter::otamaconvert()
     QFile htmlFile(htmlFileName);
     QVERIFY(htmlFile.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream tshtml(&htmlFile);
-#if QT_VERSION < 0x060000
-    tshtml.setCodec("UTF-8");
-#endif
 
     QFile olgFile(olgFileName);
     QVERIFY(olgFile.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream tsolg(&olgFile);
-#if QT_VERSION < 0x060000
-    tsolg.setCodec("UTF-8");
-#endif
 
     QFile resultFile(resultFileName);
     QVERIFY(resultFile.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream tsres(&resultFile);
-#if QT_VERSION < 0x060000
-    tsres.setCodec("UTF-8");
-#endif
 
     QString result = OtamaConverter::convertToErb(tshtml.readAll(), tsolg.readAll(), 1);
     QString expect = tsres.readAll();
@@ -186,23 +171,14 @@ void TestTfpconverter::otamaconvertStrong()
     QFile htmlFile(htmlFileName);
     QVERIFY(htmlFile.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream tshtml(&htmlFile);
-#if QT_VERSION < 0x060000
-    tshtml.setCodec("UTF-8");
-#endif
 
     QFile olgFile(olgFileName);
     QVERIFY(olgFile.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream tsolg(&olgFile);
-#if QT_VERSION < 0x060000
-    tsolg.setCodec("UTF-8");
-#endif
 
     QFile resultFile(resultFileName);
     QVERIFY(resultFile.open(QIODevice::ReadOnly | QIODevice::Text));
     QTextStream tsres(&resultFile);
-#if QT_VERSION < 0x060000
-    tsres.setCodec("UTF-8");
-#endif
 
     QString result = OtamaConverter::convertToErb(tshtml.readAll(), tsolg.readAll(), 2);
     QString expect = tsres.readAll();

tools/tspawn/controllergenerator.cpp

@@ -225,11 +225,7 @@ bool ControllerGenerator::generate(const QString &dstDir) const
             {"var1", convMethod.value(pair.second).arg(fieldNameToVariableName(pair.first))},
             {"code1", sessInsertStr},
             {"code2", sessGetStr},
-#if QT_VERSION < 0x060000
-            {"type", QString::fromLatin1(QMetaType::typeName(pair.second))},
-#else
             {"type", QString::fromLatin1(QMetaType(pair.second).name())},
-#endif
             {"rev", revStr},
             {"id", fieldNameToVariableName(pair.first)},
             {"condition", conditionString.value(pair.second).arg(fieldNameToVariableName(pair.first))},

tools/tspawn/main.cpp

@@ -26,9 +26,6 @@
 #include "apicontrollergenerator.h"
 #include "apiservicegenerator.h"
 #include <QtCore>
-#if QT_VERSION < 0x060000
-# include <QTextCodec>
-#endif
 #include <random>
 #ifndef Q_CC_MSVC
 #include <unistd.h>
@@ -557,11 +554,7 @@ int main(int argc, char *argv[])
         break;
 
     case ShowDriverPath: {
-#if QT_VERSION < 0x060000
-        QString path = QLibraryInfo::location(QLibraryInfo::PluginsPath) + "/sqldrivers";
-#else
         QString path = QLibraryInfo::path(QLibraryInfo::PluginsPath) + "/sqldrivers";
-#endif
         QFileInfo fi(path);
         if (!fi.exists() || !fi.isDir()) {
             qCritical("Error: database driver's directory not found");
@@ -621,13 +614,6 @@ int main(int argc, char *argv[])
             return 2;
         }
 
-#if QT_VERSION < 0x060000
-        // Sets codec
-        QTextCodec *codec = QTextCodec::codecForName(appSettings.value("InternalEncoding").toByteArray().trimmed());
-        codec = (codec) ? codec : QTextCodec::codecForLocale();
-        QTextCodec::setCodecForLocale(codec);
-#endif
-
         // ERB or Otama
         templateSystem = devSettings.value("TemplateSystem").toString().toLower();
         if (templateSystem.isEmpty()) {