Merge pull request #42 from Lord-Grey/Support_Qt6.7.0

Support Qt 6.7.0 - Address that qAsConst has been deprecated

Author: nathan-osman

src/CMakeLists.txt

@@ -44,8 +44,18 @@ endif()
 
 add_library(qmdnsengine ${HEADERS} ${SRC})
 
+if ( "${QT_VERSION}" VERSION_GREATER_EQUAL "6.7.0" )
+    message( STATUS "QMdnsEngine: Enable C++17 for Qt 6.7 and newer" )
+    set_target_properties(qmdnsengine PROPERTIES
+        CXX_STANDARD          17
+    )
+else()
+	set_target_properties(qmdnsengine PROPERTIES
+        CXX_STANDARD          11
+    )
+endif()
+
 set_target_properties(qmdnsengine PROPERTIES
-    CXX_STANDARD          11
     CXX_STANDARD_REQUIRED ON
     DEFINE_SYMBOL         QT_NO_SIGNALS_SLOTS_KEYWORDS
     DEFINE_SYMBOL         QT_NO_FOREACH

src/src/browser.cpp

@@ -22,6 +22,8 @@
  * IN THE SOFTWARE.
  */
 
+#include <utility>
+
 #include <qmdnsengine/abstractserver.h>
 #include <qmdnsengine/browser.h>
 #include <qmdnsengine/cache.h>
@@ -89,7 +91,11 @@ bool BrowserPrivate::updateService(const QByteArray &fqName)
     QList<Record> txtRecords;
     if (cache->lookupRecords(fqName, TXT, txtRecords)) {
         QMap<QByteArray, QByteArray> attributes;
-        for (const Record &record : qAsConst(txtRecords)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+		for (const Record &record : std::as_const(txtRecords)) {
+#else
+		for (const Record &record : qAsConst(txtRecords)) {
+#endif
             for (auto i = record.attributes().constBegin();
                     i != record.attributes().constEnd(); ++i) {
                 attributes.insert(i.key(), i.value());
@@ -154,7 +160,11 @@ void BrowserPrivate::onMessageReceived(const Message &message)
     // For each of the services marked to be updated, perform the update and
     // make a list of all missing SRV records
     QSet<QByteArray> queryNames;
-    for (const QByteArray &name : qAsConst(updateNames)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+	for (const QByteArray &name : std::as_const(updateNames)) {
+#else
+	for (const QByteArray &name : qAsConst(updateNames)) {
+#endif
         if (updateService(name)) {
             queryNames.insert(name);
         }
@@ -178,7 +188,11 @@ void BrowserPrivate::onMessageReceived(const Message &message)
     // Build and send a query for all of the SRV and TXT records
     if (queryNames.count()) {
         Message queryMessage;
-        for (const QByteArray &name : qAsConst(queryNames)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+		for (const QByteArray &name : std::as_const(queryNames)) {
+#else
+		for (const QByteArray &name : qAsConst(queryNames)) {
+#endif
             Query query;
             query.setName(name);
             query.setType(SRV);
@@ -240,7 +254,11 @@ void BrowserPrivate::onQueryTimeout()
     // Include PTR records for the target that are already known
     QList<Record> records;
     if (cache->lookupRecords(query.name(), PTR, records)) {
-        for (const Record &record : qAsConst(records)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+		for (const Record &record : std::as_const(records)) {
+#else
+		for (const Record &record : qAsConst(records)) {
+#endif
             message.addRecord(record);
         }
     }
@@ -253,8 +271,11 @@ void BrowserPrivate::onServiceTimeout()
 {
     if (ptrTargets.count()) {
         Message message;
-        for (const QByteArray &target : qAsConst(ptrTargets)) {
-
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+		for (const QByteArray &target : std::as_const(ptrTargets)) {
+#else
+		for (const QByteArray &target : qAsConst(ptrTargets)) {
+#endif
             // Add a query for PTR records
             Query query;
             query.setName(target);
@@ -264,7 +285,11 @@ void BrowserPrivate::onServiceTimeout()
             // Include PTR records for the target that are already known
             QList<Record> records;
             if (cache->lookupRecords(target, PTR, records)) {
-                for (const Record &record : qAsConst(records)) {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0))
+				for (const Record &record : std::as_const(records)) {
+#else
+				for (const Record &record : qAsConst(records)) {
+#endif
                     message.addRecord(record);
                 }
             }