Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-transform

2 files changed, 10 insertions, 0 deletions

diff --git a/examples/xml/streambookmarks/xbelreader.cpp b/examples/xml/streambookmarks/xbelreader.cpp
index 729fcf8..4472f8a 100644
--- a/examples/xml/streambookmarks/xbelreader.cpp
+++ b/examples/xml/streambookmarks/xbelreader.cpp
@@ -73,6 +73,15 @@ bool XbelReader::read(QIODevice *device)
 }
 //! [1]
 
+//! [2]
+void XbelReader::readUnknownElement()
+{
+    while (readNextStartElement()) {
+            readUnknownElement();
+    }
+}
+//! [2]
+
 //! [3]
 void XbelReader::readXBEL()
 {
diff --git a/examples/xml/streambookmarks/xbelreader.h b/examples/xml/streambookmarks/xbelreader.h
index 2debadc..80f0a28 100644
--- a/examples/xml/streambookmarks/xbelreader.h
+++ b/examples/xml/streambookmarks/xbelreader.h
@@ -62,6 +62,7 @@ public:
 
 private:
 //! [2]
+    void readUnknownElement();
     void readXBEL();
     void readTitle(QTreeWidgetItem *item);
     void readSeparator(QTreeWidgetItem *item);