Package: dataquay / 0.9-3

05-build_with_qt5.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
Description: Build with qt5.
Forwarded: no
---
Index: dataquay/src/Node.cpp
===================================================================
--- dataquay.orig/src/Node.cpp
+++ dataquay/src/Node.cpp
@@ -304,7 +304,7 @@ Node::fromVariant(const QVariant &v)
         Node n;
         n.type = Literal;
         n.datatype = encodedVariantTypeURI;
-        n.value = QString::fromAscii(qCompress(b).toBase64());        
+        n.value = QString::fromLatin1(qCompress(b).toBase64());        
         return n;
     }
 }
@@ -328,7 +328,7 @@ Node::toVariant() const
         // Opaque encoding used for "unknown" types.  If this is
         // encoding is in use, we must decode from it even if the type
         // is actually known
-        QByteArray benc = value.toAscii();
+        QByteArray benc = value.toLatin1();
         QByteArray b = qUncompress(QByteArray::fromBase64(benc));
         QDataStream ds(&b, QIODevice::ReadOnly);
         QVariant v;
Index: dataquay/src/Store.cpp
===================================================================
--- dataquay.orig/src/Store.cpp
+++ dataquay/src/Store.cpp
@@ -33,14 +33,16 @@
 
 #include "Store.h"
 
+#include <QDataStream>
+
 QDataStream &operator<<(QDataStream &out, const Dataquay::ChangeType &ct)
 {
-    return (out << (int)ct);
+    return (out << (qint32)ct);
 }
 
 QDataStream &operator>>(QDataStream &in, Dataquay::ChangeType &ct)
 {
-    int i;
+    qint32 i;
     in >> i;
     ct = (Dataquay::ChangeType)i;
     return in;
Index: dataquay/src/objectmapper/ObjectMapperForwarder.cpp
===================================================================
--- dataquay.orig/src/objectmapper/ObjectMapperForwarder.cpp
+++ dataquay/src/objectmapper/ObjectMapperForwarder.cpp
@@ -74,7 +74,7 @@ ObjectMapperForwarder::ObjectMapperForwa
         // through the public API.
 
         QString sig = QString("%1%2").arg(QSIGNAL_CODE)
-            .arg(property.notifySignal().signature());
+            .arg(property.notifySignal().methodSignature().data());
         QByteArray ba = sig.toLocal8Bit();
         
         if (!connect(o, ba.data(), this, SLOT(objectModified()))) {
Index: dataquay/tests/TestBasicStore.h
===================================================================
--- dataquay.orig/tests/TestBasicStore.h
+++ dataquay/tests/TestBasicStore.h
@@ -444,8 +444,7 @@ private slots:
 	    QCOMPARE(v.value, expected);
 
 	} catch (RDFUnsupportedError &e) {
-	    QSKIP("SPARQL queries not supported by current store backend",
-		  SkipSingle);
+	    QSKIP("SPARQL queries not supported by current store backend");
 	}
     }