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/qscatterdataproxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qscatterdataproxy.cpp') diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index e0876d64..a58149a1 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -20,7 +20,7 @@ #include "qscatterdataproxy_p.h" #include "qscatter3dseries_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { /*! * \class QScatterDataProxy @@ -408,4 +408,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr() return static_cast(q_ptr); } -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/qscatterdataproxy.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qscatterdataproxy.cpp') diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index a58149a1..c9292727 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QScatterDataProxy + * \class QtDataVisualization::QScatterDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DScatter. * \since Qt Data Visualization 1.0 @@ -35,12 +35,18 @@ namespace QtDataVisualization { * \sa {Qt Data Visualization Data Handling} */ +/*! + * \typedef QtDataVisualization::QScatterDataArray + * + * A vector of QScatterDataItems. + */ + /*! * \qmltype ScatterDataProxy * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QScatterDataProxy + * \instantiates QtDataVisualization::QScatterDataProxy * \inherits AbstractDataProxy * \brief Base proxy class for Scatter3D. * @@ -277,6 +283,10 @@ const QScatterDataProxyPrivate *QScatterDataProxy::dptrc() const // QScatterDataProxyPrivate +/*! + * \class QtDataVisualization::QScatterDataProxyPrivate + * \internal + */ QScatterDataProxyPrivate::QScatterDataProxyPrivate(QScatterDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeScatter), m_dataArray(new QScatterDataArray) -- 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/qscatterdataproxy.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/datavisualization/data/qscatterdataproxy.cpp') diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index c9292727..7db508ea 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -20,10 +20,10 @@ #include "qscatterdataproxy_p.h" #include "qscatter3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QScatterDataProxy + * \class QScatterDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DScatter. * \since Qt Data Visualization 1.0 @@ -36,7 +36,7 @@ namespace QtDataVisualization { */ /*! - * \typedef QtDataVisualization::QScatterDataArray + * \typedef QScatterDataArray * * A vector of QScatterDataItems. */ @@ -46,7 +46,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QScatterDataProxy + * \instantiates QScatterDataProxy * \inherits AbstractDataProxy * \brief Base proxy class for Scatter3D. * @@ -283,10 +283,6 @@ const QScatterDataProxyPrivate *QScatterDataProxy::dptrc() const // QScatterDataProxyPrivate -/*! - * \class QtDataVisualization::QScatterDataProxyPrivate - * \internal - */ QScatterDataProxyPrivate::QScatterDataProxyPrivate(QScatterDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeScatter), m_dataArray(new QScatterDataArray) @@ -418,4 +414,4 @@ QScatterDataProxy *QScatterDataProxyPrivate::qptr() return static_cast(q_ptr); } -} +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/qscatterdataproxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qscatterdataproxy.cpp') diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 7db508ea..2a5ccbdb 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -36,9 +36,9 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION */ /*! - * \typedef QScatterDataArray + * \typedef QtDataVisualization::QScatterDataArray * - * A vector of QScatterDataItems. + * A vector of \l {QScatterDataItem}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/qscatterdataproxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/data/qscatterdataproxy.cpp') diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 2a5ccbdb..b5e3863d 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.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