summaryrefslogtreecommitdiffstats
path: root/src/plugins/shellintegration/ivi-shell
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-20 14:00:19 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-28 14:25:27 +0000
commitced351295b67f0c8ef72802a11d2a0f2381b46e8 (patch)
treebdd563c8d0f731f3cb949494ee07e87a998aa7e5 /src/plugins/shellintegration/ivi-shell
parent1fab644753443a525475740fc23172dedaa70d0e (diff)
Use override when applicable
Applied automatic fixes using clang-tidy's modernize-use-override. This adds the "override" keyword where it's possible and also removes the "virtual" keyword when redundant. Change-Id: I899950e5cf8782785d30a245a9c69c1720905d50 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/plugins/shellintegration/ivi-shell')
-rw-r--r--src/plugins/shellintegration/ivi-shell/main.cpp2
-rw-r--r--src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h4
-rw-r--r--src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/main.cpp b/src/plugins/shellintegration/ivi-shell/main.cpp
index f6d5775f0..14a33066b 100644
--- a/src/plugins/shellintegration/ivi-shell/main.cpp
+++ b/src/plugins/shellintegration/ivi-shell/main.cpp
@@ -50,7 +50,7 @@ class QWaylandIviShellIntegrationPlugin : public QWaylandShellIntegrationPlugin
Q_PLUGIN_METADATA(IID QWaylandShellIntegrationFactoryInterface_iid FILE "ivi-shell.json")
public:
- virtual QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) override;
+ QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) override;
};
QWaylandShellIntegration *QWaylandIviShellIntegrationPlugin::create(const QString &key, const QStringList &paramList)
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
index 0b575c6c8..11a2ae99b 100644
--- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
@@ -58,9 +58,9 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandIviShellIntegration : public QWaylandShell
{
public:
QWaylandIviShellIntegration();
- ~QWaylandIviShellIntegration();
+ ~QWaylandIviShellIntegration() override;
bool initialize(QWaylandDisplay *display) override;
- virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
+ QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
private:
static void registryIvi(void *data, struct wl_registry *registry,
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
index 6cab1c98f..ff943060b 100644
--- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
@@ -60,13 +60,13 @@ public:
QWaylandIviSurface(struct ::ivi_surface *shell_surface, QWaylandWindow *window);
QWaylandIviSurface(struct ::ivi_surface *shell_surface, QWaylandWindow *window,
struct ::ivi_controller_surface *iviControllerSurface);
- virtual ~QWaylandIviSurface();
+ ~QWaylandIviSurface() override;
void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
private:
void createExtendedSurface(QWaylandWindow *window);
- virtual void ivi_surface_configure(int32_t width, int32_t height) override;
+ void ivi_surface_configure(int32_t width, int32_t height) override;
void ivi_controller_surface_visibility(int32_t visibility) override;
QWaylandWindow *m_window = nullptr;