Merge pull request #37 from hasselmm/bugfix/various-bugfixes

Various bugfixes

Author: hasselmm

http/httpparser.cpp

@@ -11,6 +11,7 @@
 #include <QBuffer>
 #include <QDateTime>
 #include <QLoggingCategory>
+#include <QTimeZone>
 
 namespace qnc::http {
 
@@ -170,14 +171,14 @@ QDateTime parseDateTime(const QString &text)
     const auto locale = QLocale::c(); // for language neutral (that is English) weekdays
 
     if (auto dt = locale.toDateTime(text, s_rfc1123DateFormat); dt.isValid()) {
-        dt.setTimeSpec(Qt::UTC);
+        dt.setTimeZone(QTimeZone::utc());
         return dt;
     } else if (auto dt = locale.toDateTime(text, s_rfc850DateFormat); dt.isValid()) {
-        dt.setTimeSpec(Qt::UTC);
+        dt.setTimeZone(QTimeZone::utc());
         return dt;
     } else if (auto dt = locale.toDateTime(QString{text}.replace("  "_L1, " "_L1),
                                            s_ascTimeDateFormat); dt.isValid()) {
-        dt.setTimeSpec(Qt::UTC);
+        dt.setTimeZone(QTimeZone::utc());
         return dt;
     }
 

tests/auto/tst_xmlparser.cpp

@@ -331,7 +331,6 @@ private slots:
         QTest::newRow("double:valid")      << makeConversionTest<double>            (u"4.56",  4.56);
         QTest::newRow("longdouble:valid")  << makeConversionTest<long double>       (u"7.89",  7.89);
         QTest::newRow("QString:valid")     << makeConversionTest<QString>    (u"Hello world", u"Hello world"_s);
-        QTest::newRow("QStringView:valid") << makeConversionTest<QStringView>(u"Hello world", u"Hello world");
         QTest::newRow("QUrl:valid")        << makeConversionTest<QUrl>       (u"hello:world",  "hello:world"_url);
     }
 

xml/xmlparser.cpp

@@ -93,11 +93,8 @@ std::optional<QString> convert(QStringView text)
     return text.toString();
 }
 
-template <>
-std::optional<QStringView> convert(QStringView text)
-{
-    return text;
-}
+template <> // QStringView is a temporary view, not a storage type
+std::optional<QStringView> convert(QStringView text) = delete;
 
 template <>
 std::optional<QUrl> convert(QStringView text)
@@ -179,7 +176,6 @@ template void ParserBase::parseValue(QStringView, const std::function<void(float
 template void ParserBase::parseValue(QStringView, const std::function<void(double)> &);
 template void ParserBase::parseValue(QStringView, const std::function<void(long double)> &);
 template void ParserBase::parseValue(QStringView, const std::function<void(QString)> &);
-template void ParserBase::parseValue(QStringView, const std::function<void(QStringView)> &);
 template void ParserBase::parseValue(QStringView, const std::function<void(QUrl)> &);
 
 QString ParserBase::stateName(const QMetaEnum &metaEnum, int value)

xml/xmlparser.h

@@ -221,11 +221,17 @@ class ParserBase : public QObject
     static void emplaceBack(Context &context, typename detail::ValueType<list>::value_type &&value)
     {
         using Object = typename detail::ObjectType<list>;
+
+        QT_WARNING_PUSH
+        QT_WARNING_DISABLE_GCC("-Wmaybe-uninitialized")
+
 #if QT_VERSION_MAJOR >= 6
         (currentObject<Object>(context).*list).emplaceBack(std::move(value));
 #else // QT_VERSION_MAJOR < 6
         (currentObject<Object>(context).*list).append(std::move(value));
 #endif // QT_VERSION_MAJOR < 6
+
+        QT_WARNING_POP
     }
 
     static QString stateName(const QMetaEnum &metaEnum, int value);
@@ -307,6 +313,9 @@ class ParserBase : public QObject
     QXmlStreamReader *const m_xml;
 };
 
+template <> // QStringView is not a storage type, it's a temporary view
+void ParserBase::parseValue(QStringView text, const std::function<void(QStringView)> &store) = delete;
+
 template <typename StateEnum>
 class Parser : public ParserBase
 {