Get QListModelInterface back in line with itemviews_ng.

2 files changed, 0 insertions, 23 deletions

diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp
index e440cac..d327b58 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.cpp
+++ b/src/declarative/3rdparty/qlistmodelinterface.cpp
@@ -78,12 +78,6 @@ QT_BEGIN_NAMESPACE
   QVariant values to roles.
 */
 
-/*! \fn bool QListModelInterface::setData(int index, const QVariant &value, int role)
-  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
   Returns the list of roles for which the list model interface
   provides data.
diff --git a/src/declarative/3rdparty/qlistmodelinterface.h b/src/declarative/3rdparty/qlistmodelinterface.h
index fd69edd..191a95b 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.h
+++ b/src/declarative/3rdparty/qlistmodelinterface.h
@@ -60,31 +60,14 @@ class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject
     QListModelInterface(QObject *parent = 0) : QObject(parent) {}
     virtual ~QListModelInterface() {}
 
-    // ### move these into the Qt namespace
-    enum Roles {
-        TextRole = Qt::DisplayRole,
-        IconRole = Qt::DecorationRole
-    };
-
     virtual int count() 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,QVariant> &values)
     { Q_UNUSED(index); Q_UNUSED(values); return false; }
 
-    inline bool setData(int index, const QVariant &value, int role)
-    {
-        QHash<int,QVariant> values;
-        values.insert(role, value);
-        return setData(index, values);
-    }
-
     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);
-
  Q_SIGNALS:
     void itemsInserted(int index, int count);
     void itemsRemoved(int index, int count);