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/qitemmodelbardataproxy_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/qitemmodelbardataproxy_p.h')
| -rw-r--r-- | src/datavisualization/data/qitemmodelbardataproxy_p.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/datavisualization/data/qitemmodelbardataproxy_p.h b/src/datavisualization/data/qitemmodelbardataproxy_p.h index fc646f0d..6f71429c 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy_p.h +++ b/src/datavisualization/data/qitemmodelbardataproxy_p.h @@ -31,8 +31,6 @@ #include "qitemmodelbardataproxy.h" #include "qbardataproxy_p.h" -#include <QPointer> -#include <QTimer> QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -50,6 +48,19 @@ private: BarItemModelHandler *m_itemModelHandler; + QString m_rowRole; + QString m_columnRole; + QString m_valueRole; + + // For row/column items, sort items into these categories. Other categories are ignored. + QStringList m_rowCategories; + QStringList m_columnCategories; + + bool m_useModelCategories; + bool m_autoRowCategories; + bool m_autoColumnCategories; + + friend class BarItemModelHandler; friend class QItemModelBarDataProxy; }; |