Remove unnecessary ; after function implementations

Task-number: QTBUG-82978
Change-Id: Iea3bcaec1ef9f4bd0f73e5dccca33354650f5bf4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

src/corelib/kernel/qmetatype.h

@@ -2315,7 +2315,7 @@ private:
                 || s == '_');
     }
     static constexpr bool is_space(char s) { return (s == ' ' || s == '\t' || s == '\n'); }
-    static constexpr bool is_number(char s) { return s >= '0' && s <= '9'; };
+    static constexpr bool is_number(char s) { return s >= '0' && s <= '9'; }
     static constexpr bool starts_with_token(const char *b, const char *e, const char *token,
                                             bool msvcKw = false)
     {

src/corelib/tools/qoffsetstringarray_p.h

@@ -158,7 +158,7 @@ public:
 
     constexpr inline const char *str() const { return m_string.data; }
     constexpr inline const T *offsets() const { return m_offsets; }
-    constexpr inline int count() const { return SizeOffsets; };
+    constexpr inline int count() const { return SizeOffsets; }
 
     static constexpr const auto sizeString = SizeString;
     static constexpr const auto sizeOffsets = SizeOffsets;

src/gui/kernel/qplatformwindow.h

@@ -111,7 +111,7 @@ public:
     virtual bool isActive() const;
     virtual bool isAncestorOf(const QPlatformWindow *child) const;
     virtual bool isEmbedded() const;
-    virtual bool isForeignWindow() const { return false; };
+    virtual bool isForeignWindow() const { return false; }
     virtual QPoint mapToGlobal(const QPoint &pos) const;
     virtual QPoint mapFromGlobal(const QPoint &pos) const;
 

src/gui/kernel/qwindow_p.h

@@ -119,7 +119,7 @@ public:
     virtual void clearFocusObject();
     virtual QRectF closestAcceptableGeometry(const QRectF &rect) const;
 
-    virtual void processSafeAreaMarginsChanged() {};
+    virtual void processSafeAreaMarginsChanged() {}
 
     bool isPopup() const { return (windowFlags & Qt::WindowType_Mask) == Qt::Popup; }
     void setAutomaticPositionAndResizeEnabled(bool a)

src/gui/painting/qtextureglyphcache_p.h

@@ -111,7 +111,7 @@ public:
 
     bool populate(QFontEngine *fontEngine, int numGlyphs, const glyph_t *glyphs,
                   const QFixedPoint *positions);
-    bool hasPendingGlyphs() const { return !m_pendingGlyphs.isEmpty(); };
+    bool hasPendingGlyphs() const { return !m_pendingGlyphs.isEmpty(); }
     void fillInPendingGlyphs();
 
     virtual void createTextureData(int width, int height) = 0;

src/network/access/qhttpnetworkheader_p.h

@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 class Q_AUTOTEST_EXPORT QHttpNetworkHeader
 {
 public:
-    virtual ~QHttpNetworkHeader() {};
+    virtual ~QHttpNetworkHeader() {}
     virtual QUrl url() const = 0;
     virtual void setUrl(const QUrl &url) = 0;
 

src/network/access/qnetworkaccessauthenticationmanager_p.h

@@ -86,7 +86,7 @@ inline bool operator<(const QNetworkAuthenticationCredential &t1, const QNetwork
 class QNetworkAccessAuthenticationManager
 {
 public:
-    QNetworkAccessAuthenticationManager() { };
+    QNetworkAccessAuthenticationManager() {}
 
     void cacheCredentials(const QUrl &url, const QAuthenticator *auth);
     QNetworkAuthenticationCredential fetchCachedCredentials(const QUrl &url,

src/network/ssl/qssldiffiehellmanparameters_p.h

@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 class QSslDiffieHellmanParametersPrivate : public QSharedData
 {
 public:
-    QSslDiffieHellmanParametersPrivate() : error(QSslDiffieHellmanParameters::NoError) {};
+    QSslDiffieHellmanParametersPrivate() : error(QSslDiffieHellmanParameters::NoError) {}
 
     void decodeDer(const QByteArray &der);
     void decodePem(const QByteArray &pem);

src/opengl/qopengl2pexvertexarray_p.h

@@ -63,13 +63,13 @@ class QOpenGLPoint
 {
 public:
     QOpenGLPoint(GLfloat new_x, GLfloat new_y) :
-        x(new_x), y(new_y) {};
+        x(new_x), y(new_y) {}
 
     QOpenGLPoint(const QPointF &p) :
-        x(p.x()), y(p.y()) {};
+        x(p.x()), y(p.y()) {}
 
     QOpenGLPoint(const QPointF* p) :
-        x(p->x()), y(p->y()) {};
+        x(p->x()), y(p->y()) {}
 
     GLfloat x;
     GLfloat y;

src/plugins/platforms/android/qandroidplatformfiledialoghelper.h

@@ -62,14 +62,14 @@ public:
     bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override;
     void hide() override;
 
-    QString selectedNameFilter() const override { return QString(); };
-    void selectNameFilter(const QString &) override {};
-    void setFilter() override {};
-    QList<QUrl> selectedFiles() const override { return m_selectedFile; };
-    void selectFile(const QUrl &) override {};
-    QUrl directory() const override { return QUrl(); };
-    void setDirectory(const QUrl &) override {};
-    bool defaultNameFilterDisables() const override { return false; };
+    QString selectedNameFilter() const override { return QString(); }
+    void selectNameFilter(const QString &) override {}
+    void setFilter() override {}
+    QList<QUrl> selectedFiles() const override { return m_selectedFile; }
+    void selectFile(const QUrl &) override {}
+    QUrl directory() const override { return QUrl(); }
+    void setDirectory(const QUrl &) override {}
+    bool defaultNameFilterDisables() const override { return false; }
     bool handleActivityResult(jint requestCode, jint resultCode, jobject data) override;
 
 private:

src/plugins/platforms/ios/qiosinputcontext.h

@@ -113,8 +113,8 @@ public:
 
     void updateKeyboardState(NSNotification *notification = 0);
 
-    const ImeState &imeState() { return m_imeState; };
-    const KeyboardState &keyboardState() { return m_keyboardState; };
+    const ImeState &imeState() { return m_imeState; }
+    const KeyboardState &keyboardState() { return m_keyboardState; }
 
     bool inputMethodAccepted() const;
 

src/plugins/platforms/ios/qiosoptionalplugininterface.h

@@ -54,8 +54,8 @@ class QIosOptionalPluginInterface
 {
 public:
     virtual ~QIosOptionalPluginInterface() {}
-    virtual void initPlugin() const {};
-    virtual UIViewController* createImagePickerController(QIOSFileDialog *) const { return nullptr; };
+    virtual void initPlugin() const {}
+    virtual UIViewController* createImagePickerController(QIOSFileDialog *) const { return nullptr; }
 };
 
 Q_DECLARE_INTERFACE(QIosOptionalPluginInterface, QIosOptionalPluginInterface_iid)

src/plugins/platforms/windows/qwindowsscreen.h

@@ -87,7 +87,7 @@ public:
     QImage::Format format() const override { return m_data.format; }
     QSizeF physicalSize() const override { return m_data.physicalSizeMM; }
     QDpi logicalDpi() const override { return m_data.dpi; }
-    QDpi logicalBaseDpi() const override { return QDpi(96, 96); };
+    QDpi logicalBaseDpi() const override { return QDpi(96, 96); }
     qreal devicePixelRatio() const override { return 1.0; }
     qreal refreshRate() const override { return m_data.refreshRateHz; }
     QString name() const override { return m_data.name; }

src/plugins/platforms/xcb/qxcbscreen.h

@@ -160,7 +160,7 @@ public:
     QImage::Format format() const override;
     QSizeF physicalSize() const override { return m_sizeMillimeters; }
     QDpi logicalDpi() const override;
-    QDpi logicalBaseDpi() const override { return QDpi(96, 96); };
+    QDpi logicalBaseDpi() const override { return QDpi(96, 96); }
     QPlatformCursor *cursor() const override;
     qreal refreshRate() const override { return m_refreshRate; }
     Qt::ScreenOrientation orientation() const override { return m_orientation; }

src/testlib/qtaptestlogger_p.h

@@ -74,7 +74,7 @@ public:
     void addMessage(MessageTypes type, const QString &message,
                 const char *file = nullptr, int line = 0) override;
 
-    void addBenchmarkResult(const QBenchmarkResult &) override {};
+    void addBenchmarkResult(const QBenchmarkResult &) override {}
 private:
     void outputTestLine(bool ok, int testNumber, QTestCharBuffer &directive);
     bool m_wasExpectedFail;

src/widgets/widgets/qpushbutton_p.h

@@ -81,7 +81,7 @@ public:
 #if QT_CONFIG(dialog)
     QDialog *dialogParent() const;
 #else
-    QDialog *dialogParent() const { return 0; };
+    QDialog *dialogParent() const { return 0; }
 #endif
 
     QPointer<QMenu> menu;

tests/auto/other/macgui/guitest.h

@@ -52,7 +52,7 @@ public:
 */
 class WidgetNavigator {
 public:
-    WidgetNavigator() {};
+    WidgetNavigator() {}
     ~WidgetNavigator();
 
     void printAll(QWidget *widget);

tests/auto/other/macnativeevents/qnativeevents.h

@@ -49,8 +49,8 @@ public:
     static const int eventId = 1;
 
     QNativeEvent(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const = 0;
     Qt::KeyboardModifiers modifiers; // Yields for mouse events too.
 };
@@ -59,10 +59,10 @@ class QNativeMouseEvent : public QNativeEvent {
 public:
     static const int eventId = 2;
 
-    QNativeMouseEvent(){};
+    QNativeMouseEvent() {}
     QNativeMouseEvent(QPoint globalPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeMouseEvent() {}
+    virtual int id() const { return eventId; }
 
     QPoint globalPos;
 };
@@ -71,10 +71,10 @@ class QNativeMouseMoveEvent : public QNativeMouseEvent {
 public:
     static const int eventId = 4;
 
-    QNativeMouseMoveEvent(){};
+    QNativeMouseMoveEvent() {}
     QNativeMouseMoveEvent(QPoint globalPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseMoveEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeMouseMoveEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const;
 };
 
@@ -82,10 +82,10 @@ class QNativeMouseButtonEvent : public QNativeMouseEvent {
 public:
     static const int eventId = 8;
 
-    QNativeMouseButtonEvent(){};
+    QNativeMouseButtonEvent() {}
     QNativeMouseButtonEvent(QPoint globalPos, Qt::MouseButton button, int clickCount, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseButtonEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeMouseButtonEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const;
 
     Qt::MouseButton button;
@@ -96,10 +96,10 @@ class QNativeMouseDragEvent : public QNativeMouseButtonEvent {
 public:
     static const int eventId = 16;
 
-    QNativeMouseDragEvent(){};
+    QNativeMouseDragEvent() {}
     QNativeMouseDragEvent(QPoint globalPos, Qt::MouseButton button, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseDragEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeMouseDragEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const;
 };
 
@@ -107,10 +107,10 @@ class QNativeMouseWheelEvent : public QNativeMouseEvent {
 public:
     static const int eventId = 32;
 
-    QNativeMouseWheelEvent(){};
+    QNativeMouseWheelEvent() {}
     QNativeMouseWheelEvent(QPoint globalPos, int delta, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseWheelEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeMouseWheelEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const;
 
     int delta;
@@ -120,11 +120,11 @@ class QNativeKeyEvent : public QNativeEvent {
     public:
     static const int eventId = 64;
 
-    QNativeKeyEvent(){};
+    QNativeKeyEvent() {}
     QNativeKeyEvent(int nativeKeyCode, bool press, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
     QNativeKeyEvent(int nativeKeyCode, bool press, QChar character, Qt::KeyboardModifiers modifiers);
-    virtual ~QNativeKeyEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeKeyEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const;
 
     int nativeKeyCode;
@@ -146,8 +146,8 @@ public:
     static const int eventId = 128;
 
     QNativeModifierEvent(Qt::KeyboardModifiers modifiers = Qt::NoModifier, int nativeKeyCode = 0);
-    virtual ~QNativeModifierEvent(){};
-    virtual int id() const { return eventId; };
+    virtual ~QNativeModifierEvent() {}
+    virtual int id() const { return eventId; }
     virtual QString toString() const;
 
     int nativeKeyCode;
@@ -190,14 +190,14 @@ class QNativeInput
     // Callback methods. Should be implemented by interested sub-classes:
     void notify(QNativeEvent *event);
     virtual void nativeEvent(QNativeEvent *event);
-    virtual void nativeMousePressEvent(QNativeMouseButtonEvent *){};
-    virtual void nativeMouseReleaseEvent(QNativeMouseButtonEvent *){};
-    virtual void nativeMouseMoveEvent(QNativeMouseMoveEvent *){};
-    virtual void nativeMouseDragEvent(QNativeMouseDragEvent *){};
-    virtual void nativeMouseWheelEvent(QNativeMouseWheelEvent *){};
-    virtual void nativeKeyPressEvent(QNativeKeyEvent *){};
-    virtual void nativeKeyReleaseEvent(QNativeKeyEvent *){};
-    virtual void nativeModifierEvent(QNativeModifierEvent *){};
+    virtual void nativeMousePressEvent(QNativeMouseButtonEvent *) {}
+    virtual void nativeMouseReleaseEvent(QNativeMouseButtonEvent *) {}
+    virtual void nativeMouseMoveEvent(QNativeMouseMoveEvent *) {}
+    virtual void nativeMouseDragEvent(QNativeMouseDragEvent *) {}
+    virtual void nativeMouseWheelEvent(QNativeMouseWheelEvent *) {}
+    virtual void nativeKeyPressEvent(QNativeKeyEvent *) {}
+    virtual void nativeKeyReleaseEvent(QNativeKeyEvent *) {}
+    virtual void nativeModifierEvent(QNativeModifierEvent *) {}
 
     // The following methods will differ in implementation from OS to OS:
     static Qt::Native::Status sendNativeMouseButtonEvent(const QNativeMouseButtonEvent &event);

tests/auto/tools/moc/pointery_to_incomplete.h

@@ -40,9 +40,9 @@ class TestPointeeCanBeIncomplete : public QObject
 {
     Q_OBJECT
 public:
-    void setProp1(QPointer<FwdClass>) {};
-    void setProp2(QSharedPointer<FwdClass>) {};
-    void setProp3(const QWeakPointer<FwdClass> &) {};
+    void setProp1(QPointer<FwdClass>) {}
+    void setProp2(QSharedPointer<FwdClass>) {}
+    void setProp3(const QWeakPointer<FwdClass> &) {}
 };
 
 #endif // POINTERY_TO_INCOMPLETE_H

tests/auto/tools/moc/qprivateslots.h

@@ -33,7 +33,7 @@
 
 struct TestQPrivateSlots_Private
 {
-    void _q_privateslot() {};
+    void _q_privateslot() {}
 };
 
 class TestQPrivateSlots: public QObject

tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h

@@ -74,7 +74,7 @@ protected:
     virtual void resizeEvent(QResizeEvent * event);
     virtual void paintEvent(QPaintEvent *event);
     virtual void keyPressEvent(QKeyEvent *event);
-    virtual void wheelEvent(QWheelEvent *event) { Q_UNUSED (event); };
+    virtual void wheelEvent(QWheelEvent *event) { Q_UNUSED (event); }
 
 private slots:
     void updateFps();