From 6852c79c458df659e440c26d91a11a2c8120d875 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Fri, 26 Jun 2020 14:42:25 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I0d9e3a48056294137f1465f091802b4b7c32c8bf Reviewed-by: Jarek Kobus --- examples/charts/audio/xyseriesiodevice.cpp | 4 ++-- .../charts/barmodelmapper/customtablemodel.cpp | 4 ++-- examples/charts/callout/callout.cpp | 4 ++-- examples/charts/modeldata/customtablemodel.cpp | 4 ++-- .../stackedbarchartdrilldown/drilldownchart.cpp | 2 +- src/charts/areachart/areachartitem.cpp | 4 ++-- .../axis/barcategoryaxis/chartbarcategoryaxisx.cpp | 2 +- .../axis/barcategoryaxis/chartbarcategoryaxisy.cpp | 2 +- .../axis/categoryaxis/chartcategoryaxisx.cpp | 2 +- .../axis/categoryaxis/chartcategoryaxisy.cpp | 2 +- .../axis/datetimeaxis/chartdatetimeaxisx.cpp | 4 ++-- .../axis/datetimeaxis/chartdatetimeaxisy.cpp | 4 ++-- .../axis/logvalueaxis/chartlogvalueaxisx.cpp | 2 +- .../axis/logvalueaxis/chartlogvalueaxisy.cpp | 2 +- src/charts/axis/valueaxis/chartvalueaxisx.cpp | 8 ++++---- src/charts/axis/valueaxis/chartvalueaxisy.cpp | 8 ++++---- src/charts/barchart/abstractbarchartitem.cpp | 6 +++--- src/charts/barchart/bar.cpp | 4 ++-- .../percent/horizontalpercentbarchartitem.cpp | 8 ++++---- .../stacked/horizontalstackedbarchartitem.cpp | 4 ++-- src/charts/barchart/qbarmodelmapper.cpp | 24 +++++++++++----------- .../vertical/percent/percentbarchartitem.cpp | 8 ++++---- .../vertical/stacked/stackedbarchartitem.cpp | 4 ++-- src/charts/boxplotchart/boxwhiskers.cpp | 20 +++++++++--------- src/charts/boxplotchart/qboxplotmodelmapper.cpp | 24 +++++++++++----------- src/charts/candlestickchart/candlestick.cpp | 8 ++++---- .../candlestickchart/qcandlestickmodelmapper.cpp | 16 +++++++-------- src/charts/chartbackground.cpp | 2 +- src/charts/domain/abstractdomain.cpp | 2 +- src/charts/domain/logxlogydomain.cpp | 2 +- src/charts/domain/logxlogypolardomain.cpp | 2 +- src/charts/domain/logxydomain.cpp | 2 +- src/charts/domain/logxypolardomain.cpp | 2 +- src/charts/domain/xlogydomain.cpp | 2 +- src/charts/domain/xlogypolardomain.cpp | 2 +- src/charts/domain/xydomain.cpp | 2 +- src/charts/domain/xypolardomain.cpp | 2 +- src/charts/layout/cartesianchartlayout.cpp | 2 +- src/charts/legend/legendmarkeritem.cpp | 12 +++++------ src/charts/legend/qlegend.cpp | 4 ++-- src/charts/linechart/linechartitem.cpp | 4 ++-- src/charts/qabstractseries.cpp | 2 +- src/charts/qchartview.cpp | 2 +- src/charts/scatterchart/scatterchartitem.cpp | 4 ++-- src/charts/splinechart/splinechartitem.cpp | 4 ++-- src/chartsqml2/declarativebarseries.cpp | 4 ++-- src/chartsqml2/declarativecategoryaxis.cpp | 4 ++-- src/chartsqml2/declarativelineseries.cpp | 6 +++--- src/chartsqml2/declarativescatterseries.cpp | 6 +++--- src/chartsqml2/declarativesplineseries.cpp | 6 +++--- tests/manual/boxplottester/customtablemodel.cpp | 4 ++-- .../manual/candlesticktester/customtablemodel.cpp | 4 ++-- 52 files changed, 136 insertions(+), 136 deletions(-) diff --git a/examples/charts/audio/xyseriesiodevice.cpp b/examples/charts/audio/xyseriesiodevice.cpp index d129725d..22d9a070 100644 --- a/examples/charts/audio/xyseriesiodevice.cpp +++ b/examples/charts/audio/xyseriesiodevice.cpp @@ -39,8 +39,8 @@ XYSeriesIODevice::XYSeriesIODevice(QXYSeries *series, QObject *parent) : qint64 XYSeriesIODevice::readData(char *data, qint64 maxSize) { - Q_UNUSED(data) - Q_UNUSED(maxSize) + Q_UNUSED(data); + Q_UNUSED(maxSize); return -1; } diff --git a/examples/charts/barmodelmapper/customtablemodel.cpp b/examples/charts/barmodelmapper/customtablemodel.cpp index 37730042..c722f089 100644 --- a/examples/charts/barmodelmapper/customtablemodel.cpp +++ b/examples/charts/barmodelmapper/customtablemodel.cpp @@ -60,13 +60,13 @@ CustomTableModel::~CustomTableModel() int CustomTableModel::rowCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_data.count(); } int CustomTableModel::columnCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_columnCount; } diff --git a/examples/charts/callout/callout.cpp b/examples/charts/callout/callout.cpp index bb37802a..c78693b6 100644 --- a/examples/charts/callout/callout.cpp +++ b/examples/charts/callout/callout.cpp @@ -53,8 +53,8 @@ QRectF Callout::boundingRect() const void Callout::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option) - Q_UNUSED(widget) + Q_UNUSED(option); + Q_UNUSED(widget); QPainterPath path; path.addRoundedRect(m_rect, 5, 5); diff --git a/examples/charts/modeldata/customtablemodel.cpp b/examples/charts/modeldata/customtablemodel.cpp index 96256232..dfa92944 100644 --- a/examples/charts/modeldata/customtablemodel.cpp +++ b/examples/charts/modeldata/customtablemodel.cpp @@ -54,13 +54,13 @@ CustomTableModel::CustomTableModel(QObject *parent) : int CustomTableModel::rowCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_data.count(); } int CustomTableModel::columnCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_columnCount; } diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp index 696b5397..397dad8c 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp @@ -61,7 +61,7 @@ void DrilldownChart::changeSeries(DrilldownBarSeries *series) void DrilldownChart::handleClicked(int index, QBarSet *barset) { - Q_UNUSED(barset) + Q_UNUSED(barset); DrilldownBarSeries *series = static_cast(sender()); changeSeries(series->drilldownSeries(index)); } diff --git a/src/charts/areachart/areachartitem.cpp b/src/charts/areachart/areachartitem.cpp index 0c61e0fe..168e9aff 100644 --- a/src/charts/areachart/areachartitem.cpp +++ b/src/charts/areachart/areachartitem.cpp @@ -234,8 +234,8 @@ void AreaChartItem::fixEdgeSeriesDomain(LineChartItem *edgeSeries) void AreaChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(widget) - Q_UNUSED(option) + Q_UNUSED(widget); + Q_UNUSED(option); painter->save(); painter->setPen(m_linePen); diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index 65709753..b6616316 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -110,7 +110,7 @@ void ChartBarCategoryAxisX::handleCategoriesChanged() QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; QSizeF base = HorizontalAxis::sizeHint(which, constraint); diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 65b84d43..c27df9d4 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -109,7 +109,7 @@ void ChartBarCategoryAxisY::handleCategoriesChanged() QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; QSizeF base = VerticalAxis::sizeHint(which, constraint); diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp index a033dc0b..7de98942 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp @@ -83,7 +83,7 @@ void ChartCategoryAxisX::updateGeometry() QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; QSizeF base = HorizontalAxis::sizeHint(which, constraint); diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp index 7d6d80aa..8fe87470 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp @@ -84,7 +84,7 @@ void ChartCategoryAxisY::updateGeometry() QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; QSizeF base = VerticalAxis::sizeHint(which, constraint); diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp index 5abea37a..cba8b0b2 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp @@ -76,7 +76,7 @@ void ChartDateTimeAxisX::updateGeometry() void ChartDateTimeAxisX::handleTickCountChanged(int tick) { - Q_UNUSED(tick) + Q_UNUSED(tick); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); @@ -92,7 +92,7 @@ void ChartDateTimeAxisX::handleFormatChanged(const QString &format) QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp index 4bd2588a..1629aff4 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp @@ -77,7 +77,7 @@ void ChartDateTimeAxisY::updateGeometry() void ChartDateTimeAxisY::handleTickCountChanged(int tick) { - Q_UNUSED(tick) + Q_UNUSED(tick); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); @@ -93,7 +93,7 @@ void ChartDateTimeAxisY::handleFormatChanged(const QString &format) QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp index e6330305..154d66f3 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp @@ -89,7 +89,7 @@ void ChartLogValueAxisX::handleLabelFormatChanged(const QString &format) QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp index 48d79368..5f5a5c70 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp @@ -90,7 +90,7 @@ void ChartLogValueAxisY::handleLabelFormatChanged(const QString &format) QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; diff --git a/src/charts/axis/valueaxis/chartvalueaxisx.cpp b/src/charts/axis/valueaxis/chartvalueaxisx.cpp index de759e98..dc087697 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx.cpp +++ b/src/charts/axis/valueaxis/chartvalueaxisx.cpp @@ -135,28 +135,28 @@ void ChartValueAxisX::handleLabelFormatChanged(const QString &format) void ChartValueAxisX::handleTickIntervalChanged(qreal interval) { - Q_UNUSED(interval) + Q_UNUSED(interval); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); } void ChartValueAxisX::handleTickAnchorChanged(qreal anchor) { - Q_UNUSED(anchor) + Q_UNUSED(anchor); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); } void ChartValueAxisX::handleTickTypeChanged(QValueAxis::TickType type) { - Q_UNUSED(type) + Q_UNUSED(type); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); } QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; diff --git a/src/charts/axis/valueaxis/chartvalueaxisy.cpp b/src/charts/axis/valueaxis/chartvalueaxisy.cpp index 6ae70479..54c30ea5 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy.cpp +++ b/src/charts/axis/valueaxis/chartvalueaxisy.cpp @@ -136,28 +136,28 @@ void ChartValueAxisY::handleLabelFormatChanged(const QString &format) void ChartValueAxisY::handleTickIntervalChanged(qreal interval) { - Q_UNUSED(interval) + Q_UNUSED(interval); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); } void ChartValueAxisY::handleTickAnchorChanged(qreal anchor) { - Q_UNUSED(anchor) + Q_UNUSED(anchor); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); } void ChartValueAxisY::handleTickTypeChanged(QValueAxis::TickType type) { - Q_UNUSED(type) + Q_UNUSED(type); QGraphicsLayoutItem::updateGeometry(); if (presenter()) presenter()->layout()->invalidate(); } QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; QSizeF base = VerticalAxis::sizeHint(which, constraint); diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 2c5c24eb..4811c94e 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -382,7 +382,7 @@ void AbstractBarChartItem::handleBarValueChange(int index, QtCharts::QBarSet *ba void AbstractBarChartItem::handleBarValueAdd(int index, int count, QBarSet *barset) { - Q_UNUSED(count) + Q_UNUSED(count); // Value insertions into middle of barset need to dirty the rest of the labels of the set markLabelsDirty(barset, index, -1); @@ -391,7 +391,7 @@ void AbstractBarChartItem::handleBarValueAdd(int index, int count, QBarSet *bars void AbstractBarChartItem::handleBarValueRemove(int index, int count, QBarSet *barset) { - Q_UNUSED(count) + Q_UNUSED(count); // Value removals from the middle of barset need to dirty the rest of the labels of the set. markLabelsDirty(barset, index, -1); @@ -409,7 +409,7 @@ void AbstractBarChartItem::handleBarValueRemove(int index, int count, QBarSet *b void AbstractBarChartItem::handleSeriesAdded(QAbstractSeries *series) { - Q_UNUSED(series) + Q_UNUSED(series); // If the parent series was added, do nothing, as series pos and width calculations will // happen anyway. diff --git a/src/charts/barchart/bar.cpp b/src/charts/barchart/bar.cpp index f6b9fc90..ffac7c43 100644 --- a/src/charts/barchart/bar.cpp +++ b/src/charts/barchart/bar.cpp @@ -67,7 +67,7 @@ void Bar::mousePressEvent(QGraphicsSceneMouseEvent *event) void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); m_hovering = true; emit hovered(true, m_index, m_barset); @@ -75,7 +75,7 @@ void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); m_hovering = false; emit hovered(false, m_index, m_barset); } diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp index cf799b26..66aefb4d 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp @@ -41,7 +41,7 @@ HorizontalPercentBarChartItem::HorizontalPercentBarChartItem(QAbstractBarSeries QString HorizontalPercentBarChartItem::generateLabelText(int set, int category, qreal value) { - Q_UNUSED(value) + Q_UNUSED(value); static const QString valueTag(QLatin1String("@value")); qreal p = m_series->d_func()->percentageAt(set, category) * 100.0; @@ -61,8 +61,8 @@ QString HorizontalPercentBarChartItem::generateLabelText(int set, int category, void HorizontalPercentBarChartItem::initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) { - Q_UNUSED(set) - Q_UNUSED(resetAnimation) + Q_UNUSED(set); + Q_UNUSED(resetAnimation); QRectF rect; @@ -93,7 +93,7 @@ void HorizontalPercentBarChartItem::initializeLayout(int set, int category, void HorizontalPercentBarChartItem::markLabelsDirty(QBarSet *barset, int index, int count) { - Q_UNUSED(barset) + Q_UNUSED(barset); // Percent series need to dirty all labels of the stack QList sets = m_barMap.keys(); for (int set = 0; set < sets.size(); set++) diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp index cb890a6f..22e46d02 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp @@ -42,8 +42,8 @@ HorizontalStackedBarChartItem::HorizontalStackedBarChartItem(QAbstractBarSeries void HorizontalStackedBarChartItem::initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) { - Q_UNUSED(set) - Q_UNUSED(resetAnimation) + Q_UNUSED(set); + Q_UNUSED(resetAnimation); QRectF rect; if (set > 0) { diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp index 94ebda0e..2303d325 100644 --- a/src/charts/barchart/qbarmodelmapper.cpp +++ b/src/charts/barchart/qbarmodelmapper.cpp @@ -272,8 +272,8 @@ void QBarModelMapperPrivate::handleSeriesDestroyed() void QBarModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight) { - Q_UNUSED(topLeft) - Q_UNUSED(bottomRight) + Q_UNUSED(topLeft); + Q_UNUSED(bottomRight); if (m_model == 0 || m_series == 0) return; @@ -321,7 +321,7 @@ void QBarModelMapperPrivate::modelHeaderDataUpdated(Qt::Orientation orientation, void QBarModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -335,7 +335,7 @@ void QBarModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int e void QBarModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -349,7 +349,7 @@ void QBarModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int void QBarModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -363,7 +363,7 @@ void QBarModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, in void QBarModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -382,9 +382,9 @@ void QBarModelMapperPrivate::handleModelDestroyed() void QBarModelMapperPrivate::insertData(int start, int end) { - Q_UNUSED(end) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(end); + Q_UNUSED(start); + Q_UNUSED(end); // Currently barchart needs to be fully recalculated when change is made. // Re-initialize initializeBarFromModel(); @@ -392,9 +392,9 @@ void QBarModelMapperPrivate::insertData(int start, int end) void QBarModelMapperPrivate::removeData(int start, int end) { - Q_UNUSED(end) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(end); + Q_UNUSED(start); + Q_UNUSED(end); // Currently barchart needs to be fully recalculated when change is made. // Re-initialize initializeBarFromModel(); diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp index a3a00aa5..1cc4d27f 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp +++ b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp @@ -46,7 +46,7 @@ PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries *series, QGraphicsIt QString PercentBarChartItem::generateLabelText(int set, int category, qreal value) { - Q_UNUSED(value) + Q_UNUSED(value); static const QString valueTag(QLatin1String("@value")); qreal p = m_series->d_func()->percentageAt(set, category) * 100.0; @@ -66,8 +66,8 @@ QString PercentBarChartItem::generateLabelText(int set, int category, qreal valu void PercentBarChartItem::initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) { - Q_UNUSED(set) - Q_UNUSED(resetAnimation) + Q_UNUSED(set); + Q_UNUSED(resetAnimation); QRectF rect; @@ -99,7 +99,7 @@ void PercentBarChartItem::initializeLayout(int set, int category, void PercentBarChartItem::markLabelsDirty(QBarSet *barset, int index, int count) { - Q_UNUSED(barset) + Q_UNUSED(barset); // Percent series need to dirty all labels of the stack QList sets = m_barMap.keys(); for (int set = 0; set < sets.size(); set++) diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp index 306b8325..d30bbef9 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp @@ -47,8 +47,8 @@ StackedBarChartItem::StackedBarChartItem(QAbstractBarSeries *series, QGraphicsIt void StackedBarChartItem::initializeLayout(int set, int category, int layoutIndex, bool resetAnimation) { - Q_UNUSED(set) - Q_UNUSED(resetAnimation) + Q_UNUSED(set); + Q_UNUSED(resetAnimation); QRectF rect; diff --git a/src/charts/boxplotchart/boxwhiskers.cpp b/src/charts/boxplotchart/boxwhiskers.cpp index df247489..9962ea23 100644 --- a/src/charts/boxplotchart/boxwhiskers.cpp +++ b/src/charts/boxplotchart/boxwhiskers.cpp @@ -51,26 +51,26 @@ BoxWhiskers::~BoxWhiskers() void BoxWhiskers::mousePressEvent(QGraphicsSceneMouseEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); emit pressed(m_boxSet); m_mousePressed = true; } void BoxWhiskers::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); emit hovered(true, m_boxSet); } void BoxWhiskers::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); emit hovered(false, m_boxSet); } void BoxWhiskers::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); emit released(m_boxSet); if (m_mousePressed) emit clicked(m_boxSet); @@ -78,7 +78,7 @@ void BoxWhiskers::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void BoxWhiskers::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); // For Box a press signal needs to be explicitly fired for mouseDoubleClickEvent emit pressed(m_boxSet); emit doubleClicked(m_boxSet); @@ -121,15 +121,15 @@ void BoxWhiskers::setLayout(const BoxWhiskersData &data) QSizeF BoxWhiskers::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { - Q_UNUSED(which) - Q_UNUSED(constraint) + Q_UNUSED(which); + Q_UNUSED(constraint); return QSizeF(); } void BoxWhiskers::setGeometry(const QRectF &rect) { - Q_UNUSED(rect) + Q_UNUSED(rect); } QRectF BoxWhiskers::boundingRect() const @@ -139,8 +139,8 @@ QRectF BoxWhiskers::boundingRect() const void BoxWhiskers::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option) - Q_UNUSED(widget) + Q_UNUSED(option); + Q_UNUSED(widget); painter->save(); painter->setBrush(m_brush); diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.cpp b/src/charts/boxplotchart/qboxplotmodelmapper.cpp index 7d365d5f..a92bca46 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qboxplotmodelmapper.cpp @@ -272,8 +272,8 @@ void QBoxPlotModelMapperPrivate::handleSeriesDestroyed() void QBoxPlotModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight) { - Q_UNUSED(topLeft) - Q_UNUSED(bottomRight) + Q_UNUSED(topLeft); + Q_UNUSED(bottomRight); if (m_model == 0 || m_series == 0) return; @@ -307,7 +307,7 @@ void QBoxPlotModelMapperPrivate::modelHeaderDataUpdated(Qt::Orientation orientat void QBoxPlotModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -321,7 +321,7 @@ void QBoxPlotModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, i void QBoxPlotModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -335,7 +335,7 @@ void QBoxPlotModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, void QBoxPlotModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -349,7 +349,7 @@ void QBoxPlotModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start void QBoxPlotModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); if (m_modelSignalsBlock) return; @@ -368,9 +368,9 @@ void QBoxPlotModelMapperPrivate::handleModelDestroyed() void QBoxPlotModelMapperPrivate::insertData(int start, int end) { - Q_UNUSED(end) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(end); + Q_UNUSED(start); + Q_UNUSED(end); // Currently boxplotchart needs to be fully recalculated when change is made. // Re-initialize initializeBoxFromModel(); @@ -378,9 +378,9 @@ void QBoxPlotModelMapperPrivate::insertData(int start, int end) void QBoxPlotModelMapperPrivate::removeData(int start, int end) { - Q_UNUSED(end) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(end); + Q_UNUSED(start); + Q_UNUSED(end); // Currently boxplotchart needs to be fully recalculated when change is made. // Re-initialize initializeBoxFromModel(); diff --git a/src/charts/candlestickchart/candlestick.cpp b/src/charts/candlestickchart/candlestick.cpp index eb899d92..615033fc 100644 --- a/src/charts/candlestickchart/candlestick.cpp +++ b/src/charts/candlestickchart/candlestick.cpp @@ -146,7 +146,7 @@ void Candlestick::mousePressEvent(QGraphicsSceneMouseEvent *event) void Candlestick::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); m_hovering = true; emit hovered(m_hovering, m_set); @@ -154,7 +154,7 @@ void Candlestick::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void Candlestick::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); m_hovering = false; emit hovered(m_hovering, m_set); @@ -184,8 +184,8 @@ QRectF Candlestick::boundingRect() const void Candlestick::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option) - Q_UNUSED(widget) + Q_UNUSED(option); + Q_UNUSED(widget); bool increasingTrend = (m_data.m_open < m_data.m_close); QColor color = increasingTrend ? m_increasingColor : m_decreasingColor; diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp index e9cdc23d..199e43d2 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp +++ b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp @@ -477,7 +477,7 @@ void QCandlestickModelMapperPrivate::modelHeaderDataUpdated(Qt::Orientation orie void QCandlestickModelMapperPrivate::modelRowsInserted(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); Q_Q(QCandlestickModelMapper); @@ -494,7 +494,7 @@ void QCandlestickModelMapperPrivate::modelRowsInserted(QModelIndex parent, int s void QCandlestickModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); Q_Q(QCandlestickModelMapper); @@ -511,7 +511,7 @@ void QCandlestickModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int st void QCandlestickModelMapperPrivate::modelColumnsInserted(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); Q_Q(QCandlestickModelMapper); @@ -528,7 +528,7 @@ void QCandlestickModelMapperPrivate::modelColumnsInserted(QModelIndex parent, in void QCandlestickModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end) { - Q_UNUSED(parent) + Q_UNUSED(parent); Q_Q(QCandlestickModelMapper); @@ -689,8 +689,8 @@ QModelIndex QCandlestickModelMapperPrivate::candlestickModelIndex(int section, i void QCandlestickModelMapperPrivate::insertData(int start, int end) { - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(start); + Q_UNUSED(end); // Currently candlestickchart needs to be fully recalculated when change is made. initializeCandlestickFromModel(); @@ -698,8 +698,8 @@ void QCandlestickModelMapperPrivate::insertData(int start, int end) void QCandlestickModelMapperPrivate::removeData(int start, int end) { - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(start); + Q_UNUSED(end); // Currently candlestickchart needs to be fully recalculated when change is made. initializeCandlestickFromModel(); diff --git a/src/charts/chartbackground.cpp b/src/charts/chartbackground.cpp index 73a41a4f..145c1538 100644 --- a/src/charts/chartbackground.cpp +++ b/src/charts/chartbackground.cpp @@ -51,7 +51,7 @@ ChartBackground::~ChartBackground() void ChartBackground::setDropShadowEnabled(bool enabled) { #ifdef QT_NO_GRAPHICSEFFECT - Q_UNUSED(enabled) + Q_UNUSED(enabled); #else if (enabled) { if (!m_dropShadow) { diff --git a/src/charts/domain/abstractdomain.cpp b/src/charts/domain/abstractdomain.cpp index 36e4974a..107a74e4 100644 --- a/src/charts/domain/abstractdomain.cpp +++ b/src/charts/domain/abstractdomain.cpp @@ -267,7 +267,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const AbstractDomain &domain1, const Abstract QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const AbstractDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/logxlogydomain.cpp b/src/charts/domain/logxlogydomain.cpp index 021cb32c..be739622 100644 --- a/src/charts/domain/logxlogydomain.cpp +++ b/src/charts/domain/logxlogydomain.cpp @@ -291,7 +291,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYDomain &domain1, const LogXLogY QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/logxlogypolardomain.cpp b/src/charts/domain/logxlogypolardomain.cpp index f1a0df00..0efc9d5a 100644 --- a/src/charts/domain/logxlogypolardomain.cpp +++ b/src/charts/domain/logxlogypolardomain.cpp @@ -271,7 +271,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const LogXLogYPolarDomain &domain1, const Log QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/logxydomain.cpp b/src/charts/domain/logxydomain.cpp index 7334ce52..0f7500d3 100644 --- a/src/charts/domain/logxydomain.cpp +++ b/src/charts/domain/logxydomain.cpp @@ -260,7 +260,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const LogXYDomain &domain1, const LogXYDomain QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/logxypolardomain.cpp b/src/charts/domain/logxypolardomain.cpp index 359c8d55..c7217299 100644 --- a/src/charts/domain/logxypolardomain.cpp +++ b/src/charts/domain/logxypolardomain.cpp @@ -240,7 +240,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const LogXYPolarDomain &domain1, const LogXYP QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/xlogydomain.cpp b/src/charts/domain/xlogydomain.cpp index e6761826..35cea18c 100644 --- a/src/charts/domain/xlogydomain.cpp +++ b/src/charts/domain/xlogydomain.cpp @@ -257,7 +257,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const XLogYDomain &domain1, const XLogYDomain QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/xlogypolardomain.cpp b/src/charts/domain/xlogypolardomain.cpp index 5f8cecdb..dd6c11d7 100644 --- a/src/charts/domain/xlogypolardomain.cpp +++ b/src/charts/domain/xlogypolardomain.cpp @@ -235,7 +235,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const XLogYPolarDomain &domain1, const XLogYP QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/xydomain.cpp b/src/charts/domain/xydomain.cpp index 6fd97a6e..7454ac4b 100644 --- a/src/charts/domain/xydomain.cpp +++ b/src/charts/domain/xydomain.cpp @@ -232,7 +232,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const XYDomain &domain1, const XYDomain &doma QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/domain/xypolardomain.cpp b/src/charts/domain/xypolardomain.cpp index 1db3b9dc..8533f833 100644 --- a/src/charts/domain/xypolardomain.cpp +++ b/src/charts/domain/xypolardomain.cpp @@ -181,7 +181,7 @@ bool Q_AUTOTEST_EXPORT operator!= (const XYPolarDomain &domain1, const XYPolarDo QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain) { #ifdef QT_NO_TEXTSTREAM - Q_UNUSED(domain) + Q_UNUSED(domain); #else dbg.nospace() << "AbstractDomain(" << domain.m_minX << ',' << domain.m_maxX << ',' << domain.m_minY << ',' << domain.m_maxY << ')' << domain.m_size; #endif diff --git a/src/charts/layout/cartesianchartlayout.cpp b/src/charts/layout/cartesianchartlayout.cpp index 5e32c2e1..8d2c56d4 100644 --- a/src/charts/layout/cartesianchartlayout.cpp +++ b/src/charts/layout/cartesianchartlayout.cpp @@ -49,7 +49,7 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList &axes, bool update) const { - Q_UNUSED(update) + Q_UNUSED(update); QSizeF left(0,0); QSizeF minLeft(0,0); QSizeF right(0,0); diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp index 2986b687..dca69ffc 100644 --- a/src/charts/legend/legendmarkeritem.cpp +++ b/src/charts/legend/legendmarkeritem.cpp @@ -193,14 +193,14 @@ QRectF LegendMarkerItem::markerRect() const void LegendMarkerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option) - Q_UNUSED(widget) - Q_UNUSED(painter) + Q_UNUSED(option); + Q_UNUSED(widget); + Q_UNUSED(painter); } QSizeF LegendMarkerItem::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const { - Q_UNUSED(constraint) + Q_UNUSED(constraint); QSizeF sh; const qreal markerWidth = effectiveMarkerWidth(); @@ -227,14 +227,14 @@ QSizeF LegendMarkerItem::sizeHint(Qt::SizeHint which, const QSizeF& constraint) void LegendMarkerItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); m_hovering = true; emit m_marker->q_ptr->hovered(true); } void LegendMarkerItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); m_hovering = false; emit m_marker->q_ptr->hovered(false); } diff --git a/src/charts/legend/qlegend.cpp b/src/charts/legend/qlegend.cpp index 2fa9d5e3..7699742a 100644 --- a/src/charts/legend/qlegend.cpp +++ b/src/charts/legend/qlegend.cpp @@ -280,8 +280,8 @@ QLegend::~QLegend() */ void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option) - Q_UNUSED(widget) + Q_UNUSED(option); + Q_UNUSED(widget); if (!d_ptr->m_backgroundVisible) return; diff --git a/src/charts/linechart/linechartitem.cpp b/src/charts/linechart/linechartitem.cpp index 5d76cc2c..d6c264a5 100644 --- a/src/charts/linechart/linechartitem.cpp +++ b/src/charts/linechart/linechartitem.cpp @@ -359,8 +359,8 @@ void LineChartItem::handleUpdated() void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(widget) - Q_UNUSED(option) + Q_UNUSED(widget); + Q_UNUSED(option); if (m_series->useOpenGL()) return; diff --git a/src/charts/qabstractseries.cpp b/src/charts/qabstractseries.cpp index d9d33307..a9fde37f 100644 --- a/src/charts/qabstractseries.cpp +++ b/src/charts/qabstractseries.cpp @@ -314,7 +314,7 @@ void QAbstractSeries::setOpacity(qreal opacity) void QAbstractSeries::setUseOpenGL(bool enable) { #ifdef QT_NO_OPENGL - Q_UNUSED(enable) + Q_UNUSED(enable); #else bool polarChart = d_ptr->m_chart && d_ptr->m_chart->chartType() == QChart::ChartTypePolar; bool supportedSeries = (type() == SeriesTypeLine || type() == SeriesTypeScatter); diff --git a/src/charts/qchartview.cpp b/src/charts/qchartview.cpp index 0da6e18a..e9895ee3 100644 --- a/src/charts/qchartview.cpp +++ b/src/charts/qchartview.cpp @@ -265,7 +265,7 @@ void QChartView::mouseReleaseEvent(QMouseEvent *event) #if QT_CONFIG(wheelevent) void QChartView::wheelEvent(QWheelEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); // We just need to override wheelEvent, or scrolling won't work correctly on macOS trackpad // (QTBUG-77403) } diff --git a/src/charts/scatterchart/scatterchartitem.cpp b/src/charts/scatterchart/scatterchartitem.cpp index c9b6d301..4caf92f0 100644 --- a/src/charts/scatterchart/scatterchartitem.cpp +++ b/src/charts/scatterchart/scatterchartitem.cpp @@ -211,8 +211,8 @@ void ScatterChartItem::updateGeometry() void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(option) - Q_UNUSED(widget) + Q_UNUSED(option); + Q_UNUSED(widget); if (m_series->useOpenGL()) return; diff --git a/src/charts/splinechart/splinechartitem.cpp b/src/charts/splinechart/splinechartitem.cpp index 94a66906..756160b2 100644 --- a/src/charts/splinechart/splinechartitem.cpp +++ b/src/charts/splinechart/splinechartitem.cpp @@ -440,8 +440,8 @@ void SplineChartItem::handleUpdated() void SplineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { - Q_UNUSED(widget) - Q_UNUSED(option) + Q_UNUSED(widget); + Q_UNUSED(option); QRectF clipRect = QRectF(QPointF(0, 0), domain()->size()); diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index d76930a0..ba24fb89 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -44,8 +44,8 @@ DeclarativeBarSet::DeclarativeBarSet(QObject *parent) void DeclarativeBarSet::handleCountChanged(int index, int count) { - Q_UNUSED(index) - Q_UNUSED(count) + Q_UNUSED(index); + Q_UNUSED(count); emit countChanged(QBarSet::count()); } diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 8f6a2b20..5560929f 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -126,8 +126,8 @@ void DeclarativeCategoryAxis::replace(const QString &oldLabel, const QString &ne void DeclarativeCategoryAxis::appendAxisChildren(QQmlListProperty *list, QObject *element) { // Empty implementation; the children are parsed in componentComplete instead - Q_UNUSED(list) - Q_UNUSED(element) + Q_UNUSED(list); + Q_UNUSED(element); } DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosition() const diff --git a/src/chartsqml2/declarativelineseries.cpp b/src/chartsqml2/declarativelineseries.cpp index 7f3e2b8d..f0ed07be 100644 --- a/src/chartsqml2/declarativelineseries.cpp +++ b/src/chartsqml2/declarativelineseries.cpp @@ -48,7 +48,7 @@ DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) : void DeclarativeLineSeries::handleCountChanged(int index) { - Q_UNUSED(index) + Q_UNUSED(index); emit countChanged(points().count()); } @@ -104,8 +104,8 @@ QQmlListProperty DeclarativeLineSeries::declarativeChildren() void DeclarativeLineSeries::appendDeclarativeChildren(QQmlListProperty *list, QObject *element) { - Q_UNUSED(list) - Q_UNUSED(element) + Q_UNUSED(list); + Q_UNUSED(element); // Empty implementation, children are parsed in componentComplete } diff --git a/src/chartsqml2/declarativescatterseries.cpp b/src/chartsqml2/declarativescatterseries.cpp index 604fa4c5..78eba76e 100644 --- a/src/chartsqml2/declarativescatterseries.cpp +++ b/src/chartsqml2/declarativescatterseries.cpp @@ -49,7 +49,7 @@ DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) : void DeclarativeScatterSeries::handleCountChanged(int index) { - Q_UNUSED(index) + Q_UNUSED(index); emit countChanged(QScatterSeries::count()); } @@ -75,8 +75,8 @@ QQmlListProperty DeclarativeScatterSeries::declarativeChildren() void DeclarativeScatterSeries::appendDeclarativeChildren(QQmlListProperty *list, QObject *element) { - Q_UNUSED(list) - Q_UNUSED(element) + Q_UNUSED(list); + Q_UNUSED(element); // Empty implementation, children are parsed in componentComplete } diff --git a/src/chartsqml2/declarativesplineseries.cpp b/src/chartsqml2/declarativesplineseries.cpp index 6ade7b92..3cdcf17a 100644 --- a/src/chartsqml2/declarativesplineseries.cpp +++ b/src/chartsqml2/declarativesplineseries.cpp @@ -48,7 +48,7 @@ DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) : void DeclarativeSplineSeries::handleCountChanged(int index) { - Q_UNUSED(index) + Q_UNUSED(index); emit countChanged(points().count()); } @@ -104,8 +104,8 @@ QQmlListProperty DeclarativeSplineSeries::declarativeChildren() void DeclarativeSplineSeries::appendDeclarativeChildren(QQmlListProperty *list, QObject *element) { - Q_UNUSED(list) - Q_UNUSED(element) + Q_UNUSED(list); + Q_UNUSED(element); // Empty implementation, children are parsed in componentComplete } diff --git a/tests/manual/boxplottester/customtablemodel.cpp b/tests/manual/boxplottester/customtablemodel.cpp index 6d21f5b0..f74335c2 100644 --- a/tests/manual/boxplottester/customtablemodel.cpp +++ b/tests/manual/boxplottester/customtablemodel.cpp @@ -96,13 +96,13 @@ CustomTableModel::~CustomTableModel() int CustomTableModel::rowCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_rowCount; } int CustomTableModel::columnCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_data.count(); } diff --git a/tests/manual/candlesticktester/customtablemodel.cpp b/tests/manual/candlesticktester/customtablemodel.cpp index ae995b22..0466e39c 100644 --- a/tests/manual/candlesticktester/customtablemodel.cpp +++ b/tests/manual/candlesticktester/customtablemodel.cpp @@ -50,14 +50,14 @@ CustomTableModel::~CustomTableModel() int CustomTableModel::rowCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_data.count(); } int CustomTableModel::columnCount(const QModelIndex &parent) const { - Q_UNUSED(parent) + Q_UNUSED(parent); return m_categories.count(); } -- cgit v1.2.3