diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
| commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
| tree | bed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualization/data/qbardataproxy.cpp | |
| parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
| parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) | |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'src/datavisualization/data/qbardataproxy.cpp')
| -rw-r--r-- | src/datavisualization/data/qbardataproxy.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 1c1170ff..8e4f25de 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -16,7 +16,6 @@ ** ****************************************************************************/ -#include "qbardataproxy.h" #include "qbardataproxy_p.h" #include "qbar3dseries_p.h" @@ -26,7 +25,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \class QBarDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DBars. - * \since Qt Data Visualization 1.0 + * \since QtDataVisualization 1.0 * * QBarDataProxy handles adding, inserting, changing and removing rows of data. * @@ -554,7 +553,8 @@ void QBarDataProxyPrivate::setRow(int rowIndex, QBarDataRow *row, const QString } } -void QBarDataProxyPrivate::setRows(int rowIndex, const QBarDataArray &rows, const QStringList *labels) +void QBarDataProxyPrivate::setRows(int rowIndex, const QBarDataArray &rows, + const QStringList *labels) { QBarDataArray &dataArray = *m_dataArray; Q_ASSERT(rowIndex >= 0 && (rowIndex + rows.size()) <= dataArray.size()); @@ -604,7 +604,8 @@ void QBarDataProxyPrivate::insertRow(int rowIndex, QBarDataRow *row, const QStri m_dataArray->insert(rowIndex, row); } -void QBarDataProxyPrivate::insertRows(int rowIndex, const QBarDataArray &rows, const QStringList *labels) +void QBarDataProxyPrivate::insertRows(int rowIndex, const QBarDataArray &rows, + const QStringList *labels) { Q_ASSERT(rowIndex >= 0 && rowIndex <= m_dataArray->size()); if (labels) @@ -656,7 +657,8 @@ void QBarDataProxyPrivate::clearArray() * \internal * Fixes the row label array to include specified labels. */ -void QBarDataProxyPrivate::fixRowLabels(int startIndex, int count, const QStringList &newLabels, bool isInsert) +void QBarDataProxyPrivate::fixRowLabels(int startIndex, int count, const QStringList &newLabels, + bool isInsert) { bool changed = false; int currentSize = m_rowLabels.size(); |