From dbaef86144372ce17f5c49b61454b2edfa1b2b6e Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 12 Dec 2024 01:28:15 +0200 Subject: [PATCH] Fix GCC -Wextra-semi warnings with Q* macros Namely, Q_ENUM, Q_DECLAR_FLAGS, Q_FLAG, Q_DECLARE_EQUALITY_COMPARABLE. The sanitize-commit (from qtrepotools repo) git hook already warns about these. Pick-to: 6.8 Change-Id: If53f446c7c19856c4a5be1e0b0156e1892871dae Reviewed-by: Thiago Macieira Reviewed-by: Giuseppe D'Angelo (cherry picked from commit 8d3601dfe8e6a89cbf0ab0ff8089e232f52c21d2) Reviewed-by: Qt Cherry-pick Bot --- src/gui/kernel/qkeysequence.h | 2 +- src/gui/kernel/qplatformdialoghelper.h | 4 ++-- src/gui/kernel/qplatformgraphicsbuffer.h | 6 +++--- src/gui/kernel/qplatformtheme.h | 2 +- src/gui/painting/qcolormatrix_p.h | 4 ++-- src/gui/painting/qcolortrc_p.h | 2 +- .../networkmanager/qnetworkmanagerservice.h | 4 ++-- src/testlib/qtestlog_p.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 4dae26a7558..f2d9df5f1e2 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -136,7 +136,7 @@ public: PartialMatch, ExactMatch }; - Q_ENUM(SequenceMatch); + Q_ENUM(SequenceMatch) QString toString(SequenceFormat format = PortableText) const; static QKeySequence fromString(const QString &str, SequenceFormat format = PortableText); diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h index 0569a7e2f94..848ec34adc9 100644 --- a/src/gui/kernel/qplatformdialoghelper.h +++ b/src/gui/kernel/qplatformdialoghelper.h @@ -408,8 +408,8 @@ public: enum class Option { DontUseNativeDialog = 0x00000001, }; - Q_DECLARE_FLAGS(Options, Option); - Q_FLAG(Options); + Q_DECLARE_FLAGS(Options, Option) + Q_FLAG(Options) // Keep in sync with QMessageBox::Icon enum StandardIcon { NoIcon, Information, Warning, Critical, Question }; diff --git a/src/gui/kernel/qplatformgraphicsbuffer.h b/src/gui/kernel/qplatformgraphicsbuffer.h index 6723c63f0c8..e706397dffb 100644 --- a/src/gui/kernel/qplatformgraphicsbuffer.h +++ b/src/gui/kernel/qplatformgraphicsbuffer.h @@ -35,14 +35,14 @@ public: TextureAccess = 0x04, HWCompositor = 0x08 }; - Q_ENUM(AccessType); - Q_DECLARE_FLAGS(AccessTypes, AccessType); + Q_ENUM(AccessType) + Q_DECLARE_FLAGS(AccessTypes, AccessType) enum Origin { OriginBottomLeft, OriginTopLeft }; - Q_ENUM(Origin); + Q_ENUM(Origin) ~QPlatformGraphicsBuffer(); diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 6965e55fcc4..e86cb5269fb 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -108,7 +108,7 @@ public: FontDialog, MessageDialog }; - Q_ENUM(DialogType); + Q_ENUM(DialogType) enum Palette { SystemPalette, diff --git a/src/gui/painting/qcolormatrix_p.h b/src/gui/painting/qcolormatrix_p.h index b08d6fbd052..296b06f2c0e 100644 --- a/src/gui/painting/qcolormatrix_p.h +++ b/src/gui/painting/qcolormatrix_p.h @@ -175,7 +175,7 @@ public: return QColorVector(xr, yr, zr); } friend inline bool comparesEqual(const QColorVector &lhs, const QColorVector &rhs) noexcept; - Q_DECLARE_EQUALITY_COMPARABLE(QColorVector); + Q_DECLARE_EQUALITY_COMPARABLE(QColorVector) private: static float fastCbrt(float x) @@ -343,7 +343,7 @@ public: { 0.125092f, 0.0456238f, 0.797134f } }; } friend inline bool comparesEqual(const QColorMatrix &lhs, const QColorMatrix &rhs) noexcept; - Q_DECLARE_EQUALITY_COMPARABLE(QColorMatrix); + Q_DECLARE_EQUALITY_COMPARABLE(QColorMatrix) }; inline bool comparesEqual(const QColorMatrix &m1, const QColorMatrix &m2) noexcept diff --git a/src/gui/painting/qcolortrc_p.h b/src/gui/painting/qcolortrc_p.h index 4dc2fe8b789..8d0a8a17360 100644 --- a/src/gui/painting/qcolortrc_p.h +++ b/src/gui/painting/qcolortrc_p.h @@ -115,7 +115,7 @@ public: Type m_type; friend inline bool comparesEqual(const QColorTrc &lhs, const QColorTrc &rhs); - Q_DECLARE_EQUALITY_COMPARABLE_NON_NOEXCEPT(QColorTrc); + Q_DECLARE_EQUALITY_COMPARABLE_NON_NOEXCEPT(QColorTrc) QColorTransferFunction m_fun; QColorTransferTable m_table; diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h index 5201e8485bb..1a5cec44410 100644 --- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h +++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h @@ -72,7 +72,7 @@ public: NM_STATE_CONNECTED_SITE = 60, NM_STATE_CONNECTED_GLOBAL = 70 }; - Q_ENUM(NMState); + Q_ENUM(NMState) // Matches 'NMConnectivityState' from // https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMConnectivityState enum NMConnectivityState { @@ -82,7 +82,7 @@ public: NM_CONNECTIVITY_LIMITED = 3, NM_CONNECTIVITY_FULL = 4, }; - Q_ENUM(NMConnectivityState); + Q_ENUM(NMConnectivityState) // Matches 'NMDeviceType' from // https://developer-old.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMDeviceType enum NMDeviceType { diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index 8998a436e5c..3c2f6d3f3f8 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -47,7 +47,7 @@ public: , XCTest #endif }; - Q_ENUM(LogMode); + Q_ENUM(LogMode) static void enterTestFunction(const char* function); static void leaveTestFunction();