From e9b0c9a1d25a2260bd7c0e7ead840cacb31ce424 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 2 Feb 2010 10:50:49 +0100
Subject: Revert "add QModelIndex::rowCount() and QModelIndex::ColumnCount
 convenience methods"

This reverts commit c74deadf4b7eeb2800b318e0952dac8f700d9236.

The convinience method are missleading because it does not work
for the root model index.

Also, the test is missing, and the function should have been added
in the mirror class QPersistentModelIndex

Reviewed-by: Thierry
Reviewed-by: Leo
---
 src/corelib/kernel/qabstractitemmodel.cpp | 22 +---------------------
 src/corelib/kernel/qabstractitemmodel.h   |  8 --------
 2 files changed, 1 insertion(+), 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(); }
 
-- 
cgit v0.12