summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Samir <[email protected]>2024-12-12 01:20:29 +0200
committerAhmad Samir <[email protected]>2024-12-12 20:21:24 +0200
commit6b951f6c0c09b7d7b473a3951e7b6cec41dbec73 (patch)
treeade36d51e7c67d1c9b686fde89d4063274d3ff31
parent0bbbbfc78beb2393ceea0de0fa85942f71d0a2ed (diff)
Fix GCC -Wextra-semi after member function definitions
Fixes: QTBUG-132101 Pick-to: 6.9 6.8 Change-Id: Ia2e13bdaf11c639c5590639717b5d31140352c44 Reviewed-by: Giuseppe D'Angelo <[email protected]> Reviewed-by: Thiago Macieira <[email protected]>
-rw-r--r--src/corelib/io/qdirlisting.h2
-rw-r--r--src/corelib/io/qstorageinfo_p.h2
-rw-r--r--src/corelib/kernel/qmetatype.cpp2
-rw-r--r--src/gui/accessible/qaccessible.h3
-rw-r--r--src/network/socket/qlocalsocket_p.h4
-rw-r--r--src/testlib/qtesteventloop.h2
6 files changed, 8 insertions, 7 deletions
diff --git a/src/corelib/io/qdirlisting.h b/src/corelib/io/qdirlisting.h
index 74487f83bd3..f1dc3dcd4fa 100644
--- a/src/corelib/io/qdirlisting.h
+++ b/src/corelib/io/qdirlisting.h
@@ -120,7 +120,7 @@ public:
reference operator*() const { return dirEntry; }
pointer operator->() const { return &dirEntry; }
const_iterator &operator++() { dirEntry = next(dirEntry); return *this; }
- void operator++(int) { ++*this; }; // [iterator.concept.winc]/14 not required to return sth
+ void operator++(int) { ++*this; } // [iterator.concept.winc]/14 not required to return sth
private:
bool atEnd() const noexcept { return dirEntry.dirListPtr == nullptr; }
friend bool operator==(const const_iterator &lhs, sentinel) noexcept { return lhs.atEnd(); }
diff --git a/src/corelib/io/qstorageinfo_p.h b/src/corelib/io/qstorageinfo_p.h
index de4ab2c8125..a917763fe36 100644
--- a/src/corelib/io/qstorageinfo_p.h
+++ b/src/corelib/io/qstorageinfo_p.h
@@ -45,7 +45,7 @@ public:
#else
return QStorageInfo(QStringLiteral("/"));
#endif
- };
+ }
protected:
#if defined(Q_OS_WIN)
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index f3b9937f6b7..a172fc8348a 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -138,7 +138,7 @@ struct QMetaTypeCustomRegistry
if (ti->legacyRegisterOp)
ti->legacyRegisterOp();
return ti->typeId.loadRelaxed();
- };
+ }
void unregisterDynamicType(int id)
{
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 534aa87b941..9986689ffed 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -630,7 +630,8 @@ public:
QString message() const { return m_message; }
QAccessible::AnnouncementPoliteness politeness() const { return m_politeness; }
- void setPoliteness(QAccessible::AnnouncementPoliteness politeness) { m_politeness = politeness; };
+ void setPoliteness(QAccessible::AnnouncementPoliteness politeness)
+ { m_politeness = politeness; }
protected:
QString m_message;
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index 82446161c72..ae40b942580 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -49,12 +49,12 @@ class QLocalUnixSocket : public QTcpSocket
public:
QLocalUnixSocket() : QTcpSocket()
{
- };
+ }
inline void setSocketState(QAbstractSocket::SocketState state)
{
QTcpSocket::setSocketState(state);
- };
+ }
inline void setErrorString(const QString &string)
{
diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h
index 5d1187ea95d..ca442bd2b6d 100644
--- a/src/testlib/qtesteventloop.h
+++ b/src/testlib/qtesteventloop.h
@@ -26,7 +26,7 @@ public:
: QObject(parent), _timeout(false)
{}
- void enterLoopMSecs(int ms) { enterLoop(std::chrono::milliseconds{ms}); };
+ void enterLoopMSecs(int ms) { enterLoop(std::chrono::milliseconds{ms}); }
void enterLoop(int secs) { enterLoop(std::chrono::seconds{secs}); }
inline void enterLoop(std::chrono::milliseconds msecs);