diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-27 14:18:09 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-07 11:51:48 +0200 |
| commit | 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch) | |
| tree | 727427eb4c603e74954d4da462484ea7bf5c65bb /src/printsupport | |
| parent | d9cc1499954829faf9486fb72056e29f1bad58e3 (diff) | |
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/printsupport')
4 files changed, 15 insertions, 15 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index bc8591b8fb..6dcb613ff5 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -313,7 +313,7 @@ QPrintPropertiesDialog::QPrintPropertiesDialog(QPrinter *printer, QPrintDevice * }); #else - Q_UNUSED(currentPrintDevice) + Q_UNUSED(currentPrintDevice); widget.tabs->setTabEnabled(advancedTabIndex, false); #endif } diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp index 8a39047bbf..748ac50d86 100644 --- a/src/printsupport/kernel/qplatformprintdevice.cpp +++ b/src/printsupport/kernel/qplatformprintdevice.cpp @@ -259,9 +259,9 @@ QMarginsF QPlatformPrintDevice::printableMargins(const QPageSize &pageSize, QPageLayout::Orientation orientation, int resolution) const { - Q_UNUSED(pageSize) - Q_UNUSED(orientation) - Q_UNUSED(resolution) + Q_UNUSED(pageSize); + Q_UNUSED(orientation); + Q_UNUSED(resolution); return QMarginsF(0, 0, 0, 0); } @@ -361,23 +361,23 @@ void QPlatformPrintDevice::loadMimeTypes() const QVariant QPlatformPrintDevice::property(QPrintDevice::PrintDevicePropertyKey key) const { - Q_UNUSED(key) + Q_UNUSED(key); return QVariant(); } bool QPlatformPrintDevice::setProperty(QPrintDevice::PrintDevicePropertyKey key, const QVariant &value) { - Q_UNUSED(key) - Q_UNUSED(value) + Q_UNUSED(key); + Q_UNUSED(value); return false; } bool QPlatformPrintDevice::isFeatureAvailable(QPrintDevice::PrintDevicePropertyKey key, const QVariant ¶ms) const { - Q_UNUSED(key) - Q_UNUSED(params) + Q_UNUSED(key); + Q_UNUSED(params); return false; } diff --git a/src/printsupport/kernel/qplatformprintersupport.cpp b/src/printsupport/kernel/qplatformprintersupport.cpp index a25dc6d45c..31fe5b57af 100644 --- a/src/printsupport/kernel/qplatformprintersupport.cpp +++ b/src/printsupport/kernel/qplatformprintersupport.cpp @@ -85,7 +85,7 @@ QPrintDevice QPlatformPrinterSupport::createPrintDevice(QPlatformPrintDevice *de QPrintDevice QPlatformPrinterSupport::createPrintDevice(const QString &id) { - Q_UNUSED(id) + Q_UNUSED(id); return QPrintDevice(); } @@ -101,9 +101,9 @@ QString QPlatformPrinterSupport::defaultPrintDeviceId() const QPageSize QPlatformPrinterSupport::createPageSize(const QString &id, QSize size, const QString &localizedName) { - Q_UNUSED(id) - Q_UNUSED(size) - Q_UNUSED(localizedName) + Q_UNUSED(id); + Q_UNUSED(size); + Q_UNUSED(localizedName); return QPageSize(); } diff --git a/src/printsupport/platform/macos/qcocoaprintdevice.mm b/src/printsupport/platform/macos/qcocoaprintdevice.mm index fe7e1ee912..704418d194 100644 --- a/src/printsupport/platform/macos/qcocoaprintdevice.mm +++ b/src/printsupport/platform/macos/qcocoaprintdevice.mm @@ -215,8 +215,8 @@ QMarginsF QCocoaPrintDevice::printableMargins(const QPageSize &pageSize, QPageLayout::Orientation orientation, int resolution) const { - Q_UNUSED(orientation) - Q_UNUSED(resolution) + Q_UNUSED(orientation); + Q_UNUSED(resolution); if (!m_havePageSizes) loadPageSizes(); if (m_printableMargins.contains(pageSize.key())) |