Skip to content

Commit d863086

Browse files
MontelMontel
committed
use override everywhere
1 parent a9d70b3 commit d863086

File tree

22 files changed

+47
-47
lines changed

22 files changed

+47
-47
lines changed

Diff for: ‎applets/appmenu/lib/appmenuapplet.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public slots:
7474
void trigger(QQuickItem *ctx, int idx);
7575

7676
protected:
77-
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
77+
bool eventFilter(QObject *watched, QEvent *event) override;
7878

7979
private:
8080
QMenu *createMenu(int idx) const;

Diff for: ‎applets/appmenu/plugin/appmenumodel.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ class AppMenuModel : public QAbstractListModel, public QAbstractNativeEventFilte
4646
ActionRole
4747
};
4848

49-
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
50-
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
51-
QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
49+
QVariant data(const QModelIndex &index, int role) const override;
50+
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
51+
QHash<int, QByteArray> roleNames() const override;
5252

5353
void updateApplicationMenu(const QString &serviceName, const QString &menuObjectPath);
5454

Diff for: ‎applets/notifications/lib/notificationsapplet.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class NotificationsApplet : public Plasma::Applet
4646
QRect availableScreenRect() const;
4747

4848
public Q_SLOTS:
49-
void init() Q_DECL_OVERRIDE;
49+
void init() override;
5050
void onScreenPositionChanged(uint position);
5151
void onAppletLocationChanged();
5252

Diff for: ‎applets/systemtray/systemtray.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SystemTray : public Plasma::Containment
4242

4343
void init() override;
4444

45-
void restoreContents(KConfigGroup &group) Q_DECL_OVERRIDE;
45+
void restoreContents(KConfigGroup &group) override;
4646
void restorePlasmoids();
4747

4848
QStringList defaultPlasmoids() const;

Diff for: ‎applets/systemtray/tests/statusnotifier/pumpjob.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class PumpJob : public KIO::Job
3434
PumpJob(int interval = 0);
3535
virtual ~PumpJob();
3636

37-
void start() Q_DECL_OVERRIDE;
38-
bool doKill() Q_DECL_OVERRIDE;
39-
bool doSuspend() Q_DECL_OVERRIDE;
40-
bool doResume() Q_DECL_OVERRIDE;
37+
void start() override;
38+
bool doKill() override;
39+
bool doSuspend() override;
40+
bool doResume() override;
4141

4242
virtual bool isSuspended() const;
4343

Diff for: ‎components/shellprivate/widgetexplorer/widgetexplorer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ class WidgetExplorer : public QObject, public QQmlParserStatus
143143
*/
144144
Q_INVOKABLE void uninstall(const QString &pluginName);
145145

146-
void classBegin() Q_DECL_OVERRIDE;
147-
void componentComplete() Q_DECL_OVERRIDE;
146+
void classBegin() override;
147+
void componentComplete() override;
148148

149149
Q_SIGNALS:
150150
void widgetsMenuActionsChanged();

Diff for: ‎ksmserver/shutdowndlg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public Q_SLOTS:
8282
void rejected();
8383

8484
protected:
85-
void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
85+
void resizeEvent(QResizeEvent *e) override;
8686
bool event(QEvent *e) override;
8787

8888
private:

Diff for: ‎ksmserver/startup.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static QTime t;
9797
class NotificationThread : public QThread
9898
{
9999
Q_OBJECT
100-
void run() Q_DECL_OVERRIDE {
100+
void run() override {
101101
// We cannot parent to the thread itself so let's create
102102
// a QObject on the stack and parent everythign to it
103103
QObject parent;

Diff for: ‎libtaskmanager/abstracttasksproxymodeliface.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
5151
*
5252
* @param index An index in this tasks model.
5353
**/
54-
void requestActivate(const QModelIndex &index) Q_DECL_OVERRIDE;
54+
void requestActivate(const QModelIndex &index) override;
5555

5656
/**
5757
* Request an additional instance of the application backing the task
5858
* at the given index.
5959
*
6060
* @param index An index in this tasks model.
6161
**/
62-
void requestNewInstance(const QModelIndex &index) Q_DECL_OVERRIDE;
62+
void requestNewInstance(const QModelIndex &index) override;
6363

6464
/**
6565
* Requests to open the given URLs with the application backing the task
@@ -68,14 +68,14 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
6868
* @param index An index in this tasks model.
6969
* @param urls The URLs to be passed to the application.
7070
**/
71-
virtual void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) Q_DECL_OVERRIDE;
71+
virtual void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) override;
7272

7373
/**
7474
* Request the task at the given index be closed.
7575
*
7676
* @param index An index in this tasks model.
7777
**/
78-
void requestClose(const QModelIndex &index) Q_DECL_OVERRIDE;
78+
void requestClose(const QModelIndex &index) override;
7979

8080
/**
8181
* Request starting an interactive move for the task at the given index.
@@ -85,7 +85,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
8585
*
8686
* @param index An index in this tasks model.
8787
**/
88-
void requestMove(const QModelIndex &index) Q_DECL_OVERRIDE;
88+
void requestMove(const QModelIndex &index) override;
8989

9090
/**
9191
* Request starting an interactive resize for the task at the given index.
@@ -95,7 +95,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
9595
*
9696
* @param index An index in this tasks model.
9797
**/
98-
void requestResize(const QModelIndex &index) Q_DECL_OVERRIDE;
98+
void requestResize(const QModelIndex &index) override;
9999

100100
/**
101101
* Request toggling the minimized state of the task at the given index.
@@ -105,7 +105,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
105105
*
106106
* @param index An index in this tasks model.
107107
**/
108-
void requestToggleMinimized(const QModelIndex &index) Q_DECL_OVERRIDE;
108+
void requestToggleMinimized(const QModelIndex &index) override;
109109

110110
/**
111111
* Request toggling the maximized state of the task at the given index.
@@ -115,7 +115,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
115115
*
116116
* @param index An index in this tasks model.
117117
**/
118-
void requestToggleMaximized(const QModelIndex &index) Q_DECL_OVERRIDE;
118+
void requestToggleMaximized(const QModelIndex &index) override;
119119

120120
/**
121121
* Request toggling the keep-above state of the task at the given index.
@@ -125,7 +125,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
125125
*
126126
* @param index An index in this tasks model.
127127
**/
128-
void requestToggleKeepAbove(const QModelIndex &index) Q_DECL_OVERRIDE;
128+
void requestToggleKeepAbove(const QModelIndex &index) override;
129129

130130
/**
131131
* Request toggling the keep-below state of the task at the given index.
@@ -135,7 +135,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
135135
*
136136
* @param index An index in this tasks model.
137137
**/
138-
void requestToggleKeepBelow(const QModelIndex &index) Q_DECL_OVERRIDE;
138+
void requestToggleKeepBelow(const QModelIndex &index) override;
139139

140140
/**
141141
* Request toggling the fullscreen state of the task at the given index.
@@ -145,7 +145,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
145145
*
146146
* @param index An index in this tasks model.
147147
**/
148-
void requestToggleFullScreen(const QModelIndex &index) Q_DECL_OVERRIDE;
148+
void requestToggleFullScreen(const QModelIndex &index) override;
149149

150150
/**
151151
* Request toggling the shaded state of the task at the given index.
@@ -155,7 +155,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
155155
*
156156
* @param index An index in this tasks model.
157157
**/
158-
void requestToggleShaded(const QModelIndex &index) Q_DECL_OVERRIDE;
158+
void requestToggleShaded(const QModelIndex &index) override;
159159

160160
/**
161161
* Request moving the task at the given index to the specified virtual
@@ -167,7 +167,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
167167
* @param index An index in this tasks model.
168168
* @param desktop A virtual desktop number.
169169
**/
170-
void requestVirtualDesktop(const QModelIndex &index, qint32 desktop = -1) Q_DECL_OVERRIDE;
170+
void requestVirtualDesktop(const QModelIndex &index, qint32 desktop = -1) override;
171171

172172
/**
173173
* Request moving the task at the given index to the specified activities.
@@ -178,7 +178,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
178178
* @param index An index in this tasks model.
179179
* @param activities The new list of activities.
180180
**/
181-
void requestActivities(const QModelIndex &index, const QStringList &activities) Q_DECL_OVERRIDE;
181+
void requestActivities(const QModelIndex &index, const QStringList &activities) override;
182182

183183
/**
184184
* Request informing the window manager of new geometry for a visual
@@ -192,7 +192,7 @@ class TASKMANAGER_EXPORT AbstractTasksProxyModelIface : public AbstractTasksMode
192192
* reject invalid objects.
193193
**/
194194
void requestPublishDelegateGeometry(const QModelIndex &index, const QRect &geometry,
195-
QObject *delegate = nullptr) Q_DECL_OVERRIDE;
195+
QObject *delegate = nullptr) override;
196196

197197
protected:
198198
/*

Diff for: ‎libtaskmanager/concatenatetasksproxymodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class TASKMANAGER_EXPORT ConcatenateTasksProxyModel : public KConcatenateRowsPro
4848
explicit ConcatenateTasksProxyModel(QObject *parent = 0);
4949
virtual ~ConcatenateTasksProxyModel();
5050
protected:
51-
QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
51+
QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
5252
};
5353

5454
}

Diff for: ‎libtaskmanager/declarative/taskmanagerplugin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class TaskManagerPlugin : public QQmlExtensionPlugin
3333
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
3434

3535
public:
36-
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
36+
void registerTypes(const char *uri) override;
3737
};
3838

3939
}

Diff for: ‎libtaskmanager/flattentaskgroupsproxymodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class TASKMANAGER_EXPORT FlattenTaskGroupsProxyModel : public KDescendantsProxyM
5252
void setSourceModel(QAbstractItemModel *sourceModel) override;
5353

5454
protected:
55-
QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
55+
QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
5656
private:
5757
class Private;
5858
QScopedPointer<Private> d;

Diff for: ‎libtaskmanager/taskfilterproxymodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ class TASKMANAGER_EXPORT TaskFilterProxyModel : public QSortFilterProxyModel, pu
285285

286286
protected:
287287
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
288-
QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
288+
QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
289289

290290
private:
291291
class Private;

Diff for: ‎libtaskmanager/windowtasksmodel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class TASKMANAGER_EXPORT WindowTasksModel : public QIdentityProxyModel, public A
5151
QHash<int, QByteArray> roleNames() const override;
5252

5353
protected:
54-
QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
54+
QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
5555
private:
5656
class Private;
5757
QScopedPointer<Private> d;

Diff for: ‎plasmacalendarintegration/holidaysevents.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class HolidaysEventsPlugin : public CalendarEvents::CalendarEventsPlugin
3636
explicit HolidaysEventsPlugin(QObject *parent = nullptr);
3737
~HolidaysEventsPlugin();
3838

39-
void loadEventsForDateRange(const QDate &startDate, const QDate &endDate) Q_DECL_OVERRIDE;
39+
void loadEventsForDateRange(const QDate &startDate, const QDate &endDate) override;
4040

4141
private:
4242
QDate m_lastStartDate;

Diff for: ‎plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class HolidayEventsHelperPlugin : public QQmlExtensionPlugin
2727
Q_OBJECT
2828
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2929
public:
30-
void registerTypes(const char* uri) Q_DECL_OVERRIDE;
30+
void registerTypes(const char* uri) override;
3131
};
3232

3333
#endif // HOLIDAYEVENTSHELPERPLUGIN_H

Diff for: ‎runners/powerdevil/PowerDevilRunner.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class PowerDevilRunner : public Plasma::AbstractRunner
3333
PowerDevilRunner( QObject *parent, const QVariantList &args );
3434
~PowerDevilRunner() override;
3535

36-
void match( Plasma::RunnerContext &context ) Q_DECL_OVERRIDE;
37-
void run( const Plasma::RunnerContext &context, const Plasma::QueryMatch &action ) Q_DECL_OVERRIDE;
36+
void match( Plasma::RunnerContext &context ) override;
37+
void run( const Plasma::RunnerContext &context, const Plasma::QueryMatch &action ) override;
3838

3939
private Q_SLOTS:
4040
void updateStatus();

Diff for: ‎runners/sessions/sessionrunner.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class SessionRunner : public Plasma::AbstractRunner
3535
SessionRunner(QObject *parent, const QVariantList &args);
3636
~SessionRunner() override;
3737

38-
void match(Plasma::RunnerContext &context) Q_DECL_OVERRIDE;
39-
void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) Q_DECL_OVERRIDE;
38+
void match(Plasma::RunnerContext &context) override;
39+
void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override;
4040

4141
enum { LogoutAction = 1, ShutdownAction, RestartAction, LockAction };
4242

Diff for: ‎shell/screenpool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ScreenPool : public QObject, public QAbstractNativeEventFilter
5353
QList <int> knownIds() const;
5454

5555
protected:
56-
bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) Q_DECL_OVERRIDE;
56+
bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) override;
5757

5858
private:
5959
void save();

Diff for: ‎soliduiserver/deviceserviceaction.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MacroExpander : public KMacroExpanderBase
3535
: KMacroExpanderBase('%'), m_device(device) {}
3636

3737
protected:
38-
int expandEscapedMacro(const QString &str, int pos, QStringList &ret) Q_DECL_OVERRIDE;
38+
int expandEscapedMacro(const QString &str, int pos, QStringList &ret) override;
3939

4040
private:
4141
Solid::Device m_device;

Diff for: ‎wallpapers/image/backgroundlistmodel.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ class BackgroundListModel : public QAbstractListModel
7676
BackgroundListModel(Image *listener, QObject *parent);
7777
~BackgroundListModel() override;
7878

79-
QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
80-
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
81-
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE ;
82-
bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
79+
QHash<int, QByteArray> roleNames() const override;
80+
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
81+
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override ;
82+
bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
8383
KPackage::Package package(int index) const;
8484

8585
void reload();

Diff for: ‎xembed-sni-proxy/fdoselectionmanager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class FdoSelectionManager : public QObject, public QAbstractNativeEventFilter
3939
~FdoSelectionManager() override;
4040

4141
protected:
42-
bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) Q_DECL_OVERRIDE;
42+
bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) override;
4343

4444
private Q_SLOTS:
4545
void onClaimedOwnership();

0 commit comments

Comments
 (0)