6e94b6858cb6 — Chris Cannam tip 20 days ago
Sigh - restore compatibility with Qt < 5.14 (I hope)
2 files changed, 14 insertions(+), 1 deletions(-)

M src/objectmapper/ObjectLoader.cpp
M src/objectmapper/ObjectStorer.cpp
M src/objectmapper/ObjectLoader.cpp +6 -1
@@ 444,9 444,14 @@ private:
         // was only added the same 5.14 release!
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
-        NodeSet remainingSet(children.begin(), children.end());
         Nodes ordered = orderedSiblingsOf(children[0]);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        NodeSet remainingSet(children.begin(), children.end()); 
         NodeSet orderedSet(ordered.begin(), ordered.end());
+#else
+        NodeSet remainingSet = NodeSet::fromList(children);
+        NodeSet orderedSet = NodeSet::fromList(ordered);
+#endif
         remainingSet.subtract(orderedSet);
         foreach (Node n, remainingSet) ordered.push_back(n);
         DQ_DEBUG << "orderedChildrenOf: Node " << node << " has " << ordered.size()

          
M src/objectmapper/ObjectStorer.cpp +8 -0
@@ 197,7 197,11 @@ private:
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
         QObjectList candidates = state.requested;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         state.noBlanks = ObjectSet(candidates.begin(), candidates.end());
+#else 
+        state.noBlanks = ObjectSet::fromList(candidates);
+#endif
         ObjectSet visited;
 
         // Avoid ever pushing null (if returned as absence case) as a

          
@@ 603,7 607,11 @@ ObjectStorer::D::replacePropertyNodes(No
 void
 ObjectStorer::D::replacePropertyNodes(Node node, Uri propertyUri, Nodes newValues)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
     QSet<Node> nodeSet = QSet<Node>(newValues.begin(), newValues.end());
+#else
+    QSet<Node> nodeSet = QSet<Node>::fromList(newValues);
+#endif
     removePropertyNodes(node, propertyUri, &nodeSet);
     // nodeSet now contains only those nodes whose triples need to be
     // added, i.e. those not present as our properties before