diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-26 14:53:50 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-27 11:29:30 +0200 |
| commit | 7c942cc0f497fe7e61ce6a10fce45771c0858e09 (patch) | |
| tree | aab5d2285b8e583f3565e305e0818a49503cf95c /src/datavisualization/data/abstractitemmodelhandler_p.h | |
| parent | e029d0ea1d486dd3dbbfa4519a2125da202f22e4 (diff) | |
Integrated item model mappings to item model proxies
Separate mapping object was redundant.
Task-number: QTRD-2564
Change-Id: I6b1a23ba52dbb184f46df0fdd64184eeb145c0c3
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/data/abstractitemmodelhandler_p.h')
| -rw-r--r-- | src/datavisualization/data/abstractitemmodelhandler_p.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index fbaaa1f9..b4d55b4a 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -36,8 +36,6 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE -class QAbstractDataMapping; - class AbstractItemModelHandler : public QObject { Q_OBJECT @@ -47,11 +45,6 @@ public: virtual void setItemModel(const QAbstractItemModel *itemModel); virtual const QAbstractItemModel *itemModel() const; - virtual void setActiveMapping(QAbstractDataMapping *mapping); - virtual QAbstractDataMapping *activeMapping() const; - virtual void addMapping(QAbstractDataMapping *mapping); - virtual void releaseMapping(QAbstractDataMapping *mapping); - virtual QList<QAbstractDataMapping *> mappings() const; public slots: virtual void handleColumnsInserted(const QModelIndex &parent, int start, int end); @@ -72,14 +65,15 @@ public slots: virtual void handleMappingChanged(); virtual void handlePendingResolve(); +signals: + void itemModelChanged(const QAbstractItemModel *itemModel); + protected: virtual void resolveModel() = 0; QPointer<const QAbstractItemModel> m_itemModel; // Not owned - QAbstractDataMapping *m_activeMapping; bool resolvePending; QTimer m_resolveTimer; - QList<QAbstractDataMapping *> m_mappings; private: Q_DISABLE_COPY(AbstractItemModelHandler) |