From 09e937788d0bb32a133fbf668b834fa13e7669c3 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Fri, 26 Jun 2020 14:42:52 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843 Reviewed-by: Friedemann Kleint Reviewed-by: Jarek Kobus --- examples/datavisualization/audiolevels/audiolevelsiodevice.cpp | 4 ++-- examples/datavisualization/custominput/custominputhandler.cpp | 2 +- examples/datavisualization/customproxy/variantbardataproxy.cpp | 4 ++-- examples/datavisualization/itemmodel/main.cpp | 4 ++-- examples/datavisualization/qmlaxisformatter/customformatter.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp index f1a9ba8e..7cd2bbb3 100644 --- a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp @@ -57,8 +57,8 @@ AudioLevelsIODevice::AudioLevelsIODevice(QBarDataProxy *proxy, QObject *parent) // Implementation required for this pure virtual function qint64 AudioLevelsIODevice::readData(char *data, qint64 maxSize) { - Q_UNUSED(data) - Q_UNUSED(maxSize) + Q_UNUSED(data); + Q_UNUSED(maxSize); return -1; } diff --git a/examples/datavisualization/custominput/custominputhandler.cpp b/examples/datavisualization/custominput/custominputhandler.cpp index 3e61f904..e6fe9aa5 100644 --- a/examples/datavisualization/custominput/custominputhandler.cpp +++ b/examples/datavisualization/custominput/custominputhandler.cpp @@ -39,7 +39,7 @@ CustomInputHandler::CustomInputHandler(QObject *parent) : //! [0] void CustomInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) { - Q_UNUSED(event) + Q_UNUSED(event); setInputPosition(mousePos); } //! [0] diff --git a/examples/datavisualization/customproxy/variantbardataproxy.cpp b/examples/datavisualization/customproxy/variantbardataproxy.cpp index 5cace5a8..587ef0c9 100644 --- a/examples/datavisualization/customproxy/variantbardataproxy.cpp +++ b/examples/datavisualization/customproxy/variantbardataproxy.cpp @@ -92,8 +92,8 @@ VariantBarDataMapping *VariantBarDataProxy::mapping() void VariantBarDataProxy::handleItemsAdded(int index, int count) { - Q_UNUSED(index) - Q_UNUSED(count) + Q_UNUSED(index); + Q_UNUSED(count); // Resolve new items resolveDataSet(); diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp index 3fca06b3..35bf7e0d 100644 --- a/examples/datavisualization/itemmodel/main.cpp +++ b/examples/datavisualization/itemmodel/main.cpp @@ -229,8 +229,8 @@ void GraphDataGenerator::selectFromTable(const QPoint &selection) void GraphDataGenerator::selectedFromTable(int currentRow, int currentColumn, int previousRow, int previousColumn) { - Q_UNUSED(previousRow) - Q_UNUSED(previousColumn) + Q_UNUSED(previousRow); + Q_UNUSED(previousColumn); m_graph->seriesList().at(0)->setSelectedBar(QPoint(currentRow, currentColumn)); } //! [14] diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.cpp b/examples/datavisualization/qmlaxisformatter/customformatter.cpp index 6074b778..fb469065 100644 --- a/examples/datavisualization/qmlaxisformatter/customformatter.cpp +++ b/examples/datavisualization/qmlaxisformatter/customformatter.cpp @@ -127,7 +127,7 @@ void CustomFormatter::recalculate() //! [3] QString CustomFormatter::stringForValue(qreal value, const QString &format) const { - Q_UNUSED(format) + Q_UNUSED(format); return valueToDateTime(value).toString(m_selectionFormat); } -- cgit v1.2.3