summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-04-24 12:32:17 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-04-30 13:59:23 +0000
commitd3ea72e28ca82640e50900d42bf0c9ee76aa7f95 (patch)
tree1d72276672b2ef7b1ac76e77283f31d45530cb3c /src
parent8b4ad5a108b53e6964815856b37cf004099ce505 (diff)
Add proper 'deprecated' warnings
Use Q_DECL_DEPRECATED to mark deprecated API. Fix examples to do not use deprecated functions. These functions were 'marked' as deprecated when multiple axes were introduced. Moreover, axis X/Y is an ambiguous term and not necessary mean Horizontal/Vertical axis. These deprecated methods also create an issue when given series should be attached to several Horizonal/ Vertical axes and calling them can cause unwanted results. Change-Id: I639e1b964240b80c2b3b93b74b061da324bca1ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/charts/qchart.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/charts/qchart.h b/src/charts/qchart.h
index a193ba22..722451dc 100644
--- a/src/charts/qchart.h
+++ b/src/charts/qchart.h
@@ -104,12 +104,10 @@ public:
void removeAllSeries();
QList<QAbstractSeries *> series() const;
- // *** deprecated ***
- void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = nullptr);
- void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = nullptr);
- QAbstractAxis *axisX(QAbstractSeries *series = nullptr) const;
- QAbstractAxis *axisY(QAbstractSeries *series = nullptr) const;
- // ******************
+ Q_DECL_DEPRECATED void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = nullptr);
+ Q_DECL_DEPRECATED void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = nullptr);
+ Q_DECL_DEPRECATED QAbstractAxis *axisX(QAbstractSeries *series = nullptr) const;
+ Q_DECL_DEPRECATED QAbstractAxis *axisY(QAbstractSeries *series = nullptr) const;
void addAxis(QAbstractAxis *axis, Qt::Alignment alignment);
void removeAxis(QAbstractAxis *axis);