From 467e729eabece018cd42eeee0160f932983561b0 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 7 Jan 2014 13:11:34 +0200 Subject: Rename axis classes Moved the '3D' in axis class names so that the classes would be in line with other '3D' classes. Task-number: QTRD-2674 Change-Id: Ie4f8a10babe3bf1b0b30b366863f55ed02ec66ba Reviewed-by: Mika Salmela --- src/datavisualization/data/qbardataproxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/data/qbardataproxy.cpp') diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 80768059..71680ff2 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -38,7 +38,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * If you use QBarDataRow pointers to directly modify data after adding the array to the proxy, * you must also emit proper signal to make the graph update. * - * QBarDataProxy optionally keeps track of row and column labels, which Q3DCategoryAxis can utilize + * QBarDataProxy optionally keeps track of row and column labels, which QCategory3DAxis can utilize * to show axis labels. The row and column labels are stored in separate array from the data and * row manipulation methods provide an alternate versions that don't affect the row labels. * This enables the option of having row labels that relate to the position of the data in the -- cgit v1.2.3 From 64d6b482bfb9dbacd548b72cb9c073513f6aa56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 Jan 2014 11:34:59 +0200 Subject: Removed QDataVis and namespace macros - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qbardataproxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qbardataproxy.cpp') diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 71680ff2..5c89f7d4 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -20,7 +20,7 @@ #include "qbardataproxy_p.h" #include "qbar3dseries_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { /*! * \class QBarDataProxy @@ -713,4 +713,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series) emit qptr()->seriesChanged(barSeries); } -QT_DATAVISUALIZATION_END_NAMESPACE +} -- cgit v1.2.3 From 3e7dc5bd1769e4578733f7ce0f4eba72346b6d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 09:29:38 +0200 Subject: Docs updated after namespace macro removal - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qbardataproxy.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qbardataproxy.cpp') diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 5c89f7d4..93645f38 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QBarDataProxy + * \class QtDataVisualization::QBarDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DBars. * \since Qt Data Visualization 1.0 @@ -47,12 +47,24 @@ namespace QtDataVisualization { * \sa {Qt Data Visualization Data Handling} */ +/*! + * \typedef QtDataVisualization::QBarDataRow + * + * A vector of QBarDataItems. + */ + +/*! + * \typedef QtDataVisualization::QBarDataArray + * + * A list of pointers to QBarDataRows. + */ + /*! * \qmltype BarDataProxy * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QBarDataProxy + * \instantiates QtDataVisualization::QBarDataProxy * \inherits AbstractDataProxy * \brief Base proxy type for Bars3D. * @@ -481,6 +493,10 @@ const QBarDataProxyPrivate *QBarDataProxy::dptrc() const // QBarDataProxyPrivate +/*! + * \class QtDataVisualization::QBarDataProxyPrivate + * \internal + */ QBarDataProxyPrivate::QBarDataProxyPrivate(QBarDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeBar), m_dataArray(new QBarDataArray) -- cgit v1.2.3 From 8674307d6bafabfcaedfe175b883313f0e7d88b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 13:33:57 +0200 Subject: Reintroduced namespace macros Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qbardataproxy.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/datavisualization/data/qbardataproxy.cpp') diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 93645f38..351575a1 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -20,10 +20,10 @@ #include "qbardataproxy_p.h" #include "qbar3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QBarDataProxy + * \class QBarDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DBars. * \since Qt Data Visualization 1.0 @@ -48,13 +48,13 @@ namespace QtDataVisualization { */ /*! - * \typedef QtDataVisualization::QBarDataRow + * \typedef QBarDataRow * * A vector of QBarDataItems. */ /*! - * \typedef QtDataVisualization::QBarDataArray + * \typedef QBarDataArray * * A list of pointers to QBarDataRows. */ @@ -64,7 +64,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QBarDataProxy + * \instantiates QBarDataProxy * \inherits AbstractDataProxy * \brief Base proxy type for Bars3D. * @@ -493,10 +493,6 @@ const QBarDataProxyPrivate *QBarDataProxy::dptrc() const // QBarDataProxyPrivate -/*! - * \class QtDataVisualization::QBarDataProxyPrivate - * \internal - */ QBarDataProxyPrivate::QBarDataProxyPrivate(QBarDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeBar), m_dataArray(new QBarDataArray) @@ -729,4 +725,4 @@ void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series) emit qptr()->seriesChanged(barSeries); } -} +QT_END_NAMESPACE_DATAVISUALIZATION -- cgit v1.2.3 From 01b9609c35227a2398ed2a39ebb1da2265bf3396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 17 Jan 2014 08:20:49 +0200 Subject: Reintroduced namespace macros, part 2 Added changes lost in merge Task-number: QTRD-2594 Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qbardataproxy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/datavisualization/data/qbardataproxy.cpp') diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 351575a1..9957e8af 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -48,15 +48,15 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION */ /*! - * \typedef QBarDataRow + * \typedef QtDataVisualization::QBarDataRow * - * A vector of QBarDataItems. + * A vector of \l {QBarDataItem}s. */ /*! - * \typedef QBarDataArray + * \typedef QtDataVisualization::QBarDataArray * - * A list of pointers to QBarDataRows. + * A list of pointers to \l {QBarDataRow}s. */ /*! -- cgit v1.2.3 From 3b57eb8aaef9886a9975b7b861f31bdf8ed15fdb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 27 Jan 2014 08:18:03 +0200 Subject: Fix copyright year Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qbardataproxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/data/qbardataproxy.cpp') diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 9957e8af..a26e446e 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** -- cgit v1.2.3