1 files changed, 22 insertions, 2 deletions
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h
index 78f3d789..758700df 100644
--- a/src/datavisualization/data/qbardataproxy.h
+++ b/src/datavisualization/data/qbardataproxy.h
@@ -22,6 +22,7 @@
 #include <QtDataVisualization/qabstractdataproxy.h>
 #include <QtDataVisualization/qbardataitem.h>
 #include <QVector>
+#include <QStringList>
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
@@ -35,7 +36,8 @@ class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy
     Q_OBJECT
 
     Q_PROPERTY(int rowCount READ rowCount)
-
+    Q_PROPERTY(QStringList rowLabels READ rowLabels WRITE setRowLabels NOTIFY rowLabelsChanged)
+    Q_PROPERTY(QStringList columnLabels READ columnLabels WRITE setColumnLabels NOTIFY columnLabelsChanged)
 public:
     explicit QBarDataProxy(QObject *parent = 0);
     virtual ~QBarDataProxy();
@@ -50,14 +52,25 @@ public:
     */
 
     int rowCount() const;
+
+    QStringList rowLabels() const;
+    void setRowLabels(const QStringList &labels);
+    QStringList columnLabels() const;
+    void setColumnLabels(const QStringList &labels);
+
     const QBarDataArray *array() const;
     const QBarDataRow *rowAt(int rowIndex) const;
     const QBarDataItem *itemAt(int rowIndex, int columnIndex) const;
 
+    void resetArray();
     void resetArray(QBarDataArray *newArray);
+    void resetArray(QBarDataArray *newArray, const QStringList &rowLabels,
+                    const QStringList &columnLabels);
 
     void setRow(int rowIndex, QBarDataRow *row);
+    void setRow(int rowIndex, QBarDataRow *row, const QString &label);
     void setRows(int rowIndex, const QBarDataArray &rows);
+    void setRows(int rowIndex, const QBarDataArray &rows, const QStringList &labels);
 
     // Setting a column is comparatively inefficient as it changes all rows.
     // Can resize rows that are shorter than columnIndex.
@@ -69,16 +82,20 @@ public:
     // TODO setItems(int rowIndex, int columnIndex, QBarDataArray *items);
 
     int addRow(QBarDataRow *row);
+    int addRow(QBarDataRow *row, const QString &label);
     int addRows(const QBarDataArray &rows);
+    int addRows(const QBarDataArray &rows, const QStringList &labels);
     // TODO int addColumn(const QBarDataRow &column); // returns the index of the added column
     // TODO int addColumns(const QBarDataArray &columns); // returns the index of the first added column
 
     void insertRow(int rowIndex, QBarDataRow *row);
+    void insertRow(int rowIndex, QBarDataRow *row, const QString &label);
     void insertRows(int rowIndex, const QBarDataArray &rows);
+    void insertRows(int rowIndex, const QBarDataArray &rows, const QStringList &labels);
     // TODO void insertColumn(int columnIndex, const QBarDataRow &column);
     // TODO void insertColumns(int columnIndex, const QBarDataArray &columns);
 
-    void removeRows(int rowIndex, int removeCount);
+    void removeRows(int rowIndex, int removeCount, bool removeLabels = true);
     // TODO void removeColumns(int columnIndex, int removeCount);
 
 signals:
@@ -94,6 +111,9 @@ signals:
     void itemChanged(int rowIndex, int columnIndex); // TODO remove once itemsChanged is added?
     // TODO void itemsChanged(int rowIndex, int columnIndex, int rowCount, int columnCount);
 
+    void rowLabelsChanged();
+    void columnLabelsChanged();
+
 protected:
     explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = 0);
     QBarDataProxyPrivate *dptr();