diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 15:00:27 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 15:20:37 +0100 |
commit | 63c8a9ed533f25da030d38790cb4acc0df82ada4 (patch) | |
tree | 2d9b5bd633453ba283ee8d8af8b722d6faca5556 /src | |
parent | e0faefb4baaec1a7197a93edcee133136746e2ad (diff) |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I1eafbce147e05028c93830bb882611d9eea58586
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/charts/axis/qabstractaxis.cpp | 17 | ||||
-rw-r--r-- | src/charts/axis/qabstractaxis_p.h | 28 | ||||
-rw-r--r-- | src/charts/barchart/abstractbarchartitem.cpp | 2 | ||||
-rw-r--r-- | src/charts/boxplotchart/boxplotchartitem.cpp | 2 | ||||
-rw-r--r-- | src/charts/candlestickchart/candlestickchartitem.cpp | 2 | ||||
-rw-r--r-- | src/charts/chartdataset.cpp | 4 | ||||
-rw-r--r-- | src/charts/qpolarchart.cpp | 2 |
7 files changed, 21 insertions, 36 deletions
diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp index c1e55f83..8671b518 100644 --- a/src/charts/axis/qabstractaxis.cpp +++ b/src/charts/axis/qabstractaxis.cpp @@ -999,31 +999,16 @@ void QAbstractAxis::setReverse(bool reverse) QAbstractAxisPrivate::QAbstractAxisPrivate(QAbstractAxis *q) : q_ptr(q), - m_chart(0), - m_alignment(0), - m_orientation(Qt::Orientation(0)), - m_visible(true), - m_arrowVisible(true), m_axisPen(QChartPrivate::defaultPen()), m_axisBrush(QChartPrivate::defaultBrush()), - m_gridLineVisible(true), m_gridLinePen(QChartPrivate::defaultPen()), - m_minorGridLineVisible(true), m_minorGridLinePen(QChartPrivate::defaultPen()), - m_labelsVisible(true), - m_labelsEditable(false), m_labelsBrush(QChartPrivate::defaultBrush()), m_labelsFont(QChartPrivate::defaultFont()), - m_labelsAngle(0), - m_titleVisible(true), m_titleBrush(QChartPrivate::defaultBrush()), m_titleFont(QChartPrivate::defaultFont()), - m_shadesVisible(false), m_shadesPen(QChartPrivate::defaultPen()), - m_shadesBrush(QChartPrivate::defaultBrush()), - m_shadesOpacity(1.0), - m_dirty(false), - m_reverse(false) + m_shadesBrush(QChartPrivate::defaultBrush()) { } diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h index cbc8e85e..03f0f714 100644 --- a/src/charts/axis/qabstractaxis_p.h +++ b/src/charts/axis/qabstractaxis_p.h @@ -96,45 +96,45 @@ Q_SIGNALS: protected: QAbstractAxis *q_ptr; - QChart *m_chart; + QChart *m_chart = nullptr; QScopedPointer<ChartAxisElement> m_item; private: QList<QAbstractSeries*> m_series; Qt::Alignment m_alignment; - Qt::Orientation m_orientation; + Qt::Orientation m_orientation = Qt::Orientation(0); - bool m_visible; + bool m_visible = true; - bool m_arrowVisible; + bool m_arrowVisible = true; QPen m_axisPen; QBrush m_axisBrush; - bool m_gridLineVisible; + bool m_gridLineVisible = true; QPen m_gridLinePen; - bool m_minorGridLineVisible; + bool m_minorGridLineVisible = true; QPen m_minorGridLinePen; - bool m_labelsVisible; - bool m_labelsEditable; + bool m_labelsVisible = true; + bool m_labelsEditable = false; QBrush m_labelsBrush; QFont m_labelsFont; - int m_labelsAngle; + int m_labelsAngle = 0; - bool m_titleVisible; + bool m_titleVisible = true; QBrush m_titleBrush; QFont m_titleFont; QString m_title; - bool m_shadesVisible; + bool m_shadesVisible = false; QPen m_shadesPen; QBrush m_shadesBrush; - qreal m_shadesOpacity; + qreal m_shadesOpacity = 1; - bool m_dirty; + bool m_dirty = false; - bool m_reverse; + bool m_reverse = false; friend class QAbstractAxis; friend class ChartDataSet; diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 56b48773..5cae977e 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -55,7 +55,7 @@ AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, QGraphics m_orientation(Qt::Horizontal), m_resetAnimation(true) { - setAcceptedMouseButtons(0); + setAcceptedMouseButtons({}); setFlag(ItemClipsChildrenToShape); setFlag(QGraphicsItem::ItemIsSelectable); connect(series->d_func(), SIGNAL(updatedLayout()), this, SLOT(handleLayoutChanged())); diff --git a/src/charts/boxplotchart/boxplotchartitem.cpp b/src/charts/boxplotchart/boxplotchartitem.cpp index 701cc88b..a18d7d46 100644 --- a/src/charts/boxplotchart/boxplotchartitem.cpp +++ b/src/charts/boxplotchart/boxplotchartitem.cpp @@ -43,7 +43,7 @@ BoxPlotChartItem::BoxPlotChartItem(QBoxPlotSeries *series, QGraphicsItem *item) m_series(series), m_animation(0) { - setAcceptedMouseButtons(0); + setAcceptedMouseButtons({}); connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet *>)), this, SLOT(handleBoxsetRemove(QList<QBoxSet *>))); connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged())); connect(series, SIGNAL(opacityChanged()), this, SLOT(handleOpacityChanged())); diff --git a/src/charts/candlestickchart/candlestickchartitem.cpp b/src/charts/candlestickchart/candlestickchartitem.cpp index 3be2ca6c..4c525974 100644 --- a/src/charts/candlestickchart/candlestickchartitem.cpp +++ b/src/charts/candlestickchart/candlestickchartitem.cpp @@ -45,7 +45,7 @@ CandlestickChartItem::CandlestickChartItem(QCandlestickSeries *series, QGraphics m_timePeriod(0.0), m_animation(nullptr) { - setAcceptedMouseButtons(0); + setAcceptedMouseButtons({}); connect(series, SIGNAL(candlestickSetsAdded(QList<QCandlestickSet *>)), this, SLOT(handleCandlestickSetsAdd(QList<QCandlestickSet *>))); connect(series, SIGNAL(candlestickSetsRemoved(QList<QCandlestickSet *>)), diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp index 4fec0ae1..2b2eda17 100644 --- a/src/charts/chartdataset.cpp +++ b/src/charts/chartdataset.cpp @@ -332,8 +332,8 @@ void ChartDataSet::createDefaultAxes() if (m_seriesList.isEmpty()) return; - QAbstractAxis::AxisTypes typeX(0); - QAbstractAxis::AxisTypes typeY(0); + QAbstractAxis::AxisTypes typeX; + QAbstractAxis::AxisTypes typeY; // Remove possibly existing axes deleteAllAxes(); diff --git a/src/charts/qpolarchart.cpp b/src/charts/qpolarchart.cpp index dbfd3a58..767fda76 100644 --- a/src/charts/qpolarchart.cpp +++ b/src/charts/qpolarchart.cpp @@ -98,7 +98,7 @@ QPolarChart::~QPolarChart() */ QList<QAbstractAxis *> QPolarChart::axes(PolarOrientations polarOrientation, QAbstractSeries *series) const { - Qt::Orientations orientation(0); + Qt::Orientations orientation; if (polarOrientation.testFlag(PolarOrientationAngular)) orientation |= Qt::Horizontal; if (polarOrientation.testFlag(PolarOrientationRadial)) |