From 3d5e8fe1aa36f920e074a6652887e5b14869df60 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 29 Jan 2018 07:12:42 +0100 Subject: [PATCH] We don't need virtual + override --- libtaskmanager/abstracttasksmodel.h | 30 +++++++++---------- libtaskmanager/abstracttasksproxymodeliface.h | 2 +- libtaskmanager/launchertasksmodel.h | 2 +- libtaskmanager/startuptasksmodel.h | 4 +-- libtaskmanager/taskgroupingproxymodel.h | 2 +- libtaskmanager/waylandtasksmodel.h | 6 ++-- libtaskmanager/xwindowtasksmodel.h | 4 +-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libtaskmanager/abstracttasksmodel.h b/libtaskmanager/abstracttasksmodel.h index d62490ea0..5906ce036 100644 --- a/libtaskmanager/abstracttasksmodel.h +++ b/libtaskmanager/abstracttasksmodel.h @@ -99,7 +99,7 @@ public: QHash roleNames() const override; - virtual QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; /** * Request activation of the task at the given index. Derived classes are @@ -110,7 +110,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestActivate(const QModelIndex &index) override; + void requestActivate(const QModelIndex &index) override; /** * Request an additional instance of the application backing the task @@ -120,7 +120,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestNewInstance(const QModelIndex &index) override; + void requestNewInstance(const QModelIndex &index) override; /** * Requests to open the given URLs with the application backing the task @@ -131,7 +131,7 @@ public: * @param index An index in this tasks model. * @param urls The URLs to be passed to the application. **/ - virtual void requestOpenUrls(const QModelIndex &index, const QList &urls) override; + void requestOpenUrls(const QModelIndex &index, const QList &urls) override; /** * Request the task at the given index be closed. @@ -140,7 +140,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestClose(const QModelIndex &index) override; + void requestClose(const QModelIndex &index) override; /** * Request starting an interactive move for the task at the given index. @@ -152,7 +152,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestMove(const QModelIndex &index) override; + void requestMove(const QModelIndex &index) override; /** * Request starting an interactive resize for the task at the given index. @@ -164,7 +164,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestResize(const QModelIndex &index) override; + void requestResize(const QModelIndex &index) override; /** * Request toggling the minimized state of the task at the given index. @@ -176,7 +176,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestToggleMinimized(const QModelIndex &index) override; + void requestToggleMinimized(const QModelIndex &index) override; /** * Request toggling the maximized state of the task at the given index. @@ -188,7 +188,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestToggleMaximized(const QModelIndex &index) override; + void requestToggleMaximized(const QModelIndex &index) override; /** * Request toggling the keep-above state of the task at the given index. @@ -200,7 +200,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestToggleKeepAbove(const QModelIndex &index) override; + void requestToggleKeepAbove(const QModelIndex &index) override; /** * Request toggling the keep-below state of the task at the given index. @@ -212,7 +212,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestToggleKeepBelow(const QModelIndex &index) override; + void requestToggleKeepBelow(const QModelIndex &index) override; /** * Request toggling the fullscreen state of the task at the given index. @@ -224,7 +224,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestToggleFullScreen(const QModelIndex &index) override; + void requestToggleFullScreen(const QModelIndex &index) override; /** * Request toggling the shaded state of the task at the given index. @@ -236,7 +236,7 @@ public: * * @param index An index in this tasks model. **/ - virtual void requestToggleShaded(const QModelIndex &index) override; + void requestToggleShaded(const QModelIndex &index) override; /** * Request moving the task at the given index to the specified virtual @@ -250,7 +250,7 @@ public: * @param index An index in this tasks model. * @param desktop A virtual desktop number. **/ - virtual void requestVirtualDesktop(const QModelIndex &index, qint32 desktop) override; + void requestVirtualDesktop(const QModelIndex &index, qint32 desktop) override; /** * Request moving the task at the given index to the specified activities. @@ -263,7 +263,7 @@ public: * @param index An index in this tasks model. * @param activities The new list of activities. **/ - virtual void requestActivities(const QModelIndex &index, const QStringList &activities) override; + void requestActivities(const QModelIndex &index, const QStringList &activities) override; /** * Request informing the window manager of new geometry for a visual diff --git a/libtaskmanager/abstracttasksproxymodeliface.h b/libtaskmanager/abstracttasksproxymodeliface.h index d887406ed..912e964dd 100644 --- a/libtaskmanager/abstracttasksproxymodeliface.h +++ b/libtaskmanager/abstracttasksproxymodeliface.h @@ -68,7 +68,7 @@ public: * @param index An index in this tasks model. * @param urls The URLs to be passed to the application. **/ - virtual void requestOpenUrls(const QModelIndex &index, const QList &urls) override; + void requestOpenUrls(const QModelIndex &index, const QList &urls) override; /** * Request the task at the given index be closed. diff --git a/libtaskmanager/launchertasksmodel.h b/libtaskmanager/launchertasksmodel.h index d4920e5fa..faa41e04b 100644 --- a/libtaskmanager/launchertasksmodel.h +++ b/libtaskmanager/launchertasksmodel.h @@ -58,7 +58,7 @@ public: explicit LauncherTasksModel(QObject *parent = nullptr); virtual ~LauncherTasksModel(); - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override; /** diff --git a/libtaskmanager/startuptasksmodel.h b/libtaskmanager/startuptasksmodel.h index 081bdec89..b7ec73b52 100644 --- a/libtaskmanager/startuptasksmodel.h +++ b/libtaskmanager/startuptasksmodel.h @@ -49,8 +49,8 @@ public: explicit StartupTasksModel(QObject *parent = nullptr); virtual ~StartupTasksModel(); - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; /** * Request an additional instance of the application backing the diff --git a/libtaskmanager/taskgroupingproxymodel.h b/libtaskmanager/taskgroupingproxymodel.h index 39b027889..122f53ea6 100644 --- a/libtaskmanager/taskgroupingproxymodel.h +++ b/libtaskmanager/taskgroupingproxymodel.h @@ -336,7 +336,7 @@ public: * @param index An index in this tasks model. * @param activities The new list of activities. **/ - virtual void requestActivities(const QModelIndex &index, const QStringList &activities) override; + void requestActivities(const QModelIndex &index, const QStringList &activities) override; /** * Request informing the window manager of new geometry for a visual diff --git a/libtaskmanager/waylandtasksmodel.h b/libtaskmanager/waylandtasksmodel.h index f3145c432..419f79960 100644 --- a/libtaskmanager/waylandtasksmodel.h +++ b/libtaskmanager/waylandtasksmodel.h @@ -57,10 +57,10 @@ public: explicit WaylandTasksModel(QObject *parent = nullptr); virtual ~WaylandTasksModel(); - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; - virtual QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; /** * Request activation of the window at the given index. diff --git a/libtaskmanager/xwindowtasksmodel.h b/libtaskmanager/xwindowtasksmodel.h index 2b4232041..1284da34e 100644 --- a/libtaskmanager/xwindowtasksmodel.h +++ b/libtaskmanager/xwindowtasksmodel.h @@ -55,8 +55,8 @@ public: explicit XWindowTasksModel(QObject *parent = nullptr); virtual ~XWindowTasksModel(); - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; /** * Request activation of the window at the given index.