summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 14:18:09 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-07-07 11:51:48 +0200
commit6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch)
tree727427eb4c603e74954d4da462484ea7bf5c65bb /src/gui/kernel
parentd9cc1499954829faf9486fb72056e29f1bad58e3 (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/gui/kernel')
-rw-r--r--src/gui/kernel/qguiapplication.cpp8
-rw-r--r--src/gui/kernel/qhighdpiscaling_p.h2
-rw-r--r--src/gui/kernel/qplatformdialoghelper.cpp4
-rw-r--r--src/gui/kernel/qplatformgraphicsbufferhelper.cpp8
-rw-r--r--src/gui/kernel/qplatforminputcontext.cpp8
-rw-r--r--src/gui/kernel/qplatformintegration.cpp6
-rw-r--r--src/gui/kernel/qplatformintegrationplugin.cpp6
-rw-r--r--src/gui/kernel/qplatformnativeinterface.cpp2
-rw-r--r--src/gui/kernel/qplatformsessionmanager.cpp8
-rw-r--r--src/gui/kernel/qplatformtheme.cpp4
-rw-r--r--src/gui/kernel/qplatformwindow.cpp6
-rw-r--r--src/gui/kernel/qwindow.cpp2
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp36
13 files changed, 50 insertions, 50 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 4d2d79c274..34331e3b0e 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -2676,7 +2676,7 @@ void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::T
processMouseEvent(&mouseEvent);
}
#else
- Q_UNUSED(e)
+ Q_UNUSED(e);
#endif
}
@@ -2690,7 +2690,7 @@ void QGuiApplicationPrivate::processTabletEnterProximityEvent(QWindowSystemInter
ev.setTimestamp(e->timestamp);
QGuiApplication::sendSpontaneousEvent(qGuiApp, &ev);
#else
- Q_UNUSED(e)
+ Q_UNUSED(e);
#endif
}
@@ -2704,7 +2704,7 @@ void QGuiApplicationPrivate::processTabletLeaveProximityEvent(QWindowSystemInter
ev.setTimestamp(e->timestamp);
QGuiApplication::sendSpontaneousEvent(qGuiApp, &ev);
#else
- Q_UNUSED(e)
+ Q_UNUSED(e);
#endif
}
@@ -4196,7 +4196,7 @@ void QGuiApplicationPrivate::notifyThemeChanged()
#if QT_CONFIG(draganddrop)
void QGuiApplicationPrivate::notifyDragStarted(const QDrag *drag)
{
- Q_UNUSED(drag)
+ Q_UNUSED(drag);
}
#endif
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index dfacf2a4f3..542506dcb0 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -179,7 +179,7 @@ inline QRectF scale(const QRectF &rect, qreal scaleFactor, QPoint origin = QPoin
inline QMargins scale(const QMargins &margins, qreal scaleFactor, QPoint origin = QPoint(0, 0))
{
- Q_UNUSED(origin)
+ Q_UNUSED(origin);
return QMargins(qRound(qreal(margins.left()) * scaleFactor), qRound(qreal(margins.top()) * scaleFactor),
qRound(qreal(margins.right()) * scaleFactor), qRound(qreal(margins.bottom()) * scaleFactor));
}
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index 443f5d2552..4c2e1af84d 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -741,7 +741,7 @@ QStringList QFileDialogOptions::supportedSchemes() const
void QPlatformFileDialogHelper::selectMimeTypeFilter(const QString &filter)
{
- Q_UNUSED(filter)
+ Q_UNUSED(filter);
}
QString QPlatformFileDialogHelper::selectedMimeTypeFilter() const
@@ -790,7 +790,7 @@ QStringList QPlatformFileDialogHelper::cleanFilterList(const QString &filter)
f = match.captured(2);
return f.split(QLatin1Char(' '), Qt::SkipEmptyParts);
#else
- Q_UNUSED(filter)
+ Q_UNUSED(filter);
return QStringList();
#endif
}
diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
index ab9a92a383..ff72171b85 100644
--- a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
+++ b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
@@ -255,10 +255,10 @@ bool QPlatformGraphicsBufferHelper::bindSWToTexture(const QPlatformGraphicsBuffe
return true;
#else
- Q_UNUSED(graphicsBuffer)
- Q_UNUSED(swizzleRandB)
- Q_UNUSED(premultipliedB)
- Q_UNUSED(subRect)
+ Q_UNUSED(graphicsBuffer);
+ Q_UNUSED(swizzleRandB);
+ Q_UNUSED(premultipliedB);
+ Q_UNUSED(subRect);
return false;
#endif // QT_NO_OPENGL
}
diff --git a/src/gui/kernel/qplatforminputcontext.cpp b/src/gui/kernel/qplatforminputcontext.cpp
index 9771e6ba11..83a05d0221 100644
--- a/src/gui/kernel/qplatforminputcontext.cpp
+++ b/src/gui/kernel/qplatforminputcontext.cpp
@@ -106,7 +106,7 @@ bool QPlatformInputContext::isValid() const
*/
bool QPlatformInputContext::hasCapability(Capability capability) const
{
- Q_UNUSED(capability)
+ Q_UNUSED(capability);
return true;
}
@@ -136,7 +136,7 @@ void QPlatformInputContext::update(Qt::InputMethodQueries)
*/
void QPlatformInputContext::invokeAction(QInputMethod::Action action, int cursorPosition)
{
- Q_UNUSED(cursorPosition)
+ Q_UNUSED(cursorPosition);
// Default behavior for simple ephemeral input contexts. Some
// complex input contexts should not be reset here.
if (action == QInputMethod::Click)
@@ -151,7 +151,7 @@ void QPlatformInputContext::invokeAction(QInputMethod::Action action, int cursor
*/
bool QPlatformInputContext::filterEvent(const QEvent *event)
{
- Q_UNUSED(event)
+ Q_UNUSED(event);
return false;
}
@@ -251,7 +251,7 @@ void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDir
*/
void QPlatformInputContext::setFocusObject(QObject *object)
{
- Q_UNUSED(object)
+ Q_UNUSED(object);
}
/*!
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index 63f66e6bf7..090629073a 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -324,7 +324,7 @@ QPlatformSharedGraphicsCache *QPlatformIntegration::createPlatformSharedGraphics
*/
QPaintEngine *QPlatformIntegration::createImagePaintEngine(QPaintDevice *paintDevice) const
{
- Q_UNUSED(paintDevice)
+ Q_UNUSED(paintDevice);
return nullptr;
}
@@ -472,7 +472,7 @@ QStringList QPlatformIntegration::themeNames() const
class QPlatformTheme *QPlatformIntegration::createPlatformTheme(const QString &name) const
{
- Q_UNUSED(name)
+ Q_UNUSED(name);
return new QPlatformTheme;
}
@@ -483,7 +483,7 @@ class QPlatformTheme *QPlatformIntegration::createPlatformTheme(const QString &n
*/
QPlatformOffscreenSurface *QPlatformIntegration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const
{
- Q_UNUSED(surface)
+ Q_UNUSED(surface);
return nullptr;
}
diff --git a/src/gui/kernel/qplatformintegrationplugin.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp
index b100eacbb5..e024276797 100644
--- a/src/gui/kernel/qplatformintegrationplugin.cpp
+++ b/src/gui/kernel/qplatformintegrationplugin.cpp
@@ -52,15 +52,15 @@ QPlatformIntegrationPlugin::~QPlatformIntegrationPlugin()
QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, const QStringList &paramList)
{
- Q_UNUSED(key)
+ Q_UNUSED(key);
Q_UNUSED(paramList);
return nullptr;
}
QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, const QStringList &paramList, int &argc, char **argv)
{
- Q_UNUSED(argc)
- Q_UNUSED(argv)
+ Q_UNUSED(argc);
+ Q_UNUSED(argv);
return create(key, paramList); // Fallback for platform plugins that do not implement the argc/argv version.
}
diff --git a/src/gui/kernel/qplatformnativeinterface.cpp b/src/gui/kernel/qplatformnativeinterface.cpp
index 8c9e73fbc2..15b08e195a 100644
--- a/src/gui/kernel/qplatformnativeinterface.cpp
+++ b/src/gui/kernel/qplatformnativeinterface.cpp
@@ -137,7 +137,7 @@ QFunctionPointer QPlatformNativeInterface::platformFunction(const QByteArray &fu
*/
QVariantMap QPlatformNativeInterface::windowProperties(QPlatformWindow *window) const
{
- Q_UNUSED(window)
+ Q_UNUSED(window);
return QVariantMap();
}
diff --git a/src/gui/kernel/qplatformsessionmanager.cpp b/src/gui/kernel/qplatformsessionmanager.cpp
index a66fc6d016..bc4ce22c0f 100644
--- a/src/gui/kernel/qplatformsessionmanager.cpp
+++ b/src/gui/kernel/qplatformsessionmanager.cpp
@@ -118,14 +118,14 @@ QStringList QPlatformSessionManager::discardCommand() const
void QPlatformSessionManager::setManagerProperty(const QString &name, const QString &value)
{
- Q_UNUSED(name)
- Q_UNUSED(value)
+ Q_UNUSED(name);
+ Q_UNUSED(value);
}
void QPlatformSessionManager::setManagerProperty(const QString &name, const QStringList &value)
{
- Q_UNUSED(name)
- Q_UNUSED(value)
+ Q_UNUSED(name);
+ Q_UNUSED(value);
}
bool QPlatformSessionManager::isPhase2() const
diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp
index 6d0c49c327..b086989b15 100644
--- a/src/gui/kernel/qplatformtheme.cpp
+++ b/src/gui/kernel/qplatformtheme.cpp
@@ -410,7 +410,7 @@ const QPalette *QPlatformTheme::palette(Palette type) const
const QFont *QPlatformTheme::font(Font type) const
{
- Q_UNUSED(type)
+ Q_UNUSED(type);
return nullptr;
}
@@ -698,7 +698,7 @@ QString QPlatformTheme::standardButtonText(int button) const
QKeySequence QPlatformTheme::standardButtonShortcut(int button) const
{
- Q_UNUSED(button)
+ Q_UNUSED(button);
return QKeySequence();
}
#endif // QT_CONFIG(shortcut)
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index fc736033c2..c6e6afcc91 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -492,7 +492,7 @@ bool QPlatformWindow::windowEvent(QEvent *event)
bool QPlatformWindow::startSystemResize(Qt::Edges edges)
{
- Q_UNUSED(edges)
+ Q_UNUSED(edges);
return false;
}
@@ -519,7 +519,7 @@ bool QPlatformWindow::startSystemMove()
void QPlatformWindow::setFrameStrutEventsEnabled(bool enabled)
{
- Q_UNUSED(enabled) // Do not warn as widgets enable it by default causing warnings with XCB.
+ Q_UNUSED(enabled); // Do not warn as widgets enable it by default causing warnings with XCB.
}
/*!
@@ -607,7 +607,7 @@ QSize QPlatformWindow::constrainWindowSize(const QSize &size)
void QPlatformWindow::setAlertState(bool enable)
{
- Q_UNUSED(enable)
+ Q_UNUSED(enable);
}
/*!
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index c06f03f4e7..9e11156c26 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -571,7 +571,7 @@ void QWindowPrivate::clearFocusObject()
// implement heightForWidth().
QRectF QWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
{
- Q_UNUSED(rect)
+ Q_UNUSED(rect);
return QRectF();
}
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index fb9f4cafe0..271a627a1d 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -473,16 +473,16 @@ bool QWindowSystemInterface::handleShortcutEvent(QWindow *window, ulong timestam
return shortcutMap.tryShortcut(&keyEvent);
#else
- Q_UNUSED(window)
- Q_UNUSED(timestamp)
- Q_UNUSED(keyCode)
- Q_UNUSED(modifiers)
- Q_UNUSED(nativeScanCode)
- Q_UNUSED(nativeVirtualKey)
- Q_UNUSED(nativeModifiers)
- Q_UNUSED(text)
- Q_UNUSED(autorepeat)
- Q_UNUSED(count)
+ Q_UNUSED(window);
+ Q_UNUSED(timestamp);
+ Q_UNUSED(keyCode);
+ Q_UNUSED(modifiers);
+ Q_UNUSED(nativeScanCode);
+ Q_UNUSED(nativeVirtualKey);
+ Q_UNUSED(nativeModifiers);
+ Q_UNUSED(text);
+ Q_UNUSED(autorepeat);
+ Q_UNUSED(count);
return false;
#endif
}
@@ -528,7 +528,7 @@ bool QWindowSystemInterface::handleExtendedKeyEvent(QWindow *window, ulong times
return true;
}
#else
- Q_UNUSED(tryShortcutOverride)
+ Q_UNUSED(tryShortcutOverride);
#endif
QWindowSystemInterfacePrivate::KeyEvent * e =
@@ -1222,13 +1222,13 @@ Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int
// Then as QShortcutEvent
return shortcutMap.tryShortcut(&qevent);
#else
- Q_UNUSED(o)
- Q_UNUSED(timestamp)
- Q_UNUSED(k)
- Q_UNUSED(mods)
- Q_UNUSED(text)
- Q_UNUSED(autorep)
- Q_UNUSED(count)
+ Q_UNUSED(o);
+ Q_UNUSED(timestamp);
+ Q_UNUSED(k);
+ Q_UNUSED(mods);
+ Q_UNUSED(text);
+ Q_UNUSED(autorep);
+ Q_UNUSED(count);
return false;
#endif
}