diff options
Diffstat (limited to 'src/datavis3d/axis')
-rw-r--r-- | src/datavis3d/axis/qabstractaxis.cpp | 6 | ||||
-rw-r--r-- | src/datavis3d/axis/qabstractaxis.h | 3 | ||||
-rw-r--r-- | src/datavis3d/axis/qcategoryaxis.cpp | 6 | ||||
-rw-r--r-- | src/datavis3d/axis/qcategoryaxis.h | 3 | ||||
-rw-r--r-- | src/datavis3d/axis/qvalueaxis.cpp | 6 | ||||
-rw-r--r-- | src/datavis3d/axis/qvalueaxis.h | 2 |
6 files changed, 14 insertions, 12 deletions
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; |