summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qdnd_p.h6
-rw-r--r--src/gui/kernel/qguiapplication.h6
-rw-r--r--src/gui/kernel/qguiapplication_p.h2
-rw-r--r--src/gui/kernel/qoffscreensurface.h8
-rw-r--r--src/gui/kernel/qopenglcontext_p.h4
-rw-r--r--src/gui/kernel/qplatformoffscreensurface.h2
-rw-r--r--src/gui/kernel/qplatformwindow.h2
-rw-r--r--src/gui/kernel/qshapedpixmapdndwindow_p.h2
-rw-r--r--src/gui/kernel/qsimpledrag_p.h14
-rw-r--r--src/gui/kernel/qwindow.h8
10 files changed, 27 insertions, 27 deletions
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index 573035ce24..92d489184e 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -70,8 +70,8 @@ public:
QInternalMimeData();
~QInternalMimeData();
- bool hasFormat(const QString &mimeType) const;
- QStringList formats() const;
+ bool hasFormat(const QString &mimeType) const Q_DECL_OVERRIDE;
+ QStringList formats() const Q_DECL_OVERRIDE;
static bool canReadData(const QString &mimeType);
@@ -80,7 +80,7 @@ public:
static QByteArray renderDataHelper(const QString &mimeType, const QMimeData *data);
protected:
- QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
+ QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE;
virtual bool hasFormat_sys(const QString &mimeType) const = 0;
virtual QStringList formats_sys() const = 0;
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 713f2f2669..ff6d5f5fba 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -143,7 +143,7 @@ public:
static Qt::ApplicationState applicationState();
static int exec();
- bool notify(QObject *, QEvent *);
+ bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE;
#ifndef QT_NO_SESSIONMANAGER
// session management
@@ -170,8 +170,8 @@ Q_SIGNALS:
void paletteChanged(const QPalette &pal);
protected:
- bool event(QEvent *);
- bool compressEvent(QEvent *, QObject *receiver, QPostEventList *);
+ bool event(QEvent *) Q_DECL_OVERRIDE;
+ bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE;
QGuiApplication(QGuiApplicationPrivate &p);
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index eed3d5c10e..165cd18580 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -81,7 +81,7 @@ public:
virtual void notifyLayoutDirectionChange();
virtual void notifyActiveWindowChange(QWindow *previous);
- virtual bool shouldQuit();
+ virtual bool shouldQuit() Q_DECL_OVERRIDE;
bool shouldQuitInternal(const QWindowList &processedWindows);
virtual bool tryCloseAllWindows();
diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h
index a4ba51320b..a5dae71ae5 100644
--- a/src/gui/kernel/qoffscreensurface.h
+++ b/src/gui/kernel/qoffscreensurface.h
@@ -54,7 +54,7 @@ public:
explicit QOffscreenSurface(QScreen *screen = 0);
virtual ~QOffscreenSurface();
- SurfaceType surfaceType() const;
+ SurfaceType surfaceType() const Q_DECL_OVERRIDE;
void create();
void destroy();
@@ -62,10 +62,10 @@ public:
bool isValid() const;
void setFormat(const QSurfaceFormat &format);
- QSurfaceFormat format() const;
+ QSurfaceFormat format() const Q_DECL_OVERRIDE;
QSurfaceFormat requestedFormat() const;
- QSize size() const;
+ QSize size() const Q_DECL_OVERRIDE;
QScreen *screen() const;
void setScreen(QScreen *screen);
@@ -80,7 +80,7 @@ private Q_SLOTS:
private:
- QPlatformSurface *surfaceHandle() const;
+ QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE;
Q_DISABLE_COPY(QOffscreenSurface)
};
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 975553e7cd..c4eb6545bc 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -105,12 +105,12 @@ public:
GLuint id() const { return m_id; }
protected:
- void invalidateResource()
+ void invalidateResource() Q_DECL_OVERRIDE
{
m_id = 0;
}
- void freeResource(QOpenGLContext *context);
+ void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE;
private:
GLuint m_id;
diff --git a/src/gui/kernel/qplatformoffscreensurface.h b/src/gui/kernel/qplatformoffscreensurface.h
index 07bb710eb8..abd51313b9 100644
--- a/src/gui/kernel/qplatformoffscreensurface.h
+++ b/src/gui/kernel/qplatformoffscreensurface.h
@@ -63,7 +63,7 @@ public:
QPlatformScreen *screen() const;
- virtual QSurfaceFormat format() const;
+ virtual QSurfaceFormat format() const Q_DECL_OVERRIDE;
virtual bool isValid() const;
protected:
diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h
index 87781caf8b..d66bf31569 100644
--- a/src/gui/kernel/qplatformwindow.h
+++ b/src/gui/kernel/qplatformwindow.h
@@ -72,7 +72,7 @@ public:
QPlatformScreen *screen() const;
- virtual QSurfaceFormat format() const;
+ virtual QSurfaceFormat format() const Q_DECL_OVERRIDE;
virtual void setGeometry(const QRect &rect);
virtual QRect geometry() const;
diff --git a/src/gui/kernel/qshapedpixmapdndwindow_p.h b/src/gui/kernel/qshapedpixmapdndwindow_p.h
index 04198c83cb..4c3d49e853 100644
--- a/src/gui/kernel/qshapedpixmapdndwindow_p.h
+++ b/src/gui/kernel/qshapedpixmapdndwindow_p.h
@@ -66,7 +66,7 @@ public:
void updateGeometry();
protected:
- void exposeEvent(QExposeEvent *);
+ void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE;
private:
QBackingStore *m_backingStore;
diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
index 8ef8f99616..c506fa8676 100644
--- a/src/gui/kernel/qsimpledrag_p.h
+++ b/src/gui/kernel/qsimpledrag_p.h
@@ -64,9 +64,9 @@ class Q_GUI_EXPORT QBasicDrag : public QPlatformDrag, public QObject
public:
virtual ~QBasicDrag();
- virtual Qt::DropAction drag(QDrag *drag);
+ virtual Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE;
- virtual bool eventFilter(QObject *o, QEvent *e);
+ virtual bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
protected:
QBasicDrag();
@@ -106,13 +106,13 @@ class Q_GUI_EXPORT QSimpleDrag : public QBasicDrag
{
public:
QSimpleDrag();
- virtual QMimeData *platformDropData();
+ virtual QMimeData *platformDropData() Q_DECL_OVERRIDE;
protected:
- virtual void startDrag();
- virtual void cancel();
- virtual void move(const QMouseEvent *me);
- virtual void drop(const QMouseEvent *me);
+ virtual void startDrag() Q_DECL_OVERRIDE;
+ virtual void cancel() Q_DECL_OVERRIDE;
+ virtual void move(const QMouseEvent *me) Q_DECL_OVERRIDE;
+ virtual void drop(const QMouseEvent *me) Q_DECL_OVERRIDE;
private:
QWindow *m_current_window;
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 2230ed8801..350cd8af24 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -128,7 +128,7 @@ public:
virtual ~QWindow();
void setSurfaceType(SurfaceType surfaceType);
- SurfaceType surfaceType() const;
+ SurfaceType surfaceType() const Q_DECL_OVERRIDE;
bool isVisible() const;
@@ -149,7 +149,7 @@ public:
void setModality(Qt::WindowModality modality);
void setFormat(const QSurfaceFormat &format);
- QSurfaceFormat format() const;
+ QSurfaceFormat format() const Q_DECL_OVERRIDE;
QSurfaceFormat requestedFormat() const;
void setFlags(Qt::WindowFlags flags);
@@ -328,7 +328,7 @@ protected:
virtual void hideEvent(QHideEvent *);
// TODO Qt 6 - add closeEvent virtual handler
- virtual bool event(QEvent *);
+ virtual bool event(QEvent *) Q_DECL_OVERRIDE;
virtual void keyPressEvent(QKeyEvent *);
virtual void keyReleaseEvent(QKeyEvent *);
virtual void mousePressEvent(QMouseEvent *);
@@ -348,7 +348,7 @@ protected:
private:
Q_PRIVATE_SLOT(d_func(), void _q_clearAlert())
- QPlatformSurface *surfaceHandle() const;
+ QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE;
Q_DISABLE_COPY(QWindow)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 07:57:22 +0000