diff options
| -rw-r--r-- | examples/photoAlbum/main.cpp | 5 | ||||
| -rw-r--r-- | src/qdataroles_p.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/photoAlbum/main.cpp b/examples/photoAlbum/main.cpp index d76b793..89171cb 100644 --- a/examples/photoAlbum/main.cpp +++ b/examples/photoAlbum/main.cpp @@ -21,8 +21,9 @@ ** ****************************************************************************/ -#include <QtCore/QSignalEvent> +#include <QtCore/QtCore> #include <QtGui/QtGui> + #include <qgraphicslistview.h> #include <qgraphicsgridview.h> #include <qlistdefaultmodel.h> @@ -152,7 +153,7 @@ void ViewTransition::onTransition(QEvent *event) { // set up the animation with the current item if (event->type() == QEvent::Signal) { - QSignalEvent *se = static_cast<QSignalEvent*>(event); + QStateMachine::SignalEvent *se = static_cast<QStateMachine::SignalEvent*>(event); QList<QVariant> args = se->arguments(); if (!args.isEmpty() && m_from && m_to) { const int index = args.at(0).toInt(); diff --git a/src/qdataroles_p.h b/src/qdataroles_p.h index 7c37584..f792524 100644 --- a/src/qdataroles_p.h +++ b/src/qdataroles_p.h @@ -75,8 +75,8 @@ public: UserRole = 32 }; - static QByteArray key(int value) { - const QMetaObject &metaObject = QtDataRoles().staticMetaObject;//static_cast<QtDataRoles*>(0)->staticQtMetaObject; + static QByteArray name(int value) { + const QMetaObject &metaObject = QtDataRoles().staticMetaObject; const int index = metaObject.indexOfEnumerator("ItemDataRole"); if (index == -1) qWarning() << "QtDataRoles: could not find ItemDataRoles enumerator"; @@ -85,7 +85,7 @@ public: } static int value(const QByteArray &name) { - const QMetaObject &metaObject = QtDataRoles().staticMetaObject;//static_cast<QtDataRoles*>(0)->staticQtMetaObject; + const QMetaObject &metaObject = QtDataRoles().staticMetaObject; const int index = metaObject.indexOfEnumerator("ItemDataRole"); if (index == -1) qWarning() << "QtDataRoles: could not find ItemDataRoles enumerator"; |