diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
| commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
| tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualization/data/qsurfacedataitem.cpp | |
| parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
| parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) | |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'src/datavisualization/data/qsurfacedataitem.cpp')
| -rw-r--r-- | src/datavisualization/data/qsurfacedataitem.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp index f5f91464..c8a76a67 100644 --- a/src/datavisualization/data/qsurfacedataitem.cpp +++ b/src/datavisualization/data/qsurfacedataitem.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 ** @@ -18,7 +18,7 @@ #include "qsurfacedataitem_p.h" -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! * \class QSurfaceDataItem @@ -72,13 +72,11 @@ QSurfaceDataItem::~QSurfaceDataItem() QSurfaceDataItem &QSurfaceDataItem::operator=(const QSurfaceDataItem &other) { m_position = other.m_position; - //m_size = other.m_size; if (other.d_ptr) createExtraData(); else d_ptr = 0; - // TODO set extra data return *this; } @@ -140,4 +138,4 @@ QSurfaceDataItemPrivate::~QSurfaceDataItemPrivate() { } -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION |