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

src/plugins/*: fix GCC -Wextra-semi colon after member func definition

Browse Source 
Pick-to: 6.9 6.8
Task-number: QTBUG-132101
Change-Id: I947fdb66df9b6d86c60139046166395e4ae42127
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2024-12-19 11:32:53 +02:00
parent cf6ae9a901
commit 997abb0520
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforminputcontexts/ibus/qibustypes.h
View File

@ -136,7 +136,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusEngin
class QIBusPropTypeClientCommitPreedit class QIBusPropTypeClientCommitPreedit
{ {
public: public:
QIBusPropTypeClientCommitPreedit() {}; QIBusPropTypeClientCommitPreedit() {}
QIBusPropTypeClientCommitPreedit(bool inClientCommitPreedit); QIBusPropTypeClientCommitPreedit(bool inClientCommitPreedit);
@ -153,7 +153,7 @@ inline const QDBusArgument &operator>>(const QDBusArgument &argument, QIBusPropT
class QIBusPropTypeContentType class QIBusPropTypeContentType
{ {
public: public:
QIBusPropTypeContentType() {}; QIBusPropTypeContentType() {}
QIBusPropTypeContentType(unsigned int inPurpose, unsigned int inHint); QIBusPropTypeContentType(unsigned int inPurpose, unsigned int inHint);

2
src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
View File

@ -33,7 +33,7 @@ public:
#endif #endif
#if QT_CONFIG(xcb) #if QT_CONFIG(xcb)
Display *display() const override; Display *display() const override;
xcb_connection_t *connection() const override { return nullptr; }; xcb_connection_t *connection() const override { return nullptr; }
#endif #endif
QScopedPointer<QOffscreenX11Connection> m_connection; QScopedPointer<QOffscreenX11Connection> m_connection;
}; };

2
src/plugins/platformthemes/gtk3/qgtk3json_p.h
View File

@ -38,7 +38,7 @@ class QGtk3Json
{ {
Q_GADGET Q_GADGET
private: private:
QGtk3Json(){}; QGtk3Json() {}
public: public:
// Convert enums to strings // Convert enums to strings

12
src/plugins/platformthemes/gtk3/qgtk3storage_p.h
View File

@ -182,10 +182,10 @@ public:
Source(const QBrush &brush) : sourceType(SourceType::Fixed) Source(const QBrush &brush) : sourceType(SourceType::Fixed)
{ {
fix.fixedBrush = brush; fix.fixedBrush = brush;
}; }
// Invalid constructor and getter // Invalid constructor and getter
Source() : sourceType(SourceType::Invalid) {}; Source() : sourceType(SourceType::Invalid) {}
bool isValid() const { return sourceType != SourceType::Invalid; } bool isValid() const { return sourceType != SourceType::Invalid; }
// Debug // Debug
@ -204,11 +204,11 @@ public:
// Generic constructor // Generic constructor
TargetBrush(QPalette::ColorGroup group, QPalette::ColorRole role, TargetBrush(QPalette::ColorGroup group, QPalette::ColorRole role,
Qt::ColorScheme scheme = Qt::ColorScheme::Unknown) : 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 // Copy constructor with color scheme modifier for dark/light aware search
TargetBrush(const TargetBrush &other, Qt::ColorScheme scheme) : 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 // struct becomes key of a map, so operator< is needed
bool operator<(const TargetBrush& other) const { bool operator<(const TargetBrush& other) const {
@ -226,9 +226,9 @@ public:
// Public getters // Public getters
const QPalette *palette(QPlatformTheme::Palette = QPlatformTheme::SystemPalette) const; const QPalette *palette(QPlatformTheme::Palette = QPlatformTheme::SystemPalette) const;
QPixmap standardPixmap(QPlatformTheme::StandardPixmap standardPixmap, const QSizeF &size) 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(); 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; const QFont *font(QPlatformTheme::Font type) const;
QIcon fileIcon(const QFileInfo &fileInfo) const; QIcon fileIcon(const QFileInfo &fileInfo) const;