Merge commit 'qt/master-stable' into kinetic-graphicseffect

Conflicts:
	src/gui/graphicsview/qgraphicsscene.cpp

7 files changed, 76 insertions, 80 deletions

diff --git a/examples/qws/dbscreen/dbscreen.cpp b/examples/qws/dbscreen/dbscreen.cpp
index 86c34cd65..fb6897c11 100644
--- a/examples/qws/dbscreen/dbscreen.cpp
+++ b/examples/qws/dbscreen/dbscreen.cpp
@@ -1,11 +1,11 @@
- /****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the examples of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -36,11 +36,8 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
+**
+****************************************************************************/
 
 #include "dbscreen.h"
 #include <QApplication>
diff --git a/examples/qws/dbscreen/dbscreendriverplugin.cpp b/examples/qws/dbscreen/dbscreendriverplugin.cpp
index 6f1119838..91907538a 100644
--- a/examples/qws/dbscreen/dbscreendriverplugin.cpp
+++ b/examples/qws/dbscreen/dbscreendriverplugin.cpp
@@ -1,11 +1,11 @@
- /****************************************************************************
- **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Nokia Corporation (qt-info@nokia.com)
- **
- ** This file is part of the examples of the Qt Toolkit.
- **
- ** $QT_BEGIN_LICENSE:LGPL$
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
@@ -36,12 +36,9 @@
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
- **
- ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- **
- ****************************************************************************/
- 
+**
+****************************************************************************/
+
 #include <QScreenDriverPlugin>
 #include "dbscreen.h"
 
diff --git a/examples/xml/streambookmarks/mainwindow.cpp b/examples/xml/streambookmarks/mainwindow.cpp
index 183143dc8..5aef32777 100644
--- a/examples/xml/streambookmarks/mainwindow.cpp
+++ b/examples/xml/streambookmarks/mainwindow.cpp
@@ -91,10 +91,8 @@ void MainWindow::open()
     XbelReader reader(treeWidget);
     if (!reader.read(&file)) {
         QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
-                             tr("Parse error in file %1 at line %2, column %3:\n%4")
+                             tr("Parse error in file %1:\n\n%2")
                              .arg(fileName)
-                             .arg(reader.lineNumber())
-                             .arg(reader.columnNumber())
                              .arg(reader.errorString()));
     } else {
         statusBar()->showMessage(tr("File loaded"), 2000);
diff --git a/examples/xml/streambookmarks/xbelreader.cpp b/examples/xml/streambookmarks/xbelreader.cpp
index 4472f8a0b..0770643d1 100644
--- a/examples/xml/streambookmarks/xbelreader.cpp
+++ b/examples/xml/streambookmarks/xbelreader.cpp
@@ -60,42 +60,43 @@ XbelReader::XbelReader(QTreeWidget *treeWidget)
 //! [1]
 bool XbelReader::read(QIODevice *device)
 {
-    setDevice(device);
+    xml.setDevice(device);
 
-    if (readNextStartElement()) {
-        if (name() == "xbel" && attributes().value("version") == "1.0")
+    if (xml.readNextStartElement()) {
+        if (xml.name() == "xbel" && xml.attributes().value("version") == "1.0")
             readXBEL();
         else
-            raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
+            xml.raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
     }
 
-    return !error();
+    return !xml.error();
 }
 //! [1]
 
 //! [2]
-void XbelReader::readUnknownElement()
+QString XbelReader::errorString() const
 {
-    while (readNextStartElement()) {
-            readUnknownElement();
-    }
+    return QObject::tr("%1\nLine %2, column %3")
+            .arg(xml.errorString())
+            .arg(xml.lineNumber())
+            .arg(xml.columnNumber());
 }
 //! [2]
 
 //! [3]
 void XbelReader::readXBEL()
 {
-    Q_ASSERT(isStartElement() && name() == "xbel");
+    Q_ASSERT(xml.isStartElement() && xml.name() == "xbel");
 
-    while (readNextStartElement()) {
-        if (name() == "folder")
+    while (xml.readNextStartElement()) {
+        if (xml.name() == "folder")
             readFolder(0);
-        else if (name() == "bookmark")
+        else if (xml.name() == "bookmark")
             readBookmark(0);
-        else if (name() == "separator")
+        else if (xml.name() == "separator")
             readSeparator(0);
         else
-            readUnknownElement();
+            xml.skipCurrentElement();
     }
 }
 //! [3]
@@ -103,9 +104,9 @@ void XbelReader::readXBEL()
 //! [4]
 void XbelReader::readTitle(QTreeWidgetItem *item)
 {
-    Q_ASSERT(isStartElement() && name() == "title");
+    Q_ASSERT(xml.isStartElement() && xml.name() == "title");
 
-    QString title = readElementText();
+    QString title = xml.readElementText();
     item->setText(0, title);
 }
 //! [4]
@@ -113,52 +114,52 @@ void XbelReader::readTitle(QTreeWidgetItem *item)
 //! [5]
 void XbelReader::readSeparator(QTreeWidgetItem *item)
 {
-    Q_ASSERT(isStartElement() && name() == "separator");
+    Q_ASSERT(xml.isStartElement() && xml.name() == "separator");
 
     QTreeWidgetItem *separator = createChildItem(item);
     separator->setFlags(item->flags() & ~Qt::ItemIsSelectable);
     separator->setText(0, QString(30, 0xB7));
-    skipCurrentElement();
+    xml.skipCurrentElement();
 }
 //! [5]
 
 void XbelReader::readFolder(QTreeWidgetItem *item)
 {
-    Q_ASSERT(isStartElement() && name() == "folder");
+    Q_ASSERT(xml.isStartElement() && xml.name() == "folder");
 
     QTreeWidgetItem *folder = createChildItem(item);
-    bool folded = (attributes().value("folded") != "no");
+    bool folded = (xml.attributes().value("folded") != "no");
     treeWidget->setItemExpanded(folder, !folded);
 
-    while (readNextStartElement()) {
-        if (name() == "title")
+    while (xml.readNextStartElement()) {
+        if (xml.name() == "title")
             readTitle(folder);
-        else if (name() == "folder")
+        else if (xml.name() == "folder")
             readFolder(folder);
-        else if (name() == "bookmark")
+        else if (xml.name() == "bookmark")
             readBookmark(folder);
-        else if (name() == "separator")
+        else if (xml.name() == "separator")
             readSeparator(folder);
         else
-            skipCurrentElement();
+            xml.skipCurrentElement();
     }
 }
 
 void XbelReader::readBookmark(QTreeWidgetItem *item)
 {
-    Q_ASSERT(isStartElement() && name() == "bookmark");
+    Q_ASSERT(xml.isStartElement() && xml.name() == "bookmark");
 
     QTreeWidgetItem *bookmark = createChildItem(item);
     bookmark->setFlags(bookmark->flags() | Qt::ItemIsEditable);
     bookmark->setIcon(0, bookmarkIcon);
     bookmark->setText(0, QObject::tr("Unknown title"));
-    bookmark->setText(1, attributes().value("href").toString());
+    bookmark->setText(1, xml.attributes().value("href").toString());
 
-    while (readNextStartElement()) {
-        if (name() == "title")
+    while (xml.readNextStartElement()) {
+        if (xml.name() == "title")
             readTitle(bookmark);
         else
-            skipCurrentElement();
+            xml.skipCurrentElement();
     }
 }
 
@@ -170,6 +171,6 @@ QTreeWidgetItem *XbelReader::createChildItem(QTreeWidgetItem *item)
     } else {
         childItem = new QTreeWidgetItem(treeWidget);
     }
-    childItem->setData(0, Qt::UserRole, name().toString());
+    childItem->setData(0, Qt::UserRole, xml.name().toString());
     return childItem;
 }
diff --git a/examples/xml/streambookmarks/xbelreader.h b/examples/xml/streambookmarks/xbelreader.h
index 80f0a2865..00d5850cb 100644
--- a/examples/xml/streambookmarks/xbelreader.h
+++ b/examples/xml/streambookmarks/xbelreader.h
@@ -51,7 +51,7 @@ class QTreeWidgetItem;
 QT_END_NAMESPACE
 
 //! [0]
-class XbelReader : public QXmlStreamReader
+class XbelReader
 {
 public:
 //! [1]
@@ -60,9 +60,10 @@ public:
 
     bool read(QIODevice *device);
 
+    QString errorString() const;
+
 private:
 //! [2]
-    void readUnknownElement();
     void readXBEL();
     void readTitle(QTreeWidgetItem *item);
     void readSeparator(QTreeWidgetItem *item);
@@ -71,6 +72,7 @@ private:
 
     QTreeWidgetItem *createChildItem(QTreeWidgetItem *item);
 
+    QXmlStreamReader xml;
     QTreeWidget *treeWidget;
 //! [2]
 
diff --git a/examples/xml/streambookmarks/xbelwriter.cpp b/examples/xml/streambookmarks/xbelwriter.cpp
index 3a2862a6b..58757f5cb 100644
--- a/examples/xml/streambookmarks/xbelwriter.cpp
+++ b/examples/xml/streambookmarks/xbelwriter.cpp
@@ -47,23 +47,23 @@
 XbelWriter::XbelWriter(QTreeWidget *treeWidget)
     : treeWidget(treeWidget)
 {
-    setAutoFormatting(true);
+    xml.setAutoFormatting(true);
 }
 //! [0]
 
 //! [1]
 bool XbelWriter::writeFile(QIODevice *device)
 {
-    setDevice(device);
+    xml.setDevice(device);
 
-    writeStartDocument();
-    writeDTD("<!DOCTYPE xbel>");
-    writeStartElement("xbel");
-    writeAttribute("version", "1.0");
+    xml.writeStartDocument();
+    xml.writeDTD("<!DOCTYPE xbel>");
+    xml.writeStartElement("xbel");
+    xml.writeAttribute("version", "1.0");
     for (int i = 0; i < treeWidget->topLevelItemCount(); ++i)
         writeItem(treeWidget->topLevelItem(i));
 
-    writeEndDocument();
+    xml.writeEndDocument();
     return true;
 }
 //! [1]
@@ -74,20 +74,20 @@ void XbelWriter::writeItem(QTreeWidgetItem *item)
     QString tagName = item->data(0, Qt::UserRole).toString();
     if (tagName == "folder") {
         bool folded = !treeWidget->isItemExpanded(item);
-        writeStartElement(tagName);
-        writeAttribute("folded", folded ? "yes" : "no");
-        writeTextElement("title", item->text(0));
+        xml.writeStartElement(tagName);
+        xml.writeAttribute("folded", folded ? "yes" : "no");
+        xml.writeTextElement("title", item->text(0));
         for (int i = 0; i < item->childCount(); ++i)
             writeItem(item->child(i));
-        writeEndElement();
+        xml.writeEndElement();
     } else if (tagName == "bookmark") {
-        writeStartElement(tagName);
+        xml.writeStartElement(tagName);
         if (!item->text(1).isEmpty())
-            writeAttribute("href", item->text(1));
-        writeTextElement("title", item->text(0));
-        writeEndElement();
+            xml.writeAttribute("href", item->text(1));
+        xml.writeTextElement("title", item->text(0));
+        xml.writeEndElement();
     } else if (tagName == "separator") {
-        writeEmptyElement(tagName);
+        xml.writeEmptyElement(tagName);
     }
 }
 //! [2]
diff --git a/examples/xml/streambookmarks/xbelwriter.h b/examples/xml/streambookmarks/xbelwriter.h
index 29a8b041e..b74d015ae 100644
--- a/examples/xml/streambookmarks/xbelwriter.h
+++ b/examples/xml/streambookmarks/xbelwriter.h
@@ -50,7 +50,7 @@ class QTreeWidgetItem;
 QT_END_NAMESPACE
 
 //! [0]
-class XbelWriter : public QXmlStreamWriter
+class XbelWriter
 {
 public:
     XbelWriter(QTreeWidget *treeWidget);
@@ -58,6 +58,7 @@ public:
 
 private:
     void writeItem(QTreeWidgetItem *item);
+    QXmlStreamWriter xml;
     QTreeWidget *treeWidget;
 };
 //! [0]