updated

Author: treefrogframework

src/corelib.pro

@@ -3,14 +3,10 @@ TEMPLATE = lib
 CONFIG  += shared console
 CONFIG  -= lib_bundle
 QT      += sql network xml qml
-lessThan(QT_MINOR_VERSION, 3) {
-  # Qt6.2
-  CONFIG += c++17
-  windows:QMAKE_CXXFLAGS += /std:c++17
-} else {
-  CONFIG += c++20
-  windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++20 /permissive-
-}
+
+# C++ Standards Support
+CONFIG += c++20
+windows:QMAKE_CXXFLAGS += /Zc:__cplusplus /std:c++20 /permissive-
 
 DEFINES *= QT_USE_QSTRINGBUILDER
 DEFINES += TF_MAKEDLL

src/tcriteriaconverter.h

@@ -27,11 +27,7 @@ class T_CORE_EXPORT TCriteriaData {
     bool isEmpty() const;
 
     int property {-1};
-#if QT_VERSION < 0x060000
-    QVariant::Type varType {QVariant::Invalid};
-#else
     QMetaType varType {QMetaType::UnknownType};
-#endif
     int op1 {TSql::Invalid};
     int op2 {TSql::Invalid};
     QVariant val1;
@@ -88,24 +84,15 @@ class TCriteriaConverter {
     TCriteriaConverter(const TCriteria &cri, const QSqlDatabase &db, const QString &aliasTableName = QString()) :
         criteria(cri), database(db), tableAlias(aliasTableName) { }
     QString toString() const;
-#if QT_VERSION < 0x060000
-    QVariant::Type variantType(int property) const;
-#else
     QMetaType variantType(int property) const;
-#endif
     QString propertyName(int property, const QSqlDriver *driver, const QString &aliasTableName = QString()) const;
     static QString getPropertyName(int property, const QSqlDriver *driver, const QString &aliasTableName = QString());
 
 protected:
     static QString getPropertyName(const QMetaObject *metaObject, int property, const QSqlDriver *driver, const QString &aliasTableName);
     QString criteriaToString(const QVariant &cri) const;
-#if QT_VERSION < 0x060000
-    static QString criteriaToString(const QString &propertyName, QVariant::Type varType, TSql::ComparisonOperator op, const QVariant &val1, const QVariant &val2, const QSqlDatabase &database);
-    static QString criteriaToString(const QString &propertyName, QVariant::Type varType, TSql::ComparisonOperator op1, TSql::ComparisonOperator op2, const QVariant &val, const QSqlDatabase &database);
-#else
     static QString criteriaToString(const QString &propertyName, const QMetaType &varType, TSql::ComparisonOperator op, const QVariant &val1, const QVariant &val2, const QSqlDatabase &database);
     static QString criteriaToString(const QString &propertyName, const QMetaType &varType, TSql::ComparisonOperator op1, TSql::ComparisonOperator op2, const QVariant &val, const QSqlDatabase &database);
-#endif
     static QString concat(const QString &s1, TCriteria::LogicalOperator op, const QString &s2);
 
 private:
@@ -198,11 +185,7 @@ inline QString TCriteriaConverter<T>::criteriaToString(const QVariant &var) cons
                     break;
                 }
 
-#if QT_VERSION >= 0x050400
                 if (lst.count() <= LIMIT_WORDS_IN_CLAUSE || database.driver()->dbmsType() == QSqlDriver::MySqlServer) {
-#else
-                if (lst.count() <= LIMIT_WORDS_IN_CLAUSE || database.driverName().toUpper() == QLatin1String("QMYSQL")) {
-#endif
                     QString str = inclause(lst, 0, lst.count());
                     sqlString += name;
                     sqlString += TSql::formatArg(cri.op1, str);
@@ -296,39 +279,19 @@ inline QString TCriteriaConverter<T>::getPropertyName(int property, const QSqlDr
     return getPropertyName(T().metaObject(), property, driver, aliasTableName);
 }
 
-#if QT_VERSION < 0x060000
-template <class T>
-inline QVariant::Type TCriteriaConverter<T>::variantType(int property) const
-{
-    const QMetaObject *metaObject = obj.metaObject();
-    return (metaObject) ? metaObject->property(metaObject->propertyOffset() + property).type() : QVariant::Invalid;
-}
-#else
 template <class T>
 inline QMetaType TCriteriaConverter<T>::variantType(int property) const
 {
     const QMetaObject *metaObject = obj.metaObject();
     return (metaObject) ? metaObject->property(metaObject->propertyOffset() + property).metaType() : QMetaType(QMetaType::UnknownType);
 }
-#endif
 
-#if QT_VERSION < 0x060000
-template <class T>
-inline QString TCriteriaConverter<T>::criteriaToString(const QString &propertyName, QVariant::Type varType, TSql::ComparisonOperator op, const QVariant &val1, const QVariant &val2, const QSqlDatabase &database)
-#else
 template <class T>
 inline QString TCriteriaConverter<T>::criteriaToString(const QString &propertyName, const QMetaType &varType, TSql::ComparisonOperator op, const QVariant &val1, const QVariant &val2, const QSqlDatabase &database)
-#endif
 {
     QString sqlString;
-
-#if QT_VERSION < 0x060000
-    QString v1 = TSqlQuery::formatValue(val1, (QVariant::Type)varType, database);
-    QString v2 = TSqlQuery::formatValue(val2, (QVariant::Type)varType, database);
-#else
     QString v1 = TSqlQuery::formatValue(val1, varType, database);
     QString v2 = TSqlQuery::formatValue(val2, varType, database);
-#endif
 
     if (!v1.isEmpty() && !v2.isEmpty()) {
         switch (op) {
@@ -354,14 +317,8 @@ inline QString TCriteriaConverter<T>::criteriaToString(const QString &propertyNa
     return sqlString;
 }
 
-
-#if QT_VERSION < 0x060000
-template <class T>
-inline QString TCriteriaConverter<T>::criteriaToString(const QString &propertyName, QVariant::Type varType, TSql::ComparisonOperator op1, TSql::ComparisonOperator op2, const QVariant &val, const QSqlDatabase &database)
-#else
 template <class T>
 inline QString TCriteriaConverter<T>::criteriaToString(const QString &propertyName, const QMetaType &varType, TSql::ComparisonOperator op1, TSql::ComparisonOperator op2, const QVariant &val, const QSqlDatabase &database)
-#endif
 {
     QString sqlString;
     if (op1 != TSql::Invalid && op2 != TSql::Invalid && !val.isNull()) {

src/tdebug.h

@@ -113,13 +113,6 @@ class T_CORE_EXPORT TDebug {
         ts << t;
         return *this;
     }
-#if QT_VERSION < 0x060000
-    inline TDebug &operator<<(const QStringRef &t)
-    {
-        ts << t.toString();
-        return *this;
-    }
-#endif
     inline TDebug &operator<<(const QLatin1String &t)
     {
         ts << t;

src/test/buildtest/foo.cpp

@@ -127,7 +127,6 @@ QList<Foo> Foo::getAll()
     return tfGetModelListByMongoCriteria<Foo, FooObject>(TCriteria());
 }
 
-#if QT_VERSION >= 0x050000
 QJsonArray Foo::getAllJson()
 {
     QJsonArray array;
@@ -140,7 +139,6 @@ QJsonArray Foo::getAllJson()
     }
     return array;
 }
-#endif
 
 TModelObject *Foo::modelData()
 {

src/test/buildtest/foo.h

@@ -44,9 +44,7 @@ class T_MODEL_EXPORT Foo : public TAbstractModel
     static Foo get(const QString &id, int lockRevision);
     static int count();
     static QList<Foo> getAll();
-#if QT_VERSION >= 0x050000
     static QJsonArray getAllJson();
-#endif
 
 private:
     QSharedDataPointer<FooObject> d;

src/test/buildtest/main.cpp

@@ -5,9 +5,7 @@
 #include <TSqlJoin>
 #include <TMongoODMapper>
 #include <TModelUtil>
-#if QT_VERSION >= 0x050000
-# include <TJsonUtil>
-#endif
+#include <TJsonUtil>
 #include <tglobal.h>
 #include <tatomicptr.h>
 #include <tatomic.h>
@@ -200,18 +198,14 @@ void build_check_TModelUtil()
 
     QList<Blog> list;
     tfConvertToJsonArray(list);
-#if QT_VERSION >= 0x050c00  // 5.12.0
     tfConvertToCborArray(list);
-#endif
 }
 
-#if QT_VERSION >= 0x050000
 void build_check_TJsonUtil()
 {
     QList<Foo> fooList;
     tfModelListToJsonArray<Foo>(fooList);
 }
-#endif
 
 void atomic_ptr()
 {

src/test/httpheader/main.cpp

@@ -2,7 +2,7 @@
 #include <THttpRequest>
 #include "thttpheader.h"
 
-#if QT_VERSION >= 0x050000
+
 class TestHttpHeader : public QObject
 {
     Q_OBJECT
@@ -210,126 +210,5 @@ void TestHttpHeader::parseRequestVariantMap()
     QCOMPARE(vmap[key1].toString(), val1);
 }
 
-
-#else // QT_VERSION < 0x050000
-
-#include <QHttpHeader>
-
-
-class TestHttpHeader : public QObject
-{
-    Q_OBJECT
-private slots:
-    void parseHttpRequestHeader_data();
-    void parseHttpRequestHeader();
-    void parseHttpResponseHeader_data();
-    void parseHttpResponseHeader();
-};
-
-
-void TestHttpHeader::parseHttpRequestHeader_data()
-{
-    QTest::addColumn<QString>("data");
-    QTest::newRow("1") <<
-        "GET /generate_204 HTTP/2.2\r\n"
-        "Content-Length: 0\r\n"
-        "Content-Type: text/html\r\n"
-        "Date: Sun, 27 Mar 2011 11:48:42 GMT\r\n"
-        "Server: GFE/2.0\r\n";
-
-    QTest::newRow("2") <<
-        "GET /generate_204 HTTP/2.2\r\n"
-        "Content-Length: 0";
-
-    QTest::newRow("3") <<
-        "GET /ge HTTP/1.1\r\n"
-        "Accept-Encoding: gzip,deflate\r\n"
-        "Accept-Charset: UTF-8,*\r\n"
-        "Keep-Alive: 115\r\n"
-        "Connection: alive\r\n";
-
-    QTest::newRow("4") <<
-        "GET /ge HTTP/1.1\r\n"
-        "Accept-Encoding: gzip,deflate\r\n"
-        "Accept-Charset: UTF-8,*\r\n"
-        "Keep-Alive: 115\r\n"
-        "Connection: kdd\r\n"
-        "Received: fr\r\n"
-        " by hoge.hoge.123.com\r\n"
-        " by hoge.hoga.com";
-}
-
-
-void TestHttpHeader::parseHttpRequestHeader()
-{
-    QFETCH(QString, data);
-    QHttpRequestHeader qhttp(data);
-    THttpRequestHeader thttp(data.toLatin1());
-//     qDebug("Qt: {}", qUtf8Printable(qhttp.toString()));
-//     qDebug("Tf: {}", thttp.toByteArray().data());
-
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-    QCOMPARE(qhttp.contentType().toLatin1(), thttp.contentType());
-    QCOMPARE(qhttp.contentLength(), thttp.contentLength());
-    QCOMPARE(qhttp.hasKey("date"), thttp.hasRawHeader("date"));
-    QCOMPARE(qhttp.hasKey("Date"), thttp.hasRawHeader("Date"));
-    QCOMPARE(qhttp.hasKey("hoge"), thttp.hasRawHeader("hoge"));
-    QCOMPARE(qhttp.value("server").toLatin1(), thttp.rawHeader("server"));
-    QCOMPARE(qhttp.keys().count(), thttp.rawHeaderList().count());
-
-    qhttp.setValue("Connection", "keep-alive");
-    thttp.setRawHeader("Connection", "keep-alive");
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-
-    qhttp.addValue("Connection", "keep-alive222");
-    thttp.addRawHeader("Connection", "keep-alive222");
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-
-    qhttp.setValue("Hoge", "hoge");
-    thttp.setRawHeader("Hoge", "hoge");
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-
-    qhttp.setValue("Hoge", "");
-    thttp.setRawHeader("Hoge", "");
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-
-    qhttp.removeAllValues("connection");
-    thttp.removeAllRawHeaders("connection");
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-    QCOMPARE(qhttp.majorVersion(), thttp.majorVersion());
-    QCOMPARE(qhttp.minorVersion(), thttp.minorVersion());
-}
-
-
-void TestHttpHeader::parseHttpResponseHeader_data()
-{
-    QTest::addColumn<QString>("data");
-    QTest::newRow("1") <<
-        "HTTP/1.1 204 No Content\r\n"
-        "Content-Length: 0\r\n";
-
-    QTest::newRow("2") <<
-        "HTTP/3.3 204 No Content\r\n"
-        "Content-Length: 0\r\n"
-        "Content-Type: text/html\r\n"
-        "Date: Sun, 27 Mar 2011 11:48:42 GMT\r\n"
-        "Server: GFE/2.0\r\n\r\n";
-}
-
-
-void TestHttpHeader::parseHttpResponseHeader()
-{
-    QFETCH(QString, data);
-    QHttpResponseHeader qhttp(data);
-    THttpResponseHeader thttp(data.toLatin1());
-//     qDebug("Qt: {}", qUtf8Printable(qhttp.toString()));
-//     qDebug("Tf: {}", thttp.toByteArray().data());
-    QCOMPARE(qhttp.toString().toLatin1(), thttp.toByteArray());
-    QCOMPARE(qhttp.majorVersion(), thttp.majorVersion());
-    QCOMPARE(qhttp.minorVersion(), thttp.minorVersion());
-}
-
-#endif // QT_VERSION < 0x050000
-
 TF_TEST_MAIN(TestHttpHeader)
 #include "main.moc"