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/qsurfacedataproxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qsurfacedataproxy.cpp') diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index 5ea05d75..e3a6cb13 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -20,7 +20,7 @@ #include "qsurfacedataproxy_p.h" #include "qsurface3dseries_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { /*! * \class QSurfaceDataProxy @@ -520,4 +520,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series) emit qptr()->seriesChanged(surfaceSeries); } -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/qsurfacedataproxy.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/data/qsurfacedataproxy.cpp') diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index e3a6cb13..dbfcfa86 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QSurfaceDataProxy + * \class QtDataVisualization::QSurfaceDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DSurface. * \since Qt Data Visualization 1.0 @@ -56,12 +56,24 @@ namespace QtDataVisualization { * \sa {Qt Data Visualization Data Handling} */ +/*! + * \typedef QtDataVisualization::QSurfaceDataRow + * + * A vector of QSurfaceDataItems. + */ + +/*! + * \typedef QtDataVisualization::QSurfaceDataArray + * + * A list of pointers to QSurfaceDataRows. + */ + /*! * \qmltype SurfaceDataProxy * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QSurfaceDataProxy + * \instantiates QtDataVisualization::QSurfaceDataProxy * \inherits AbstractDataProxy * \brief Base proxy class for Surface3D. * @@ -347,6 +359,10 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const // QSurfaceDataProxyPrivate // +/*! + * \class QtDataVisualization::QSurfaceDataProxyPrivate + * \internal + */ QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface), m_dataArray(new QSurfaceDataArray) -- 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/qsurfacedataproxy.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/datavisualization/data/qsurfacedataproxy.cpp') diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index dbfcfa86..541b1d8f 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -20,10 +20,10 @@ #include "qsurfacedataproxy_p.h" #include "qsurface3dseries_p.h" -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! - * \class QtDataVisualization::QSurfaceDataProxy + * \class QSurfaceDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DSurface. * \since Qt Data Visualization 1.0 @@ -57,13 +57,13 @@ namespace QtDataVisualization { */ /*! - * \typedef QtDataVisualization::QSurfaceDataRow + * \typedef QSurfaceDataRow * * A vector of QSurfaceDataItems. */ /*! - * \typedef QtDataVisualization::QSurfaceDataArray + * \typedef QSurfaceDataArray * * A list of pointers to QSurfaceDataRows. */ @@ -73,7 +73,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QtDataVisualization::QSurfaceDataProxy + * \instantiates QSurfaceDataProxy * \inherits AbstractDataProxy * \brief Base proxy class for Surface3D. * @@ -359,10 +359,6 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const // QSurfaceDataProxyPrivate // -/*! - * \class QtDataVisualization::QSurfaceDataProxyPrivate - * \internal - */ QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface), m_dataArray(new QSurfaceDataArray) @@ -536,4 +532,4 @@ void QSurfaceDataProxyPrivate::setSeries(QAbstract3DSeries *series) emit qptr()->seriesChanged(surfaceSeries); } -} +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/qsurfacedataproxy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/datavisualization/data/qsurfacedataproxy.cpp') diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index 541b1d8f..bcb60f8c 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -57,15 +57,15 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION */ /*! - * \typedef QSurfaceDataRow + * \typedef QtDataVisualization::QSurfaceDataRow * - * A vector of QSurfaceDataItems. + * A vector of \l {QSurfaceDataItem}s. */ /*! - * \typedef QSurfaceDataArray + * \typedef QtDataVisualization::QSurfaceDataArray * - * A list of pointers to QSurfaceDataRows. + * A list of pointers to \l {QSurfaceDataRow}s. */ /*! -- cgit v1.2.3 From 892bd7976b2980947adf216b8afc5c6f2a63ce65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 22 Jan 2014 10:00:08 +0200 Subject: Made jira tasks of TODOs, part 2 + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen --- src/datavisualization/data/qsurfacedataproxy.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/datavisualization/data/qsurfacedataproxy.cpp') diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index bcb60f8c..ec28d491 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -355,9 +355,7 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const * need to emit this signal yourself or the graph won't get updated. */ -// // QSurfaceDataProxyPrivate -// QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface), -- 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/qsurfacedataproxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/data/qsurfacedataproxy.cpp') diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index ec28d491..43ce40eb 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.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