deleted codes for qt5

Author: treefrogframework

defaults/controllers_qt5/CMakeLists.txt

@@ -3,9 +3,10 @@ TEMPLATE = lib
 CONFIG  += shared console
 CONFIG  -= lib_bundle
 QT      += sql network xml qml
-lessThan(QT_MAJOR_VERSION, 6) {
-  CONFIG += c++14
-  windows:QMAKE_CXXFLAGS += /std:c++14
+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-
@@ -42,12 +43,7 @@ windows {
   LIBS += ../3rdparty/lz4/build/cmake/build/Release/lz4_static.lib
   header.files = $$HEADER_FILES $$HEADER_CLASSES
   header.files += $$MONGODB_FILES $$MONGODB_CLASSES
-
-  lessThan(QT_MAJOR_VERSION, 6) {
-    QMAKE_CXXFLAGS += /source-charset:utf-8 /wd 4819 /wd 4661
-  } else {
-    QMAKE_CXXFLAGS += /wd 4819 /wd 4661
-  }
+  QMAKE_CXXFLAGS += /wd 4819 /wd 4661
 
   isEmpty(header.path) {
     header.path = C:/TreeFrog/$${VERSION}/include

defaults/helpers_qt5/CMakeLists.txt

@@ -175,8 +175,6 @@ void TAbstractModel::setProperties(const QJsonDocument &properties)
 }
 
 
-#if QT_VERSION >= 0x050c00  // 5.12.0
-
 /*!
   Converts all the properies to CBOR using QCborValue::fromVariant() and
   returns the map composed of those elements.
@@ -185,7 +183,7 @@ QCborMap TAbstractModel::toCborMap(const QStringList &properties) const
 {
     return QCborMap::fromVariantMap(toVariantMap(properties));
 }
-#endif
+
 
 
 /*!

defaults/models_qt5/CMakeLists.txt

@@ -21,9 +21,7 @@ class T_CORE_EXPORT TAbstractModel {
     virtual void setProperties(const QJsonObject &properties);
     virtual QJsonObject toJsonObject(const QStringList &properties = QStringList()) const;
     virtual void setProperties(const QJsonDocument &properties);
-#if QT_VERSION >= 0x050c00  // 5.12.0
     virtual QCborMap toCborMap(const QStringList &properties = QStringList()) const;
-#endif
 
     QString variableNameToFieldName(const QString &name) const;
     static QString fieldNameToVariableName(const QString &name);

defaults/views_qt5/CMakeLists.txt

@@ -385,11 +385,7 @@ void TActionContext::flushResponse(TActionController *controller, bool immediate
     QByteArray ctype = controller->_response.header().contentType().toLower();
     if (ctype.startsWith("text") && !ctype.contains("charset")) {
         ctype += "; charset=";
-#if QT_VERSION < 0x060000
-        ctype += Tf::app()->codecForHttpOutput()->name();
-#else
         ctype += QStringConverter::nameForEncoding(Tf::app()->encodingForHttpOutput());
-#endif
         controller->_response.header().setContentType(ctype);
     }
 

src/corelib.pro

@@ -29,9 +29,7 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <TWebApplication>
-#if QT_VERSION >= 0x060000
-# include <QStringEncoder>
-#endif
+#include <QStringEncoder>
 
 const QString FLASH_VARS_SESSION_KEY("_flashVariants");
 const QString LOGIN_USER_NAME_KEY("_loginUserName");
@@ -356,11 +354,7 @@ bool TActionController::renderXml(const QDomDocument &document)
     QByteArray xml;
     QTextStream ts(&xml);
 
-#if QT_VERSION < 0x060000
-    ts.setCodec("UTF-8");
-#else
     ts.setEncoding(QStringConverter::Utf8);
-#endif
     document.save(ts, 1, QDomNode::EncodingFromTextStream);
     return sendData(xml, "text/xml");
 }
@@ -512,11 +506,7 @@ QByteArray TActionController::renderView(TActionView *view)
     if (!layoutEnabled()) {
         // Renders without layout
         tSystemDebug("Renders without layout");
-#if QT_VERSION < 0x060000
-        return Tf::app()->codecForHttpOutput()->fromUnicode(view->toString());
-#else
         return QStringEncoder(Tf::app()->encodingForHttpOutput()).encode(view->toString());
-#endif
     }
 
     // Displays with layout
@@ -534,11 +524,7 @@ QByteArray TActionController::renderView(TActionView *view)
             layoutView = defLayoutDispatcher.object();
             if (!layoutView) {
                 tSystemDebug("Not found default layout. Renders without layout.");
-#if QT_VERSION < 0x060000
-                return Tf::app()->codecForHttpOutput()->fromUnicode(view->toString());
-#else
                 return QStringEncoder(Tf::app()->encodingForHttpOutput()).encode(view->toString());
-#endif
             }
         }
     }
@@ -547,11 +533,7 @@ QByteArray TActionController::renderView(TActionView *view)
     layoutView->setVariantMap(allVariants());
     layoutView->setController(this);
     layoutView->setSubActionView(view);
-#if QT_VERSION < 0x060000
-    return Tf::app()->codecForHttpOutput()->fromUnicode(layoutView->toString());
-#else
     return QStringEncoder(Tf::app()->encodingForHttpOutput()).encode(layoutView->toString());
-#endif
 }
 
 /*!
@@ -916,8 +898,6 @@ bool TActionController::renderJson(const QStringList &list)
     return renderJson(QJsonArray::fromStringList(list));
 }
 
-#if QT_VERSION >= 0x050c00  // 5.12.0
-
 /*!
   Renders a CBOR object \a variant as HTTP response.
 */
@@ -967,8 +947,6 @@ bool TActionController::renderCbor(const QCborArray &array, QCborValue::Encoding
     return renderCbor(array.toCborValue(), opt);
 }
 
-#endif
-
 /*!
   \fn const TSession &TActionController::session() const;
 

src/tabstractmodel.cpp

@@ -83,14 +83,12 @@ class T_CORE_EXPORT TActionController : public TAbstractController, public TActi
     bool renderAndCache(const QByteArray &key, int seconds, const QString &action = QString(), const QString &layout = QString());
     bool renderOnCache(const QByteArray &key);
     void removeCache(const QByteArray &key);
-#if QT_VERSION >= 0x050c00  // 5.12.0
     bool renderCbor(const QVariant &variant, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
     bool renderCbor(const QVariantMap &map, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
     bool renderCbor(const QVariantHash &hash, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
     bool renderCbor(const QCborValue &value, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
     bool renderCbor(const QCborMap &map, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
     bool renderCbor(const QCborArray &array, QCborValue::EncodingOptions opt = QCborValue::NoTransformation);
-#endif
     bool renderErrorResponse(int statusCode);
     void redirect(const QUrl &url, int statusCode = Tf::Found);
     bool sendFile(const QString &filePath, const QByteArray &contentType, const QString &name = QString(), bool autoRemove = false);