Make the examples compile and run again.

11 files changed, 46 insertions, 44 deletions

diff --git a/examples/gridView/test.cpp b/examples/gridView/test.cpp
index ea2b403..3cd8b09 100644
--- a/examples/gridView/test.cpp
+++ b/examples/gridView/test.cpp
@@ -38,13 +38,13 @@ int Test::count() const
     return icons.count();
 }
 
-QHash<int,QVariant> Test::data(int index, const QList<int> &roles) const
+QHash<QByteArray,QVariant> Test::data(int index, const QList<QByteArray> &roles) const
 {
-    QHash<int,QVariant> hash;
+    QHash<QByteArray,QVariant> hash;
     if (index >= 0 && index < icons.count())
         for (int i = 0; i < roles.count(); ++i)
-            if (roles.at(i) == Qt::DecorationRole)
-                hash.insert(Qt::DecorationRole, icons.at(index));
+            if (roles.at(i) == "DecorationRole")
+                hash.insert("DecorationRole", icons.at(index));
     return hash;
 }
 
diff --git a/examples/gridView/test.h b/examples/gridView/test.h
index dc29219..69060c5 100644
--- a/examples/gridView/test.h
+++ b/examples/gridView/test.h
@@ -35,7 +35,7 @@ public:
     ~Test();
 
     virtual int count() const;
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles) const;
+    virtual QHash<QByteArray,QVariant> data(int index, const QList<QByteArray> &roles) const;
 
     // non-standard interface
     bool moveItems(int from, int to, int count);
diff --git a/examples/listModel/model.cpp b/examples/listModel/model.cpp
index d18da24..bea8592 100644
--- a/examples/listModel/model.cpp
+++ b/examples/listModel/model.cpp
@@ -38,22 +38,22 @@ int Model::count() const
     return strings.count();
 }
 
-QHash<int,QVariant> Model::data(int index, const QList<int> &roles) const
+QHash<QByteArray,QVariant> Model::data(int index, const QList<QByteArray> &roles) const
 {
-    QHash<int,QVariant> hash;
+    QHash<QByteArray,QVariant> hash;
     if (index >= 0 && index < strings.count())
         for (int i = 0; i < roles.count(); ++i)
-            if (roles.at(i) == Qt::DisplayRole)
-                hash.insert(Qt::DisplayRole, strings.at(index) + QString::number(index));
+            if (roles.at(i) == "DisplayRole")
+                hash.insert("DisplayRole", strings.at(index) + QString::number(index));
     return hash;
 }
 
-bool Model::setData(int index, const QHash<int,QVariant> &values)
+bool Model::setData(int index, const QHash<QByteArray,QVariant> &values)
 {
-    QHash<int,QVariant>::const_iterator it = values.find(Qt::DisplayRole);
+    QHash<QByteArray,QVariant>::const_iterator it = values.find("DisplayRole");
     if (it != values.end()) {
         strings[index] = it.value().toString();
-        emit itemsChanged(index, 1, QList<int>() << Qt::DisplayRole);
+        emit itemsChanged(index, 1, QList<QByteArray>() << "DisplayRole");
         return true;
     }
     return false;
diff --git a/examples/listModel/model.h b/examples/listModel/model.h
index 331d14a..e738e05 100644
--- a/examples/listModel/model.h
+++ b/examples/listModel/model.h
@@ -34,8 +34,8 @@ public:
     ~Model();
 
     virtual int count() const;
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles) const;
-    virtual bool setData(int index, const QHash<int,QVariant> &values);
+    virtual QHash<QByteArray,QVariant> data(int index, const QList<QByteArray> &roles) const;
+    virtual bool setData(int index, const QHash<QByteArray,QVariant> &values);
 
     // non-standard interface
     bool insertItems(int index, int count);
diff --git a/examples/pathView/test.cpp b/examples/pathView/test.cpp
index 69f44a8..6fecb57 100644
--- a/examples/pathView/test.cpp
+++ b/examples/pathView/test.cpp
@@ -38,13 +38,13 @@ int Test::count() const
     return icons.count();
 }
 
-QHash<int,QVariant> Test::data(int index, const QList<int> &roles) const
+QHash<QByteArray,QVariant> Test::data(int index, const QList<QByteArray> &roles) const
 {
-    QHash<int,QVariant> hash;
+    QHash<QByteArray,QVariant> hash;
     if (index >= 0 && index < icons.count())
         for (int i = 0; i < roles.count(); ++i)
-            if (roles.at(i) == Qt::DecorationRole)
-                hash.insert(Qt::DecorationRole, icons.at(index));
+            if (roles.at(i) == "DecorationRole")
+                hash.insert("DecorationRole", icons.at(index));
     return hash;
 }
 
diff --git a/examples/pathView/test.h b/examples/pathView/test.h
index dc29219..69060c5 100644
--- a/examples/pathView/test.h
+++ b/examples/pathView/test.h
@@ -35,7 +35,7 @@ public:
     ~Test();
 
     virtual int count() const;
-    virtual QHash<int,QVariant> data(int index, const QList<int> &roles) const;
+    virtual QHash<QByteArray,QVariant> data(int index, const QList<QByteArray> &roles) const;
 
     // non-standard interface
     bool moveItems(int from, int to, int count);
diff --git a/examples/photoAlbum/main.cpp b/examples/photoAlbum/main.cpp
index c106b31..d76b793 100644
--- a/examples/photoAlbum/main.cpp
+++ b/examples/photoAlbum/main.cpp
@@ -21,6 +21,7 @@
 **
 ****************************************************************************/
 
+#include <QtCore/QSignalEvent>
 #include <QtGui/QtGui>
 #include <qgraphicslistview.h>
 #include <qgraphicsgridview.h>
@@ -60,7 +61,7 @@ QSizeF Photo::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 void Photo::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
     Q_UNUSED(widget);
-    const QPixmap pixmap = qvariant_cast<QPixmap>(data().value(Qt::DecorationRole));
+    const QPixmap pixmap = qvariant_cast<QPixmap>(data().value("DecorationRole"));
     const QSizeF bounded = pixmap.size().boundedTo(option->rect.size());
     QSizeF scaled = pixmap.size();
     scaled.scale(bounded, Qt::KeepAspectRatio);
@@ -155,7 +156,8 @@ void ViewTransition::onTransition(QEvent *event)
         QList<QVariant> args = se->arguments();
         if (!args.isEmpty() && m_from && m_to) {
             const int index = args.at(0).toInt();
-            m_to->setOffsetToEnsureIndexIsVisible(index); // ### FIXME center on item
+            const qreal offset = m_to->offsetToEnsureIndexIsVisible(index);
+            m_to->setOffset(offset); // ### FIXME center on item
             m_to->doLayout(); // ensure the item is layed out
             qobject_cast<QtKineticListController*>(m_to->controller())->stop();
             m_animation->setTargetObject(reinterpret_cast<QObject*>(m_to->itemForIndex(index)));
@@ -183,23 +185,23 @@ int main(int argc, char *argv[])
     QtListDefaultModel *model = new QtListDefaultModel(&widget);
 
     QtListDefaultItem *item = new QtListDefaultItem;
-    item->setData(QPixmap(":images/go.jpg"), Qt::DecorationRole);
+    item->setData(QPixmap(":images/go.jpg"), "DecorationRole");
     model->appendItem(item);
 
     item = new QtListDefaultItem;
-    item->setData(QPixmap(":images/contrast.jpg"), Qt::DecorationRole);
+    item->setData(QPixmap(":images/contrast.jpg"), "DecorationRole");
     model->appendItem(item);
 
     item = new QtListDefaultItem;
-    item->setData(QPixmap(":images/nightfall.jpg"), Qt::DecorationRole);
+    item->setData(QPixmap(":images/nightfall.jpg"), "DecorationRole");
     model->appendItem(item);
 
     item = new QtListDefaultItem;
-    item->setData(QPixmap(":images/flower.jpg"), Qt::DecorationRole);
+    item->setData(QPixmap(":images/flower.jpg"), "DecorationRole");
     model->appendItem(item);
 
     item = new QtListDefaultItem;
-    item->setData(QPixmap(":images/beach.jpg"), Qt::DecorationRole);
+    item->setData(QPixmap(":images/beach.jpg"), "DecorationRole");
     model->appendItem(item);
 
     // selections
diff --git a/examples/tableModel/model.cpp b/examples/tableModel/model.cpp
index aeece9b..eaf9bc1 100644
--- a/examples/tableModel/model.cpp
+++ b/examples/tableModel/model.cpp
@@ -27,19 +27,19 @@ MyModel::MyModel(QObject *parent)
 {
 }
 
-QHash<int, QVariant> MyModel::data(int row, int column, const QList<int> &roles) const
+QHash<QByteArray, QVariant> MyModel::data(int row, int column, const QList<QByteArray> &roles) const
 {
-    QHash<int, QVariant> answer;
-    if (roles.contains(Qt::DisplayRole)) {
+    QHash<QByteArray, QVariant> answer;
+    if (roles.contains("DisplayRole")) {
         switch (column) {
         case 0:
-            answer.insert(Qt::DisplayRole, QString::number(row+1));
+            answer.insert("DisplayRole", QString::number(row+1));
             break;
         case 1:
-            answer.insert(Qt::DisplayRole, QString::number((row+1) % 10));
+            answer.insert("DisplayRole", QString::number((row+1) % 10));
             break;
         case 2:
-            answer.insert(Qt::DisplayRole, QString::number((row+1) % 100));
+            answer.insert("DisplayRole", QString::number((row+1) % 100));
             break;
         case 3: {
             QString x;
@@ -48,12 +48,12 @@ QHash<int, QVariant> MyModel::data(int row, int column, const QList<int> &roles)
                 case 1: x = "Remember"; break;
                 case 2: x = "The"; break;
             }
-            answer.insert(Qt::DisplayRole, x);
+            answer.insert("DisplayRole", x);
             break;
         }
         default:
             if (row == 0)
-                answer.insert(Qt::DisplayRole, QString("Filler space here"));
+                answer.insert("DisplayRole", QString("Filler space here"));
         }
     }
     return answer;
diff --git a/examples/tableModel/model.h b/examples/tableModel/model.h
index 6e72b70..8b5bc4c 100644
--- a/examples/tableModel/model.h
+++ b/examples/tableModel/model.h
@@ -29,7 +29,7 @@ class MyModel : public QtTableModelInterface {
 public:
     MyModel(QObject *parent = 0);
 
-    virtual QHash<int, QVariant> data(int row, int column, const QList<int> &roles = QList<int>()) const;
+    virtual QHash<QByteArray, QVariant> data(int row, int column, const QList<QByteArray> &roles = QList<QByteArray>()) const;
 
     virtual int rowCount() const;
     virtual int columnCount() const;
diff --git a/examples/treeModel/test.cpp b/examples/treeModel/test.cpp
index 682f630..30d9900 100644
--- a/examples/treeModel/test.cpp
+++ b/examples/treeModel/test.cpp
@@ -70,22 +70,22 @@ Node *Test::previousSibling(Node *node) const
     return prev;
 }
 
-QHash<int,QVariant> Test::data(Node *node, int column, const QList<int> &roles) const
+QHash<QByteArray,QVariant> Test::data(Node *node, int column, const QList<QByteArray> &roles) const
 {
-    QHash<int,QVariant> values;
+    QHash<QByteArray,QVariant> values;
     if (node && column == 0)
         for (int i = 0; i < roles.count(); ++i)
-            if (roles.at(i) == Qt::DisplayRole)
-                values.insert(Qt::DisplayRole, node->text);
+            if (roles.at(i) == "DisplayRole")
+                values.insert("DisplayRole", node->text);
     return values;
 }
 
-bool Test::setData(const QVariant &data, Node *node, int column, int role)
+bool Test::setData(const QVariant &data, Node *node, int column, const QByteArray &role)
 {
-    if (node && column == 0 && role == Qt::DisplayRole) {
+    if (node && column == 0 && role == "DisplayRole") {
         node->text = data.toString();
         Test::iterator it = iterator(node, this);
-        emit itemsChanged(it, 1, QList<int>() << Qt::DisplayRole);
+        emit itemsChanged(it, 1, QList<QByteArray>() << "DisplayRole");
     }
     return !!node;
 }
diff --git a/examples/treeModel/test.h b/examples/treeModel/test.h
index e9e3e4e..a16f1a8 100644
--- a/examples/treeModel/test.h
+++ b/examples/treeModel/test.h
@@ -45,8 +45,8 @@ public:
     Node *nextSibling(Node *node) const;
     Node *previousSibling(Node *node) const;
     Node *parentItem(Node *node) const;
-    QHash<int,QVariant> data(Node *node, int column, const QList<int> &roles) const;
-    bool setData(const QVariant &data, Node *node, int column, int role);
+    QHash<QByteArray,QVariant> data(Node *node, int column, const QList<QByteArray> &roles) const;
+    bool setData(const QVariant &data, Node *node, int column, const QByteArray &role);
     bool isValid(Node *node) const;
 
     // Model specific API