Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert "add QModelIndex::rowCount() and QModelIndex::ColumnCount convenience methods"

2 files changed, 1 insertions, 29 deletions

diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index fdbc5ba..dbf422e 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -1043,32 +1043,12 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 
 
 /*!
-    \since 4.7
-
-    \fn int QModelIndex::rowCount() const
-
-    Returns the number of children of this model index.
-
-    \sa columnCount(), parent(), child(), sibling(), model()
-*/
-
-/*!
-    \since 4.7
-
-    \fn int QModelIndex::columnCount() const
-
-    Returns the number of columns for the children of this model index.
-
-    \sa rowCount(), parent(), child(), sibling(), model()
-*/
-
-/*!
     \fn QModelIndex QModelIndex::parent() const
 
     Returns the parent of the model index, or QModelIndex() if it has no
     parent.
 
-    \sa child(), sibling(), rowCount(), columnCount(), model()
+    \sa child(), sibling(), model()
 */
 
 /*!
diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h
index d91c383..63d9e6f 100644
--- a/src/corelib/kernel/qabstractitemmodel.h
+++ b/src/corelib/kernel/qabstractitemmodel.h
@@ -68,8 +68,6 @@ public:
     inline int column() const { return c; }
     inline void *internalPointer() const { return p; }
     inline qint64 internalId() const { return reinterpret_cast<qint64>(p); }
-    inline int rowCount() const;
-    inline int columnCount() const;
     inline QModelIndex parent() const;
     inline QModelIndex sibling(int row, int column) const;
     inline QModelIndex child(int row, int column) const;
@@ -387,12 +385,6 @@ inline QModelIndex::QModelIndex(int arow, int acolumn, void *adata,
                                 const QAbstractItemModel *amodel)
     : r(arow), c(acolumn), p(adata), m(amodel) {}
 
-inline int QModelIndex::rowCount() const
-{ return m ? m->rowCount(*this) : 0; }
-
-inline int QModelIndex::columnCount() const
-{ return m ? m->columnCount(*this) : 0; }
-
 inline QModelIndex QModelIndex::parent() const
 { return m ? m->parent(*this) : QModelIndex(); }