summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/corelib/kernel/qmetatype.h2
-rw-r--r--src/corelib/tools/qoffsetstringarray_p.h2
-rw-r--r--src/gui/kernel/qplatformwindow.h2
-rw-r--r--src/gui/kernel/qwindow_p.h2
-rw-r--r--src/gui/painting/qtextureglyphcache_p.h2
-rw-r--r--src/network/access/qhttpnetworkheader_p.h2
-rw-r--r--src/network/access/qnetworkaccessauthenticationmanager_p.h2
-rw-r--r--src/network/ssl/qssldiffiehellmanparameters_p.h2
-rw-r--r--src/opengl/qopengl2pexvertexarray_p.h6
-rw-r--r--src/plugins/platforms/android/qandroidplatformfiledialoghelper.h16
-rw-r--r--src/plugins/platforms/ios/qiosinputcontext.h4
-rw-r--r--src/plugins/platforms/ios/qiosoptionalplugininterface.h4
-rw-r--r--src/plugins/platforms/windows/qwindowsscreen.h2
-rw-r--r--src/plugins/platforms/xcb/qxcbscreen.h2
-rw-r--r--src/testlib/qtaptestlogger_p.h2
-rw-r--r--src/widgets/widgets/qpushbutton_p.h2
-rw-r--r--tests/auto/other/macgui/guitest.h2
-rw-r--r--tests/auto/other/macnativeevents/qnativeevents.h60
-rw-r--r--tests/auto/tools/moc/pointery_to_incomplete.h6
-rw-r--r--tests/auto/tools/moc/qprivateslots.h2
-rw-r--r--tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h2
21 files changed, 63 insertions, 63 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index c7e754cb5c..90241854fb 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/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)
{
diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
index 4dd9e9603b..678e410250 100644
--- a/src/corelib/tools/qoffsetstringarray_p.h
+++ b/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;
diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h
index 7b85090cc0..76624835a7 100644
--- a/src/gui/kernel/qplatformwindow.h
+++ b/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;
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 5a7ec518fd..24a6e8d3c4 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/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)
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index 2f99f44741..e34687d816 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/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;
diff --git a/src/network/access/qhttpnetworkheader_p.h b/src/network/access/qhttpnetworkheader_p.h
index 83154b9d25..f9108e5d77 100644
--- a/src/network/access/qhttpnetworkheader_p.h
+++ b/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;
diff --git a/src/network/access/qnetworkaccessauthenticationmanager_p.h b/src/network/access/qnetworkaccessauthenticationmanager_p.h
index 31111ca2a5..361b17b594 100644
--- a/src/network/access/qnetworkaccessauthenticationmanager_p.h
+++ b/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,
diff --git a/src/network/ssl/qssldiffiehellmanparameters_p.h b/src/network/ssl/qssldiffiehellmanparameters_p.h
index dd69895dae..722c2e9cf0 100644
--- a/src/network/ssl/qssldiffiehellmanparameters_p.h
+++ b/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);
diff --git a/src/opengl/qopengl2pexvertexarray_p.h b/src/opengl/qopengl2pexvertexarray_p.h
index 3ef26e908d..ac9a5732db 100644
--- a/src/opengl/qopengl2pexvertexarray_p.h
+++ b/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;
diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h
index e19686828b..a7f9aaa358 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h
+++ b/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:
diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h
index 255cf8bca9..debdf7a638 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.h
+++ b/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;
diff --git a/src/plugins/platforms/ios/qiosoptionalplugininterface.h b/src/plugins/platforms/ios/qiosoptionalplugininterface.h
index bae9e5a0d8..a88697aae6 100644
--- a/src/plugins/platforms/ios/qiosoptionalplugininterface.h
+++ b/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)
diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
index 5c095808f2..9b1e61743e 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/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; }
diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
index e3c5a5e11b..8a90d61b98 100644
--- a/src/plugins/platforms/xcb/qxcbscreen.h
+++ b/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; }
diff --git a/src/testlib/qtaptestlogger_p.h b/src/testlib/qtaptestlogger_p.h
index 967c724b51..e14035d79c 100644
--- a/src/testlib/qtaptestlogger_p.h
+++ b/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;
diff --git a/src/widgets/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h
index 439b6e35d6..a180b27e33 100644
--- a/src/widgets/widgets/qpushbutton_p.h
+++ b/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;
diff --git a/tests/auto/other/macgui/guitest.h b/tests/auto/other/macgui/guitest.h
index 24734a7495..e2bbcf5900 100644
--- a/tests/auto/other/macgui/guitest.h
+++ b/tests/auto/other/macgui/guitest.h
@@ -52,7 +52,7 @@ public:
*/
class WidgetNavigator {
public:
- WidgetNavigator() {};
+ WidgetNavigator() {}
~WidgetNavigator();
void printAll(QWidget *widget);
diff --git a/tests/auto/other/macnativeevents/qnativeevents.h b/tests/auto/other/macnativeevents/qnativeevents.h
index 2e30d849f2..ca0cd47675 100644
--- a/tests/auto/other/macnativeevents/qnativeevents.h
+++ b/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);
diff --git a/tests/auto/tools/moc/pointery_to_incomplete.h b/tests/auto/tools/moc/pointery_to_incomplete.h
index 1fd0d89fed..63591bc0f7 100644
--- a/tests/auto/tools/moc/pointery_to_incomplete.h
+++ b/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
diff --git a/tests/auto/tools/moc/qprivateslots.h b/tests/auto/tools/moc/qprivateslots.h
index fd1c726b44..1e4cb21921 100644
--- a/tests/auto/tools/moc/qprivateslots.h
+++ b/tests/auto/tools/moc/qprivateslots.h
@@ -33,7 +33,7 @@
struct TestQPrivateSlots_Private
{
- void _q_privateslot() {};
+ void _q_privateslot() {}
};
class TestQPrivateSlots: public QObject
diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
index 8237ff7469..e92f46a53b 100644
--- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
+++ b/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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 09:30:56 +0000