From 5058be841f2b5d53d08c45c9c0d6cdcb2b80ca0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 27 Aug 2013 06:18:12 +0300 Subject: Parents added Task-number: QTRD-2211 Change-Id: I2ae7cef9feed852b90aa15ddf2d27dd7e2b7ff10 Reviewed-by: Miikka Heikkinen --- src/datavis3d/axis/qabstractaxis.cpp | 6 +-- src/datavis3d/axis/qabstractaxis.h | 3 +- src/datavis3d/axis/qcategoryaxis.cpp | 6 +-- src/datavis3d/axis/qcategoryaxis.h | 3 +- src/datavis3d/axis/qvalueaxis.cpp | 6 +-- src/datavis3d/axis/qvalueaxis.h | 2 +- src/datavis3d/data/qabstractdataproxy.cpp | 6 +-- src/datavis3d/data/qabstractdataproxy.h | 3 +- src/datavis3d/data/qbardataproxy.cpp | 12 +++--- src/datavis3d/data/qbardataproxy.h | 4 +- src/datavis3d/data/qitemmodelbardatamapping.cpp | 43 +++++----------------- src/datavis3d/data/qitemmodelbardatamapping.h | 11 +++--- src/datavis3d/data/qitemmodelmapdatamapping.cpp | 38 ++++--------------- src/datavis3d/data/qitemmodelmapdatamapping.h | 10 ++--- .../data/qitemmodelscatterdatamapping.cpp | 40 ++++---------------- src/datavis3d/data/qitemmodelscatterdatamapping.h | 10 ++--- src/datavis3d/data/qmapdataproxy.cpp | 12 +++--- src/datavis3d/data/qmapdataproxy.h | 4 +- src/datavis3d/data/qscatterdataproxy.cpp | 12 +++--- src/datavis3d/data/qscatterdataproxy.h | 4 +- 20 files changed, 84 insertions(+), 151 deletions(-) (limited to 'src') diff --git a/src/datavis3d/axis/qabstractaxis.cpp b/src/datavis3d/axis/qabstractaxis.cpp index 425469a1..5129dfab 100644 --- a/src/datavis3d/axis/qabstractaxis.cpp +++ b/src/datavis3d/axis/qabstractaxis.cpp @@ -54,10 +54,10 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QAbstractAxis with \a d. + * \internal */ -QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate *d) : - QObject(0), +QAbstractAxis::QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent) : + QObject(parent), d_ptr(d) { } diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/qabstractaxis.h index 4bc0ac16..aac2ee30 100644 --- a/src/datavis3d/axis/qabstractaxis.h +++ b/src/datavis3d/axis/qabstractaxis.h @@ -55,7 +55,8 @@ public: }; protected: - explicit QAbstractAxis(QAbstractAxisPrivate *d); + explicit QAbstractAxis(QAbstractAxisPrivate *d, QObject *parent = 0); + public: virtual ~QAbstractAxis(); diff --git a/src/datavis3d/axis/qcategoryaxis.cpp b/src/datavis3d/axis/qcategoryaxis.cpp index 8b44a56f..8148ae0c 100644 --- a/src/datavis3d/axis/qcategoryaxis.cpp +++ b/src/datavis3d/axis/qcategoryaxis.cpp @@ -35,10 +35,10 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QCategoryAxis. + * Constructs QCategoryAxis with \a parent. */ -QCategoryAxis::QCategoryAxis() : - QAbstractAxis(new QCategoryAxisPrivate(this)) +QCategoryAxis::QCategoryAxis(QObject *parent) : + QAbstractAxis(new QCategoryAxisPrivate(this), parent) { } diff --git a/src/datavis3d/axis/qcategoryaxis.h b/src/datavis3d/axis/qcategoryaxis.h index 8d1e3f57..d162d34b 100644 --- a/src/datavis3d/axis/qcategoryaxis.h +++ b/src/datavis3d/axis/qcategoryaxis.h @@ -32,8 +32,9 @@ class QT_DATAVIS3D_EXPORT QCategoryAxis : public QAbstractAxis // which is read only there. Since subclass cannot have property with same name, // this partially duplicate property is necessary. Q_PROPERTY(QStringList categoryLabels READ categoryLabels WRITE setCategoryLabels) + public: - explicit QCategoryAxis(); + explicit QCategoryAxis(QObject *parent = 0); ~QCategoryAxis(); QStringList categoryLabels() const; diff --git a/src/datavis3d/axis/qvalueaxis.cpp b/src/datavis3d/axis/qvalueaxis.cpp index c51eec9c..67bb9a38 100644 --- a/src/datavis3d/axis/qvalueaxis.cpp +++ b/src/datavis3d/axis/qvalueaxis.cpp @@ -37,10 +37,10 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QValueAxis. + * Constructs QValueAxis with the given \a parent. */ -QValueAxis::QValueAxis() : - QAbstractAxis(new QValueAxisPrivate(this)) +QValueAxis::QValueAxis(QObject *parent) : + QAbstractAxis(new QValueAxisPrivate(this), parent) { } diff --git a/src/datavis3d/axis/qvalueaxis.h b/src/datavis3d/axis/qvalueaxis.h index c9658f37..6bc84c15 100644 --- a/src/datavis3d/axis/qvalueaxis.h +++ b/src/datavis3d/axis/qvalueaxis.h @@ -36,7 +36,7 @@ class QT_DATAVIS3D_EXPORT QValueAxis : public QAbstractAxis Q_PROPERTY(QString labelFormat READ labelFormat WRITE setLabelFormat NOTIFY labelFormatChanged) public: - explicit QValueAxis(); + explicit QValueAxis(QObject *parent = 0); ~QValueAxis(); qreal min() const; diff --git a/src/datavis3d/data/qabstractdataproxy.cpp b/src/datavis3d/data/qabstractdataproxy.cpp index 20528e8c..e155a551 100644 --- a/src/datavis3d/data/qabstractdataproxy.cpp +++ b/src/datavis3d/data/qabstractdataproxy.cpp @@ -47,10 +47,10 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QAbstractDataProxy with \a d. + * \internal */ -QAbstractDataProxy::QAbstractDataProxy(QAbstractDataProxyPrivate *d) : - QObject(0), +QAbstractDataProxy::QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent) : + QObject(parent), d_ptr(d) { } diff --git a/src/datavis3d/data/qabstractdataproxy.h b/src/datavis3d/data/qabstractdataproxy.h index ff25bf30..33ce9f9c 100644 --- a/src/datavis3d/data/qabstractdataproxy.h +++ b/src/datavis3d/data/qabstractdataproxy.h @@ -43,7 +43,8 @@ public: }; protected: - explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d); + explicit QAbstractDataProxy(QAbstractDataProxyPrivate *d, QObject *parent = 0); + public: virtual ~QAbstractDataProxy(); diff --git a/src/datavis3d/data/qbardataproxy.cpp b/src/datavis3d/data/qbardataproxy.cpp index 676b9655..50eafec5 100644 --- a/src/datavis3d/data/qbardataproxy.cpp +++ b/src/datavis3d/data/qbardataproxy.cpp @@ -65,18 +65,18 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QBarDataProxy. + * Constructs QBarDataProxy with the given \a parent. */ -QBarDataProxy::QBarDataProxy() : - QAbstractDataProxy(new QBarDataProxyPrivate(this)) +QBarDataProxy::QBarDataProxy(QObject *parent) : + QAbstractDataProxy(new QBarDataProxyPrivate(this), parent) { } /*! - * Constructs QBarDataProxy with \a d. + * \internal */ -QBarDataProxy::QBarDataProxy(QBarDataProxyPrivate *d) : - QAbstractDataProxy(d) +QBarDataProxy::QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent) : + QAbstractDataProxy(d, parent) { } diff --git a/src/datavis3d/data/qbardataproxy.h b/src/datavis3d/data/qbardataproxy.h index 1aa43aad..43b227df 100644 --- a/src/datavis3d/data/qbardataproxy.h +++ b/src/datavis3d/data/qbardataproxy.h @@ -35,8 +35,7 @@ class QT_DATAVIS3D_EXPORT QBarDataProxy : public QAbstractDataProxy Q_OBJECT public: - explicit QBarDataProxy(); - explicit QBarDataProxy(QBarDataProxyPrivate *d); + explicit QBarDataProxy(QObject *parent = 0); virtual ~QBarDataProxy(); // TODO: Replace first part of class description in docs with this once all TODOs are done: @@ -94,6 +93,7 @@ signals: // TODO void itemsChanged(int rowIndex, int columnIndex, int rowCount, int columnCount); protected: + explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = 0); QBarDataProxyPrivate *dptr(); const QBarDataProxyPrivate *dptrc() const; diff --git a/src/datavis3d/data/qitemmodelbardatamapping.cpp b/src/datavis3d/data/qitemmodelbardatamapping.cpp index 55c5b406..87018662 100644 --- a/src/datavis3d/data/qitemmodelbardatamapping.cpp +++ b/src/datavis3d/data/qitemmodelbardatamapping.cpp @@ -35,29 +35,19 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QItemModelBarDataMapping. + * Constructs QItemModelBarDataMapping with the given \a parent. */ -QItemModelBarDataMapping::QItemModelBarDataMapping() - : QObject(0), - d_ptr(new QItemModelBarDataMappingPrivate(this)) -{ -} - -/*! - * Constructs a copy of \a other. - */ -QItemModelBarDataMapping::QItemModelBarDataMapping(const QItemModelBarDataMapping &other) - : QObject(0), +QItemModelBarDataMapping::QItemModelBarDataMapping(QObject *parent) + : QObject(parent), d_ptr(new QItemModelBarDataMappingPrivate(this)) { - operator=(other); } /*! - * Constructs QItemModelBarDataMapping with \a valueRole. + * Constructs QItemModelBarDataMapping with \a valueRole and the given \a parent. */ -QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &valueRole) - : QObject(0), +QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &valueRole, QObject *parent) + : QObject(parent), d_ptr(new QItemModelBarDataMappingPrivate(this)) { d_ptr->m_valueRole = valueRole; @@ -65,14 +55,15 @@ QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &valueRole) /*! * Constructs QItemModelBarDataMapping with \a rowRole, \a columnRole, \a valueRole, - * \a rowCategories and \a columnCategories. + * \a rowCategories, \a columnCategories and the given \a parent. */ QItemModelBarDataMapping::QItemModelBarDataMapping(const QString &rowRole, const QString &columnRole, const QString &valueRole, const QStringList &rowCategories, - const QStringList &columnCategories) - : QObject(0), + const QStringList &columnCategories, + QObject *parent) + : QObject(parent), d_ptr(new QItemModelBarDataMappingPrivate(this)) { d_ptr->m_rowRole = rowRole; @@ -89,20 +80,6 @@ QItemModelBarDataMapping::~QItemModelBarDataMapping() { } -/*! - * Assigns a copy of \a other to this object. - */ -QItemModelBarDataMapping &QItemModelBarDataMapping::operator=(const QItemModelBarDataMapping &other) -{ - d_ptr->m_rowRole = other.d_ptr->m_rowRole; - d_ptr->m_columnRole = other.d_ptr->m_columnRole; - d_ptr->m_valueRole = other.d_ptr->m_valueRole; - d_ptr->m_rowCategories = other.d_ptr->m_rowCategories; - d_ptr->m_columnCategories = other.d_ptr->m_columnCategories; - - return *this; -} - /*! * \property QItemModelBarDataMapping::rowRole * diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h index 0c03fe74..7ca3b64b 100644 --- a/src/datavis3d/data/qitemmodelbardatamapping.h +++ b/src/datavis3d/data/qitemmodelbardatamapping.h @@ -34,17 +34,15 @@ class QT_DATAVIS3D_EXPORT QItemModelBarDataMapping : public QObject Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged) Q_PROPERTY(QStringList rowCategories READ rowCategories WRITE setRowCategories NOTIFY mappingChanged) Q_PROPERTY(QStringList columnCategories READ columnCategories WRITE setColumnCategories NOTIFY mappingChanged) + public: - explicit QItemModelBarDataMapping(); - QItemModelBarDataMapping(const QItemModelBarDataMapping &other); - QItemModelBarDataMapping(const QString &valueRole); + explicit QItemModelBarDataMapping(QObject *parent = 0); + QItemModelBarDataMapping(const QString &valueRole, QObject *parent = 0); QItemModelBarDataMapping(const QString &rowRole, const QString &columnRole, const QString &valueRole, const QStringList &rowCategories, - const QStringList &columnCategories); + const QStringList &columnCategories, QObject *parent = 0); virtual ~QItemModelBarDataMapping(); - QItemModelBarDataMapping &operator=(const QItemModelBarDataMapping &other); - // If row categories or column categories is an empty list, use item models's rows and columns for rows and columns. // If the categories are both defined, ignore item model's rows and columns and figure out the rows and columns from // the values of the set roles for each item. @@ -64,6 +62,7 @@ public: void remap(const QString &rowRole, const QString &columnRole, const QString &valueRole, const QStringList &rowCategories, const QStringList &columnCategories); + signals: void mappingChanged(); diff --git a/src/datavis3d/data/qitemmodelmapdatamapping.cpp b/src/datavis3d/data/qitemmodelmapdatamapping.cpp index fab2a87a..bdc23b7f 100644 --- a/src/datavis3d/data/qitemmodelmapdatamapping.cpp +++ b/src/datavis3d/data/qitemmodelmapdatamapping.cpp @@ -35,33 +35,24 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QItemModelMapDataMapping. + * Constructs QItemModelMapDataMapping with the given \a parent. */ -QItemModelMapDataMapping::QItemModelMapDataMapping() - : QObject(0), - d_ptr(new QItemModelMapDataMappingPrivate(this)) -{ -} - -/*! - * Constructs a copy of \a other. - */ -QItemModelMapDataMapping::QItemModelMapDataMapping(const QItemModelMapDataMapping &other) - : QObject(0), +QItemModelMapDataMapping::QItemModelMapDataMapping(QObject *parent) + : QObject(parent), d_ptr(new QItemModelMapDataMappingPrivate(this)) { - operator=(other); } /*! - * Constructs QItemModelMapDataMapping with \a labelRole, \a xPosRole, \a zPosRole and - * \a valueRole. + * Constructs QItemModelMapDataMapping with \a labelRole, \a xPosRole, \a zPosRole, + * \a valueRole and the given \a parent. */ QItemModelMapDataMapping::QItemModelMapDataMapping(const QString &labelRole, const QString &xPosRole, const QString &zPosRole, - const QString &valueRole) - : QObject(0), + const QString &valueRole, + QObject *parent) + : QObject(parent), d_ptr(new QItemModelMapDataMappingPrivate(this)) { d_ptr->m_labelRole = labelRole; @@ -77,19 +68,6 @@ QItemModelMapDataMapping::~QItemModelMapDataMapping() { } -/*! - * Assigns a copy of \a other to this object. - */ -QItemModelMapDataMapping &QItemModelMapDataMapping::operator=(const QItemModelMapDataMapping &other) -{ - d_ptr->m_labelRole = other.d_ptr->m_labelRole; - d_ptr->m_xPosRole = other.d_ptr->m_xPosRole; - d_ptr->m_zPosRole = other.d_ptr->m_zPosRole; - d_ptr->m_valueRole = other.d_ptr->m_valueRole; - - return *this; -} - /*! * \property QItemModelMapDataMapping::labelRole * diff --git a/src/datavis3d/data/qitemmodelmapdatamapping.h b/src/datavis3d/data/qitemmodelmapdatamapping.h index 5155f2b6..7587290c 100644 --- a/src/datavis3d/data/qitemmodelmapdatamapping.h +++ b/src/datavis3d/data/qitemmodelmapdatamapping.h @@ -33,15 +33,14 @@ class QT_DATAVIS3D_EXPORT QItemModelMapDataMapping : public QObject Q_PROPERTY(QString xPosRole READ xPosRole WRITE setXPosRole NOTIFY mappingChanged) Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY mappingChanged) Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged) + public: - explicit QItemModelMapDataMapping(); - QItemModelMapDataMapping(const QItemModelMapDataMapping &other); + explicit QItemModelMapDataMapping(QObject *parent = 0); QItemModelMapDataMapping(const QString &labelRole, const QString &xPosRole, - const QString &zPosRole, const QString &valueRole); + const QString &zPosRole, const QString &valueRole, + QObject *parent = 0); virtual ~QItemModelMapDataMapping(); - QItemModelMapDataMapping &operator=(const QItemModelMapDataMapping &other); - void setLabelRole(const QString &role); QString labelRole() const; void setXPosRole(const QString &role); @@ -53,6 +52,7 @@ public: void remap(const QString &labelRole, const QString &xPosRole, const QString &zPosRole, const QString &valueRole); + signals: void mappingChanged(); diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.cpp b/src/datavis3d/data/qitemmodelscatterdatamapping.cpp index 7eac2362..b4a8e259 100644 --- a/src/datavis3d/data/qitemmodelscatterdatamapping.cpp +++ b/src/datavis3d/data/qitemmodelscatterdatamapping.cpp @@ -35,34 +35,24 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QItemModelScatterDataMapping. + * Constructs QItemModelScatterDataMapping with the given \a parent. */ -QItemModelScatterDataMapping::QItemModelScatterDataMapping() - : QObject(0), - d_ptr(new QItemModelScatterDataMappingPrivate(this)) -{ -} - -/*! - * Constructs a copy of \a other. - */ -QItemModelScatterDataMapping::QItemModelScatterDataMapping( - const QItemModelScatterDataMapping &other) - : QObject(0), +QItemModelScatterDataMapping::QItemModelScatterDataMapping(QObject *parent) + : QObject(parent), d_ptr(new QItemModelScatterDataMappingPrivate(this)) { - operator=(other); } /*! - * Constructs QItemModelScatterDataMapping with \a xPosRole, \a yPosRole, \a zPosRole and - * \a valueRole. + * Constructs QItemModelScatterDataMapping with \a xPosRole, \a yPosRole, \a zPosRole, + * \a valueRole and the given \a parent. */ QItemModelScatterDataMapping::QItemModelScatterDataMapping(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole, - const QString &valueRole) - : QObject(0), + const QString &valueRole, + QObject *parent) + : QObject(parent), d_ptr(new QItemModelScatterDataMappingPrivate(this)) { Q_UNUSED(valueRole); @@ -79,20 +69,6 @@ QItemModelScatterDataMapping::~QItemModelScatterDataMapping() { } -/*! - * Assigns a copy of \a other to this object. - */ -QItemModelScatterDataMapping &QItemModelScatterDataMapping::operator=( - const QItemModelScatterDataMapping &other) -{ - d_ptr->m_xPosRole = other.d_ptr->m_xPosRole; - d_ptr->m_yPosRole = other.d_ptr->m_yPosRole; - d_ptr->m_zPosRole = other.d_ptr->m_zPosRole; - //d_ptr->m_valueRole = other.d_ptr->m_valueRole; - - return *this; -} - /*! * \property QItemModelScatterDataMapping::xPosRole * diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.h b/src/datavis3d/data/qitemmodelscatterdatamapping.h index 43a65c8d..7e5e998a 100644 --- a/src/datavis3d/data/qitemmodelscatterdatamapping.h +++ b/src/datavis3d/data/qitemmodelscatterdatamapping.h @@ -33,15 +33,14 @@ class QT_DATAVIS3D_EXPORT QItemModelScatterDataMapping : public QObject Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY mappingChanged) Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY mappingChanged) //Q_PROPERTY(QString valueRole READ valueRole WRITE setValueRole NOTIFY mappingChanged) + public: - explicit QItemModelScatterDataMapping(); - QItemModelScatterDataMapping(const QItemModelScatterDataMapping &other); + explicit QItemModelScatterDataMapping(QObject *parent = 0); QItemModelScatterDataMapping(const QString &xPosRole, const QString &yPosRole, - const QString &zPosRole, const QString &valueRole); + const QString &zPosRole, const QString &valueRole, + QObject *parent = 0); virtual ~QItemModelScatterDataMapping(); - QItemModelScatterDataMapping &operator=(const QItemModelScatterDataMapping &other); - void setXPosRole(const QString &role); QString xPosRole() const; void setYPosRole(const QString &role); @@ -54,6 +53,7 @@ public: void remap(const QString &xPosRole, const QString &yPosRole, const QString &zPosRole, const QString &valueRole); + signals: void mappingChanged(); diff --git a/src/datavis3d/data/qmapdataproxy.cpp b/src/datavis3d/data/qmapdataproxy.cpp index 0818dde1..1e0db088 100644 --- a/src/datavis3d/data/qmapdataproxy.cpp +++ b/src/datavis3d/data/qmapdataproxy.cpp @@ -33,18 +33,18 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QMapDataProxy. + * Constructs QMapDataProxy with the given \a parent. */ -QMapDataProxy::QMapDataProxy() : - QAbstractDataProxy(new QMapDataProxyPrivate(this)) +QMapDataProxy::QMapDataProxy(QObject *parent) : + QAbstractDataProxy(new QMapDataProxyPrivate(this), parent) { } /*! - * Constructs QMapDataProxy with \a d. + * \internal */ -QMapDataProxy::QMapDataProxy(QMapDataProxyPrivate *d) : - QAbstractDataProxy(d) +QMapDataProxy::QMapDataProxy(QMapDataProxyPrivate *d, QObject *parent) : + QAbstractDataProxy(d, parent) { } diff --git a/src/datavis3d/data/qmapdataproxy.h b/src/datavis3d/data/qmapdataproxy.h index 6822c7e7..f6d281f9 100644 --- a/src/datavis3d/data/qmapdataproxy.h +++ b/src/datavis3d/data/qmapdataproxy.h @@ -33,8 +33,7 @@ class QT_DATAVIS3D_EXPORT QMapDataProxy : public QAbstractDataProxy Q_OBJECT public: - explicit QMapDataProxy(); - explicit QMapDataProxy(QMapDataProxyPrivate *d); + explicit QMapDataProxy(QObject *parent = 0); virtual ~QMapDataProxy(); // TODO: Replace first part of class description in docs with this once all TODOs are done: @@ -70,6 +69,7 @@ signals: void itemsInserted(int startIndex, int count); protected: + explicit QMapDataProxy(QMapDataProxyPrivate *d, QObject *parent = 0); QMapDataProxyPrivate *dptr(); const QMapDataProxyPrivate *dptrc() const; diff --git a/src/datavis3d/data/qscatterdataproxy.cpp b/src/datavis3d/data/qscatterdataproxy.cpp index d8fe383d..39fb2470 100644 --- a/src/datavis3d/data/qscatterdataproxy.cpp +++ b/src/datavis3d/data/qscatterdataproxy.cpp @@ -55,18 +55,18 @@ QT_DATAVIS3D_BEGIN_NAMESPACE */ /*! - * Constructs QScatterDataProxy. + * Constructs QScatterDataProxy with the given \a parent. */ -QScatterDataProxy::QScatterDataProxy() : - QAbstractDataProxy(new QScatterDataProxyPrivate(this)) +QScatterDataProxy::QScatterDataProxy(QObject *parent) : + QAbstractDataProxy(new QScatterDataProxyPrivate(this), parent) { } /*! - * Constructs QScatterDataProxy with \a d. + * \internal */ -QScatterDataProxy::QScatterDataProxy(QScatterDataProxyPrivate *d) : - QAbstractDataProxy(d) +QScatterDataProxy::QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent) : + QAbstractDataProxy(d, parent) { } diff --git a/src/datavis3d/data/qscatterdataproxy.h b/src/datavis3d/data/qscatterdataproxy.h index 2179691a..b8f505f9 100644 --- a/src/datavis3d/data/qscatterdataproxy.h +++ b/src/datavis3d/data/qscatterdataproxy.h @@ -33,8 +33,7 @@ class QT_DATAVIS3D_EXPORT QScatterDataProxy : public QAbstractDataProxy Q_OBJECT public: - explicit QScatterDataProxy(); - explicit QScatterDataProxy(QScatterDataProxyPrivate *d); + explicit QScatterDataProxy(QObject *parent = 0); virtual ~QScatterDataProxy(); // TODO: Replace first part of class description in docs with this once all TODOs are done: @@ -70,6 +69,7 @@ signals: void itemsInserted(int startIndex, int count); protected: + explicit QScatterDataProxy(QScatterDataProxyPrivate *d, QObject *parent = 0); QScatterDataProxyPrivate *dptr(); const QScatterDataProxyPrivate *dptrc() const; -- cgit v1.2.3