1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GCC -Wextra-semi warnings with Q* macros

Browse Source 
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 <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
(cherry picked from commit 8d3601dfe8e6a89cbf0ab0ff8089e232f52c21d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2024-12-12 01:28:15 +02:00 committed by Qt Cherry-pick Bot
parent 9bcbeea2ad
commit dbaef86144
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qkeysequence.h
View File

@ -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);

4
src/gui/kernel/qplatformdialoghelper.h
View File

@ -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 };

6
src/gui/kernel/qplatformgraphicsbuffer.h
View File

@ -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();

2
src/gui/kernel/qplatformtheme.h
View File

@ -108,7 +108,7 @@ public:
FontDialog,
MessageDialog
};
Q_ENUM(DialogType);
Q_ENUM(DialogType)
enum Palette {
SystemPalette,

4
src/gui/painting/qcolormatrix_p.h
View File

@ -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

2
src/gui/painting/qcolortrc_p.h
View File

@ -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;

4
src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
View File

@ -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 {

2
src/testlib/qtestlog_p.h
View File

@ -47,7 +47,7 @@ public:
, XCTest
#endif
};
Q_ENUM(LogMode);
Q_ENUM(LogMode)
static void enterTestFunction(const char* function);
static void leaveTestFunction();