2 files changed, 9 insertions, 22 deletions
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp
index 7e50378..e440cac 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.cpp
+++ b/src/declarative/3rdparty/qlistmodelinterface.cpp
@@ -69,22 +69,22 @@ QT_BEGIN_NAMESPACE
   Returns the number of data entries in the model.
 */
 
-/*! \fn QHash_int QListModelInterface::data(int index, const QList_int &roles) const
+/*! \fn QHash_int QListModelInterface::data(int index, const QList<int> &roles) const
   Returns the data at the given \a index for the specifed \a roles.
 */
 
-/*! \fn bool QListModelInterface::setData(int index, const QHash_int &values)
+/*! \fn bool QListModelInterface::setData(int index, const QHash<int> &values)
   Sets the data at the given \a index. \a values is a mapping of
   QVariant values to roles.
 */
 
 /*! \fn bool QListModelInterface::setData(int index, const QVariant &value, int role)
-  This convenience function builds a QHash_int from
+  This convenience function builds a QHash<int> from
   the specified \a role and \a value and calls the other setData()
   with the QHash and the \a index.
 */
 
-/*! \fn QList_int QListModelInterface::roles() const
+/*! \fn QList<int> QListModelInterface::roles() const
   Returns the list of roles for which the list model interface
   provides data.
 */
@@ -102,15 +102,4 @@ QT_BEGIN_NAMESPACE
   \value IconRole
 */ 
 
-/*!
-  \typedef QListModelInterface::QHash_int
-  
-  Synonym for QHash<int, QVariant>.
-*/
-
-/*!
-  \typedef QListModelInterface::QList_int
-  
-  Synonym for QList<int>.
-*/
 QT_END_NAMESPACE
diff --git a/src/declarative/3rdparty/qlistmodelinterface.h b/src/declarative/3rdparty/qlistmodelinterface.h
index 8a0cf44..fd69edd 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.h
+++ b/src/declarative/3rdparty/qlistmodelinterface.h
@@ -68,21 +68,19 @@ class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject
 
     virtual int count() const = 0;
 
-    typedef QHash<int, QVariant> QHash_int;
-    typedef QList<int> QList_int;
-    virtual QHash_int data(int index, const QList_int &roles = QList_int()) const = 0;
+    virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const = 0;
 
-    virtual bool setData(int index, const QHash_int &values) 
+    virtual bool setData(int index, const QHash<int,QVariant> &values)
     { Q_UNUSED(index); Q_UNUSED(values); return false; }
 
     inline bool setData(int index, const QVariant &value, int role)
     {
-        QHash_int values;
+        QHash<int,QVariant> values;
         values.insert(role, value);
         return setData(index, values);
     }
 
-    virtual QList_int roles() const = 0;
+    virtual QList<int> roles() const = 0;
     virtual QString toString(int role) const = 0;
 
     //void bind(int index, int role, QObject *object, const char *propertyName, bool readOnly = true);
@@ -91,7 +89,7 @@ class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject
     void itemsInserted(int index, int count);
     void itemsRemoved(int index, int count);
     void itemsMoved(int from, int to, int count);
-    void itemsChanged(int index, int count, const QList_int &roles);
+    void itemsChanged(int index, int count, const QList<int> &roles);
 
  protected:
     QListModelInterface(QObjectPrivate &dd, QObject *parent)