QGst: make the various internalStructure() methods return a StructureConstPtr

This is a real const Structure pointer, in contrast with const StructurePtr
which was just a const QSharedPointer.

11 files changed, 17 insertions, 35 deletions

diff --git a/src/QGst/event.cpp b/src/QGst/event.cpp
index 57a962e..0530f0b 100644
--- a/src/QGst/event.cpp
+++ b/src/QGst/event.cpp
@@ -40,7 +40,7 @@ QString Event::typeName() const
     return QString::fromUtf8(GST_EVENT_TYPE_NAME(object<GstEvent>()));
 }
 
-const StructurePtr Event::internalStructure()
+StructureConstPtr Event::internalStructure()
 {
     const GstStructure *structure = gst_event_get_structure(object<GstEvent>());
     return SharedStructure::fromMiniObject(const_cast<GstStructure *>(structure), MiniObjectPtr(this));
diff --git a/src/QGst/event.h b/src/QGst/event.h
index e767253..f424d23 100644
--- a/src/QGst/event.h
+++ b/src/QGst/event.h
@@ -60,7 +60,7 @@ public:
     EventType type() const;
     QString typeName() const;
 
-    const StructurePtr internalStructure();
+    StructureConstPtr internalStructure();
 
     bool hasName(const char *name) const;
 
diff --git a/src/QGst/global.h b/src/QGst/global.h
index 0e28072..9d8eefe 100644
--- a/src/QGst/global.h
+++ b/src/QGst/global.h
@@ -147,6 +147,7 @@ namespace QGst {
     class Structure;
     class SharedStructure;
     typedef QSharedPointer<SharedStructure> StructurePtr;
+    typedef QSharedPointer<const SharedStructure> StructureConstPtr;
     class AllocationParams;
     class MapInfo;
     class Segment;
diff --git a/src/QGst/message.cpp b/src/QGst/message.cpp
index 54736eb..a252562 100644
--- a/src/QGst/message.cpp
+++ b/src/QGst/message.cpp
@@ -43,7 +43,7 @@ MessageType Message::type() const
     return static_cast<MessageType>(GST_MESSAGE_TYPE(object<GstMessage>()));
 }
 
-const StructurePtr Message::internalStructure()
+StructureConstPtr Message::internalStructure()
 {
     const GstStructure *structure = gst_message_get_structure(object<GstMessage>());
     return SharedStructure::fromMiniObject(const_cast<GstStructure *>(structure), MiniObjectPtr(this));
diff --git a/src/QGst/message.h b/src/QGst/message.h
index 79317c3..04f4984 100644
--- a/src/QGst/message.h
+++ b/src/QGst/message.h
@@ -54,7 +54,7 @@ public:
     QString typeName() const;
     MessageType type() const;
 
-    const StructurePtr internalStructure();
+    StructureConstPtr internalStructure();
 
     quint32 sequenceNumber() const;
     void setSequenceNumber(quint32 num);
diff --git a/src/QGst/query.cpp b/src/QGst/query.cpp
index c35ce5e..fc0a0d1 100644
--- a/src/QGst/query.cpp
+++ b/src/QGst/query.cpp
@@ -35,7 +35,7 @@ QueryType Query::type() const
     return static_cast<QueryType>(GST_QUERY_TYPE(object<GstQuery>()));
 }
 
-const StructurePtr Query::internalStructure()
+StructureConstPtr Query::internalStructure()
 {
     const GstStructure *structure = gst_query_get_structure(object<GstQuery>());
     return SharedStructure::fromMiniObject(const_cast<GstStructure *>(structure), MiniObjectPtr(this));
diff --git a/src/QGst/query.h b/src/QGst/query.h
index 978379f..a8e1dd4 100644
--- a/src/QGst/query.h
+++ b/src/QGst/query.h
@@ -57,7 +57,7 @@ public:
     QString typeName() const;
     QueryType type() const;
 
-    const StructurePtr internalStructure();
+    StructureConstPtr internalStructure();
 };
 
 /*! \headerfile query.h <QGst/Query>
diff --git a/tests/auto/bustest.cpp b/tests/auto/bustest.cpp
index ba7e131..52c293a 100644
--- a/tests/auto/bustest.cpp
+++ b/tests/auto/bustest.cpp
@@ -67,7 +67,7 @@ void BusTest::messageClosure(const QGst::MessagePtr & msg)
     //check if the message is the same we sent from the other thread
     QVERIFY(!msg.isNull());
     QCOMPARE(msg->type(), QGst::MessageApplication);
-    const QGst::StructurePtr s = msg->internalStructure();
+    QGst::StructureConstPtr s = msg->internalStructure();
     QCOMPARE(s->name(), QString("test"));
     QCOMPARE(s->value("sequence").get<int>(), m_messagesReceived);
 
diff --git a/tests/auto/eventtest.cpp b/tests/auto/eventtest.cpp
index b6dd42c..1370df7 100644
--- a/tests/auto/eventtest.cpp
+++ b/tests/auto/eventtest.cpp
@@ -44,15 +44,15 @@ private Q_SLOTS:
 void EventTest::baseTest()
 {
     QGst::Structure s("mystructure");
+    s.setValue("myfield", 365);
+
     QGst::EventPtr evt = QGst::NavigationEvent::create(s);
 
     QVERIFY(evt->type()==QGst::EventNavigation);
     QCOMPARE(evt->typeName(), QString("navigation"));
 
-    QGst::StructurePtr ss = evt->internalStructure();
+    QGst::StructureConstPtr ss = evt->internalStructure();
     QVERIFY(ss->isValid());
-
-    ss->setValue("myfield", 365);
     QCOMPARE(ss->value("myfield").get<int>(), 365);
 
     QVERIFY(evt->timestamp());
@@ -72,7 +72,7 @@ void EventTest::copyTest()
     QCOMPARE(evt->type(), evt2->type());
     QCOMPARE(evt->timestamp(), evt2->timestamp());
 
-    QGst::StructurePtr ss = evt2->internalStructure();
+    QGst::StructureConstPtr ss = evt2->internalStructure();
     QVERIFY(ss->isValid());
     QCOMPARE(ss->value("myfield").get<int>(), 365);
 }
@@ -162,7 +162,7 @@ void EventTest::navigationTest()
     QVERIFY(evt->type()==QGst::EventNavigation);
     QCOMPARE(evt->typeName(), QString("navigation"));
 
-    QGst::StructurePtr ss = evt->internalStructure();
+    QGst::StructureConstPtr ss = evt->internalStructure();
     QVERIFY(ss->isValid());
     QCOMPARE(ss->value("myfield").get<int>(), 365);
 }
diff --git a/tests/auto/messagetest.cpp b/tests/auto/messagetest.cpp
index c934fcd..fe9be95 100644
--- a/tests/auto/messagetest.cpp
+++ b/tests/auto/messagetest.cpp
@@ -26,7 +26,6 @@ class MessageTest : public QGstTest
 {
     Q_OBJECT
 private Q_SLOTS:
-    void baseTest();
     void eosMessageTest();
     void errorMessageTest();
     void warningMessageTest();
@@ -46,29 +45,15 @@ private Q_SLOTS:
     void qosMessageTest();
 };
 
-void MessageTest::baseTest()
-{
-    QGst::Structure s("mystructure");
-    QGlib::Quark q = QGlib::Quark::fromString("test");
-    QGlib::Error err(q, 10, "test error");
-    QGst::ErrorMessagePtr msg = QGst::ErrorMessage::create(QGst::ObjectPtr(), err,
-                                                           "Test suite error");
-
-    QGst::StructurePtr ss = msg->internalStructure();
-    QVERIFY(ss->isValid());
-    ss->setValue("myfield", 365);
-    QCOMPARE(ss->value("myfield").get<int>(), 365);
-
-    msg->setSequenceNumber(1456);
-    QCOMPARE(msg->sequenceNumber(), 1456U);
-}
-
 void MessageTest::eosMessageTest()
 {
     QGst::EosMessagePtr msg = QGst::EosMessage::create(QGst::ObjectPtr());
 
     QVERIFY(msg->type()==QGst::MessageEos);
     QCOMPARE(msg->typeName(), QString("eos"));
+
+    msg->setSequenceNumber(1456);
+    QCOMPARE(msg->sequenceNumber(), 1456U);
 }
 
 void MessageTest::errorMessageTest()
diff --git a/tests/auto/querytest.cpp b/tests/auto/querytest.cpp
index ff6f8ff..19c1430 100644
--- a/tests/auto/querytest.cpp
+++ b/tests/auto/querytest.cpp
@@ -36,13 +36,9 @@ private Q_SLOTS:
 
 void QueryTest::baseTest()
 {
-    QGst::Structure s("mystructure");
     QGst::PositionQueryPtr query = QGst::PositionQuery::create(QGst::FormatBytes);
-
-    QGst::StructurePtr ss = query->internalStructure();
+    QGst::StructureConstPtr ss = query->internalStructure();
     QVERIFY(ss->isValid());
-    ss->setValue("myfield", 365);
-    QCOMPARE(ss->value("myfield").get<int>(), 365);
 }
 
 void QueryTest::positionTest()