From 997abb0520cdfbde60e0fe4fdb133e15e24ce871 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 19 Dec 2024 11:32:53 +0200 Subject: [PATCH] src/plugins/*: fix GCC -Wextra-semi colon after member func definition Pick-to: 6.9 6.8 Task-number: QTBUG-132101 Change-Id: I947fdb66df9b6d86c60139046166395e4ae42127 Reviewed-by: Thiago Macieira --- src/plugins/platforminputcontexts/ibus/qibustypes.h | 4 ++-- .../platforms/offscreen/qoffscreenintegration_x11.h | 2 +- src/plugins/platformthemes/gtk3/qgtk3json_p.h | 2 +- src/plugins/platformthemes/gtk3/qgtk3storage_p.h | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h index b697e432a07..7940a7a3586 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.h +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h @@ -136,7 +136,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusEngin class QIBusPropTypeClientCommitPreedit { public: - QIBusPropTypeClientCommitPreedit() {}; + QIBusPropTypeClientCommitPreedit() {} QIBusPropTypeClientCommitPreedit(bool inClientCommitPreedit); @@ -153,7 +153,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusPropT class QIBusPropTypeContentType { public: - QIBusPropTypeContentType() {}; + QIBusPropTypeContentType() {} QIBusPropTypeContentType(unsigned int inPurpose, unsigned int inHint); diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h index d7b51203322..7b2ad6e1ce0 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h +++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h @@ -33,7 +33,7 @@ public: #endif #if QT_CONFIG(xcb) Display *display() const override; - xcb_connection_t *connection() const override { return nullptr; }; + xcb_connection_t *connection() const override { return nullptr; } #endif QScopedPointer m_connection; }; diff --git a/src/plugins/platformthemes/gtk3/qgtk3json_p.h b/src/plugins/platformthemes/gtk3/qgtk3json_p.h index daf280612c8..0e1855e890d 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3json_p.h +++ b/src/plugins/platformthemes/gtk3/qgtk3json_p.h @@ -38,7 +38,7 @@ class QGtk3Json { Q_GADGET private: - QGtk3Json(){}; + QGtk3Json() {} public: // Convert enums to strings diff --git a/src/plugins/platformthemes/gtk3/qgtk3storage_p.h b/src/plugins/platformthemes/gtk3/qgtk3storage_p.h index cd40ae18e41..002e916377e 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3storage_p.h +++ b/src/plugins/platformthemes/gtk3/qgtk3storage_p.h @@ -182,10 +182,10 @@ public: Source(const QBrush &brush) : sourceType(SourceType::Fixed) { fix.fixedBrush = brush; - }; + } // Invalid constructor and getter - Source() : sourceType(SourceType::Invalid) {}; + Source() : sourceType(SourceType::Invalid) {} bool isValid() const { return sourceType != SourceType::Invalid; } // Debug @@ -204,11 +204,11 @@ public: // Generic constructor TargetBrush(QPalette::ColorGroup group, QPalette::ColorRole role, Qt::ColorScheme scheme = Qt::ColorScheme::Unknown) : - colorGroup(group), colorRole(role), colorScheme(scheme) {}; + colorGroup(group), colorRole(role), colorScheme(scheme) {} // Copy constructor with color scheme modifier for dark/light aware search TargetBrush(const TargetBrush &other, Qt::ColorScheme scheme) : - colorGroup(other.colorGroup), colorRole(other.colorRole), colorScheme(scheme) {}; + colorGroup(other.colorGroup), colorRole(other.colorRole), colorScheme(scheme) {} // struct becomes key of a map, so operator< is needed bool operator<(const TargetBrush& other) const { @@ -226,9 +226,9 @@ public: // Public getters const QPalette *palette(QPlatformTheme::Palette = QPlatformTheme::SystemPalette) const; QPixmap standardPixmap(QPlatformTheme::StandardPixmap standardPixmap, const QSizeF &size) const; - Qt::ColorScheme colorScheme() const { return m_colorScheme; }; + Qt::ColorScheme colorScheme() const { return m_colorScheme; } static QPalette standardPalette(); - const QString themeName() const { return m_interface ? m_interface->themeName() : QString(); }; + const QString themeName() const { return m_interface ? m_interface->themeName() : QString(); } const QFont *font(QPlatformTheme::Font type) const; QIcon fileIcon(const QFileInfo &fileInfo) const;