diff --git a/src/chartsqml2/declarativeareaseries.h b/src/chartsqml2/declarativeareaseries.h index 57d069a..06880be 100644 --- a/src/chartsqml2/declarativeareaseries.h +++ b/src/chartsqml2/declarativeareaseries.h @@ -52,14 +52,14 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - Q_REVISION(3) QAbstractAxis *axisAngular() { return m_axes->axisX(); } - Q_REVISION(3) void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - Q_REVISION(3) QAbstractAxis *axisRadial() { return m_axes->axisY(); } - Q_REVISION(3) void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } qreal borderWidth() const; void setBorderWidth(qreal borderWidth); QString brushFilename() const; diff --git a/src/chartsqml2/declarativebarseries.h b/src/chartsqml2/declarativebarseries.h index 0ca2127..6bf939d 100644 --- a/src/chartsqml2/declarativebarseries.h +++ b/src/chartsqml2/declarativebarseries.h @@ -91,10 +91,10 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } QQmlListProperty seriesChildren(); public: @@ -138,10 +138,10 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } QQmlListProperty seriesChildren(); public: @@ -185,10 +185,10 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } QQmlListProperty seriesChildren(); public: @@ -232,10 +232,10 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } QQmlListProperty seriesChildren(); public: @@ -279,10 +279,10 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } QQmlListProperty seriesChildren(); public: @@ -326,10 +326,10 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } QQmlListProperty seriesChildren(); public: diff --git a/src/chartsqml2/declarativechart.h b/src/chartsqml2/declarativechart.h index f425e05..680b7b7 100644 --- a/src/chartsqml2/declarativechart.h +++ b/src/chartsqml2/declarativechart.h @@ -131,18 +131,18 @@ public: QColor titleColor(); void setBackgroundColor(QColor color); QColor backgroundColor(); - Q_REVISION(3) void setPlotAreaColor(QColor color); - Q_REVISION(3) QColor plotAreaColor(); - Q_REVISION(4) void setLocalizeNumbers(bool localize); - Q_REVISION(4) bool localizeNumbers() const; - Q_REVISION(4) void setLocale(const QLocale &locale); - Q_REVISION(4) QLocale locale() const; + void setPlotAreaColor(QColor color); + QColor plotAreaColor(); + void setLocalizeNumbers(bool localize); + bool localizeNumbers() const; + void setLocale(const QLocale &locale); + QLocale locale() const; int count(); void setDropShadowEnabled(bool enabled); bool dropShadowEnabled(); - Q_REVISION(3) qreal backgroundRoundness() const; - Q_REVISION(3) void setBackgroundRoundness(qreal diameter); + qreal backgroundRoundness() const; + void setBackgroundRoundness(qreal diameter); // Margins & plotArea qreal topMargin(); @@ -150,7 +150,7 @@ public: qreal leftMargin(); qreal rightMargin(); DeclarativeMargins *minimumMargins() { return m_margins; } - Q_REVISION(2) DeclarativeMargins *margins() { return m_margins; } + DeclarativeMargins *margins() { return m_margins; } QRectF plotArea() { return m_chart->plotArea(); } // Axis handling diff --git a/src/chartsqml2/declarativelineseries.h b/src/chartsqml2/declarativelineseries.h index 579eb45..6133e1c 100644 --- a/src/chartsqml2/declarativelineseries.h +++ b/src/chartsqml2/declarativelineseries.h @@ -54,14 +54,14 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - Q_REVISION(3) QAbstractAxis *axisAngular() { return m_axes->axisX(); } - Q_REVISION(3) void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - Q_REVISION(3) QAbstractAxis *axisRadial() { return m_axes->axisY(); } - Q_REVISION(3) void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } qreal width() const; void setWidth(qreal width); Qt::PenStyle style() const; diff --git a/src/chartsqml2/declarativescatterseries.h b/src/chartsqml2/declarativescatterseries.h index 49eb96d..21deda7 100644 --- a/src/chartsqml2/declarativescatterseries.h +++ b/src/chartsqml2/declarativescatterseries.h @@ -54,14 +54,14 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - Q_REVISION(3) QAbstractAxis *axisAngular() { return m_axes->axisX(); } - Q_REVISION(3) void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - Q_REVISION(3) QAbstractAxis *axisRadial() { return m_axes->axisY(); } - Q_REVISION(3) void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } qreal borderWidth() const; void setBorderWidth(qreal borderWidth); QQmlListProperty declarativeChildren(); diff --git a/src/chartsqml2/declarativesplineseries.h b/src/chartsqml2/declarativesplineseries.h index 20e596d..01b6e87 100644 --- a/src/chartsqml2/declarativesplineseries.h +++ b/src/chartsqml2/declarativesplineseries.h @@ -54,14 +54,14 @@ public: void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); } QAbstractAxis *axisY() { return m_axes->axisY(); } void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); } - Q_REVISION(2) QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } - Q_REVISION(2) void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } - Q_REVISION(2) QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } - Q_REVISION(2) void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } - Q_REVISION(3) QAbstractAxis *axisAngular() { return m_axes->axisX(); } - Q_REVISION(3) void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } - Q_REVISION(3) QAbstractAxis *axisRadial() { return m_axes->axisY(); } - Q_REVISION(3) void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } + QAbstractAxis *axisXTop() { return m_axes->axisXTop(); } + void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); } + QAbstractAxis *axisYRight() { return m_axes->axisYRight(); } + void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); } + QAbstractAxis *axisAngular() { return m_axes->axisX(); } + void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); } + QAbstractAxis *axisRadial() { return m_axes->axisY(); } + void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); } qreal width() const; void setWidth(qreal width); Qt::PenStyle style() const;