From 57b1e3f69f7d1bb05ebc958dd27cc6743e063fb4 Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Thu, 4 Oct 2012 08:51:45 +0200 Subject: =?UTF-8?q?Remove=20the=20implementation=20of=20columnCount.=20Acc?= =?UTF-8?q?ording=20to=20the=20documentation=20(http://doc.qt.digia.com/st?= =?UTF-8?q?able/model-view-programming.html#model-subclassing-reference),?= =?UTF-8?q?=20=C2=AB=20List=20models=20do=20not=20provide=20this=20functio?= =?UTF-8?q?n=20because=20it=20is=20already=20implemented=20in=20QAbstractL?= =?UTF-8?q?istModel.=20=C2=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/qmenumodel.cpp | 6 ------ src/common/qmenumodel.h | 1 - 2 files changed, 7 deletions(-) (limited to 'src/common') 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 @@ -90,12 +90,6 @@ GMenuModel *QMenuModel::menuModel() const return m_menuModel; } -/*! \internal */ -int QMenuModel::columnCount(const QModelIndex &) const -{ - return 1; -} - /*! \internal */ QVariant QMenuModel::data(const QModelIndex &index, int role) const { 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; -- cgit v1.2.3