Remove unnecessary ; after function implementations

Task-number: QTBUG-82978
Change-Id: Iea3bcaec1ef9f4bd0f73e5dccca33354650f5bf4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Lars Schmertmann 2020-07-02 16:01:20 +02:00
parent 11b3092cc4
commit 18cfabafa6
21 changed files with 63 additions and 63 deletions

View File

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

View File

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

View File

@ -111,7 +111,7 @@ public:
virtual bool isActive() const; virtual bool isActive() const;
virtual bool isAncestorOf(const QPlatformWindow *child) const; virtual bool isAncestorOf(const QPlatformWindow *child) const;
virtual bool isEmbedded() 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 mapToGlobal(const QPoint &pos) const;
virtual QPoint mapFromGlobal(const QPoint &pos) const; virtual QPoint mapFromGlobal(const QPoint &pos) const;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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