diff options
-rw-r--r-- | src/common/qmenumodel.cpp | 6 | ||||
-rw-r--r-- | src/common/qmenumodel.h | 1 | ||||
-rw-r--r-- | tests/client/modeltest.cpp | 8 |
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() |