From 588eab99d26783d5aa154f788c791a3addf60f95 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Wed, 5 Apr 2023 10:38:39 +0300 Subject: [PATCH] Fix some extra semicolon warnings Fixes: QTBUG-112648 Pick-to: 6.5 Change-Id: I71446459c7fd6018ecb4deb60a7b9b412c0972ba Reviewed-by: Volker Hilsheimer --- src/corelib/global/qdarwinhelpers.h | 4 ++-- src/widgets/itemviews/qtablewidget.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/corelib/global/qdarwinhelpers.h b/src/corelib/global/qdarwinhelpers.h index 2ffc740d580..ad72211663b 100644 --- a/src/corelib/global/qdarwinhelpers.h +++ b/src/corelib/global/qdarwinhelpers.h @@ -27,10 +27,10 @@ # define Q_FORWARD_DECLARE_MUTABLE_CF_TYPE(type) typedef struct __ ## type * type ## Ref #endif #ifndef Q_FORWARD_DECLARE_CG_TYPE -#define Q_FORWARD_DECLARE_CG_TYPE(type) typedef const struct type *type ## Ref; +# define Q_FORWARD_DECLARE_CG_TYPE(type) typedef const struct type *type##Ref #endif #ifndef Q_FORWARD_DECLARE_MUTABLE_CG_TYPE -#define Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(type) typedef struct type *type ## Ref; +# define Q_FORWARD_DECLARE_MUTABLE_CG_TYPE(type) typedef struct type *type##Ref #endif diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index c7545f13dd4..8f4cb9a6608 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -23,8 +23,10 @@ public: friend bool operator==(const QTableWidgetSelectionRange &lhs, const QTableWidgetSelectionRange &rhs) noexcept - { return lhs.m_top == rhs.m_top && lhs.m_left == rhs.m_left - && lhs.m_bottom == rhs.m_bottom && lhs.m_right == rhs.m_right; }; + { + return lhs.m_top == rhs.m_top && lhs.m_left == rhs.m_left && lhs.m_bottom == rhs.m_bottom + && lhs.m_right == rhs.m_right; + } friend bool operator!=(const QTableWidgetSelectionRange &lhs, const QTableWidgetSelectionRange &rhs) noexcept { return !(lhs == rhs); }