aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-04 08:51:45 +0200
committerOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-04 08:51:45 +0200
commit57b1e3f69f7d1bb05ebc958dd27cc6743e063fb4 (patch)
tree64c907c28a88f7343fc8c810455af2d555a2397e
parent90bd3a7ca55307380766036c9eaac058f5e3b4f5 (diff)
downloadqmenumodel-57b1e3f69f7d1bb05ebc958dd27cc6743e063fb4.tar.gz
qmenumodel-57b1e3f69f7d1bb05ebc958dd27cc6743e063fb4.tar.bz2
qmenumodel-57b1e3f69f7d1bb05ebc958dd27cc6743e063fb4.zip
Remove the implementation of columnCount.
According to the documentation (http://doc.qt.digia.com/stable/model-view-programming.html#model-subclassing-reference), « List models do not provide this function because it is already implemented in QAbstractListModel. »
-rw-r--r--src/common/qmenumodel.cpp6
-rw-r--r--src/common/qmenumodel.h1
-rw-r--r--tests/client/modeltest.cpp8
3 files changed, 0 insertions, 15 deletions
diff --git a/src/common/qmenumodel.cpp b/src/common/qmenumodel.cpp
index cc760c1..e88bc66 100644
--- a/src/common/qmenumodel.cpp
+++ b/src/common/qmenumodel.cpp
@@ -91,12 +91,6 @@ GMenuModel *QMenuModel::menuModel() const
}
/*! \internal */
-int QMenuModel::columnCount(const QModelIndex &) const
-{
- return 1;
-}
-
-/*! \internal */
QVariant QMenuModel::data(const QModelIndex &index, int role) const
{
QVariant attribute;
diff --git a/src/common/qmenumodel.h b/src/common/qmenumodel.h
index ba5696d..598efd6 100644
--- a/src/common/qmenumodel.h
+++ b/src/common/qmenumodel.h
@@ -39,7 +39,6 @@ public:
~QMenuModel();
/* QAbstractItemModel */
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QModelIndex parent (const QModelIndex &index) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp
index ee3e0f4..76a3e97 100644
--- a/tests/client/modeltest.cpp
+++ b/tests/client/modeltest.cpp
@@ -57,14 +57,6 @@ private Q_SLOTS:
}
/*
- * Test if columnCount is always 1
- */
- void testColumnCount()
- {
- QCOMPARE(m_model.columnCount(), 1);
- }
-
- /*
* Test if parent function always return a empty QModelIndex
*/
void testParent()