Fix GCC -Wextra-semi after member function definitions
Fixes: QTBUG-132101 Pick-to: 6.8 Change-Id: Ia2e13bdaf11c639c5590639717b5d31140352c44 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 6b951f6c0c09b7d7b473a3951e7b6cec41dbec73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
3de6c570fb
commit
8472fc2573
@ -120,7 +120,7 @@ public:
|
|||||||
reference operator*() const { return dirEntry; }
|
reference operator*() const { return dirEntry; }
|
||||||
pointer operator->() const { return &dirEntry; }
|
pointer operator->() const { return &dirEntry; }
|
||||||
const_iterator &operator++() { dirEntry = next(dirEntry); return *this; }
|
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:
|
private:
|
||||||
bool atEnd() const noexcept { return dirEntry.dirListPtr == nullptr; }
|
bool atEnd() const noexcept { return dirEntry.dirListPtr == nullptr; }
|
||||||
friend bool operator==(const const_iterator &lhs, sentinel) noexcept { return lhs.atEnd(); }
|
friend bool operator==(const const_iterator &lhs, sentinel) noexcept { return lhs.atEnd(); }
|
||||||
|
@ -45,7 +45,7 @@ public:
|
|||||||
#else
|
#else
|
||||||
return QStorageInfo(QStringLiteral("/"));
|
return QStorageInfo(QStringLiteral("/"));
|
||||||
#endif
|
#endif
|
||||||
};
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
|
@ -138,7 +138,7 @@ struct QMetaTypeCustomRegistry
|
|||||||
if (ti->legacyRegisterOp)
|
if (ti->legacyRegisterOp)
|
||||||
ti->legacyRegisterOp();
|
ti->legacyRegisterOp();
|
||||||
return ti->typeId.loadRelaxed();
|
return ti->typeId.loadRelaxed();
|
||||||
};
|
}
|
||||||
|
|
||||||
void unregisterDynamicType(int id)
|
void unregisterDynamicType(int id)
|
||||||
{
|
{
|
||||||
|
@ -630,7 +630,8 @@ public:
|
|||||||
|
|
||||||
QString message() const { return m_message; }
|
QString message() const { return m_message; }
|
||||||
QAccessible::AnnouncementPoliteness politeness() const { return m_politeness; }
|
QAccessible::AnnouncementPoliteness politeness() const { return m_politeness; }
|
||||||
void setPoliteness(QAccessible::AnnouncementPoliteness politeness) { m_politeness = politeness; };
|
void setPoliteness(QAccessible::AnnouncementPoliteness politeness)
|
||||||
|
{ m_politeness = politeness; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
QString m_message;
|
QString m_message;
|
||||||
|
@ -49,12 +49,12 @@ class QLocalUnixSocket : public QTcpSocket
|
|||||||
public:
|
public:
|
||||||
QLocalUnixSocket() : QTcpSocket()
|
QLocalUnixSocket() : QTcpSocket()
|
||||||
{
|
{
|
||||||
};
|
}
|
||||||
|
|
||||||
inline void setSocketState(QAbstractSocket::SocketState state)
|
inline void setSocketState(QAbstractSocket::SocketState state)
|
||||||
{
|
{
|
||||||
QTcpSocket::setSocketState(state);
|
QTcpSocket::setSocketState(state);
|
||||||
};
|
}
|
||||||
|
|
||||||
inline void setErrorString(const QString &string)
|
inline void setErrorString(const QString &string)
|
||||||
{
|
{
|
||||||
|
@ -26,7 +26,7 @@ public:
|
|||||||
: QObject(parent), _timeout(false)
|
: 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}); }
|
void enterLoop(int secs) { enterLoop(std::chrono::seconds{secs}); }
|
||||||
inline void enterLoop(std::chrono::milliseconds msecs);
|
inline void enterLoop(std::chrono::milliseconds msecs);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user