Commit 469a3399 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Use override consistently

parent 2a445666
......@@ -30,7 +30,7 @@ class ColorPickerPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) override;
};
......
......@@ -30,7 +30,7 @@ class Grabber : public QObject
{
Q_OBJECT
public:
virtual ~Grabber();
~Grabber() override;
virtual void pick() = 0;
......@@ -54,12 +54,12 @@ class X11Grabber : public Grabber
Q_OBJECT
public:
explicit X11Grabber(QObject *parent = nullptr);
virtual ~X11Grabber();
~X11Grabber() override;
void pick() override;
protected:
virtual bool eventFilter(QObject *watched, QEvent *event) override;
bool eventFilter(QObject *watched, QEvent *event) override;
private:
QWidget *m_grabWidget;
......@@ -70,7 +70,7 @@ class KWinWaylandGrabber : public Grabber
Q_OBJECT
public:
explicit KWinWaylandGrabber(QObject *parent = nullptr);
virtual ~KWinWaylandGrabber();
~KWinWaylandGrabber() override;
void pick() override;
};
......@@ -83,7 +83,7 @@ class GrabWidget : public QObject
public:
explicit GrabWidget(QObject *parent = nullptr);
virtual ~GrabWidget();
~GrabWidget() override;
QColor currentColor() const;
......
......@@ -71,10 +71,10 @@ class ComicApplet : public Plasma::Applet, public Plasma::DataEngineConsumer
public:
ComicApplet( QObject *parent, const QVariantList &args );
~ComicApplet();
~ComicApplet() override;
void init() Q_DECL_OVERRIDE;
QList<QAction*> contextualActions() Q_DECL_OVERRIDE;
void init() override;
QList<QAction*> contextualActions() override;
//For QML
QObject *comicsModel() const;
......@@ -157,7 +157,7 @@ Q_SIGNALS:
void slotArchiveFinished( KJob *job );
public Q_SLOTS:
void configChanged() Q_DECL_OVERRIDE;
void configChanged() override;
void saveConfig();
Q_INVOKABLE void updateComic(const QString &identifierSuffix = QString());
Q_INVOKABLE void goJump() { slotGoJump();}
......
......@@ -52,7 +52,7 @@ class ComicArchiveJob : public KJob
* @see setToIdentifier, setFromIdentifier
*/
ComicArchiveJob( const QUrl &dest, Plasma::DataEngine *engine, ArchiveType archiveType, IdentifierType identifierType, const QString &pluginName, QObject *parent = 0 );
~ComicArchiveJob();
~ComicArchiveJob() override;
/**
* Checks if all the needed data has been set
......@@ -71,15 +71,15 @@ class ComicArchiveJob : public KJob
*/
void setFromIdentifier( const QString &fromIdentifier );
void start() Q_DECL_OVERRIDE;
void start() override;
public Q_SLOTS:
void dataUpdated( const QString &source, const Plasma::DataEngine::Data& data );
protected:
bool doKill() Q_DECL_OVERRIDE;
bool doSuspend() Q_DECL_OVERRIDE;
bool doResume() Q_DECL_OVERRIDE;
bool doKill() override;
bool doSuspend() override;
bool doResume() override;
private:
/**
......
......@@ -36,12 +36,12 @@ class ComicModel : public QAbstractTableModel, public Plasma::DataEngineConsumer
void setComics( const Plasma::DataEngine::Data &comics, const QStringList &usedComics );
QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
QHash<int, QByteArray> roleNames() const override;
int rowCount( const QModelIndex &index = QModelIndex() ) const Q_DECL_OVERRIDE;
int columnCount( const QModelIndex &index = QModelIndex() ) const Q_DECL_OVERRIDE;
QVariant data( const QModelIndex &index, int role = Qt::CheckStateRole ) const Q_DECL_OVERRIDE;
Qt::ItemFlags flags( const QModelIndex &index ) const Q_DECL_OVERRIDE;
int rowCount( const QModelIndex &index = QModelIndex() ) const override;
int columnCount( const QModelIndex &index = QModelIndex() ) const override;
QVariant data( const QModelIndex &index, int role = Qt::CheckStateRole ) const override;
Qt::ItemFlags flags( const QModelIndex &index ) const override;
public Q_SLOTS:
......
......@@ -47,7 +47,7 @@ class ComicUpdater : public QObject
public:
explicit ComicUpdater( QObject *parent = 0 );
~ComicUpdater();
~ComicUpdater() override;
void init( const KConfigGroup &group );
......
......@@ -39,7 +39,7 @@ class StripSelector : public QObject
Q_OBJECT
public:
virtual ~StripSelector();
~StripSelector() override;
/**
* Select a strip depending on the subclass
......
......@@ -28,18 +28,18 @@ class StringStripSelector : public StripSelector
{
public:
explicit StringStripSelector(QObject *parent = 0);
virtual ~StringStripSelector();
~StringStripSelector() override;
void select(const ComicData &currentStrip) Q_DECL_OVERRIDE;
void select(const ComicData &currentStrip) override;
};
class NumberStripSelector : public StripSelector
{
public:
explicit NumberStripSelector(QObject *parent = 0);
virtual ~NumberStripSelector();
~NumberStripSelector() override;
void select(const ComicData &currentStrip) Q_DECL_OVERRIDE;
void select(const ComicData &currentStrip) override;
};
class DateStripSelector : public StripSelector
......@@ -48,9 +48,9 @@ class DateStripSelector : public StripSelector
public:
explicit DateStripSelector(QObject *parent = 0);
virtual ~DateStripSelector();
~DateStripSelector() override;
void select(const ComicData &currentStrip) Q_DECL_OVERRIDE;
void select(const ComicData &currentStrip) override;
private Q_SLOTS:
void slotChosenDay(const QDate &date);
......
......@@ -35,7 +35,7 @@ public:
: QWebEngineUrlSchemeHandler(parent)
{
}
void requestStarted(QWebEngineUrlRequestJob *job) {
void requestStarted(QWebEngineUrlRequestJob *job) override {
job->fail(QWebEngineUrlRequestJob::UrlInvalid);
const QString word = job->requestUrl().path();
emit wordClicked(word);
......
......@@ -28,7 +28,7 @@ class DictPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) override;
};
#endif
......@@ -27,7 +27,7 @@ class DiskQuotaPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) override;
};
#endif // QUOTA_WATCH_PLUGIN_H
......@@ -30,7 +30,7 @@ class FifteenImageProvider : public QQuickImageProvider
public:
FifteenImageProvider();
QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE;
QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override;
private:
// Update our pixmaps, called when sizes change or boardSize changes
......
......@@ -31,8 +31,8 @@ class FifteenPuzzlePlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char* uri) Q_DECL_OVERRIDE;
void initializeEngine(QQmlEngine * engine, const char * uri) Q_DECL_OVERRIDE;
void registerTypes(const char* uri) override;
void initializeEngine(QQmlEngine * engine, const char * uri) override;
};
......
......@@ -45,7 +45,7 @@ class MediaFrame : public QObject
Q_ENUMS(AddOption)
MediaFrame(QObject *parent = nullptr);
virtual ~MediaFrame();
~MediaFrame() override;
int count() const;
......
......@@ -28,7 +28,7 @@ class MediaFramePlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) override;
};
#endif
......@@ -32,7 +32,7 @@ Q_PROPERTY(bool active READ active NOTIFY activeChanged)
public:
MinimizeAll();
~MinimizeAll();
~MinimizeAll() override;
Q_INVOKABLE void minimizeAllWindows();
Q_INVOKABLE void unminimizeAllWindows();
......
......@@ -30,7 +30,7 @@ class MinimizeAllPlugin : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
public:
void registerTypes(const char *uri) Q_DECL_OVERRIDE;
void registerTypes(const char *uri) override;
};
#endif // MINIMIZEALLPLUGIN_H
......@@ -33,7 +33,7 @@ Q_OBJECT
public:
FileNote(const QString &path, const QString &id);
void load();
void save(const QString &text) Q_DECL_OVERRIDE;
void save(const QString &text) override;
private:
void fileSystemChanged(const QString &path);
QString m_path;
......
......@@ -29,9 +29,9 @@ class FileSystemNoteLoader : public AbstractNoteLoader
{
public:
explicit FileSystemNoteLoader();
virtual QStringList allNoteIds() Q_DECL_OVERRIDE;
virtual Note* loadNote(const QString &id) Q_DECL_OVERRIDE;
virtual void deleteNoteResources(const QString &id) Q_DECL_OVERRIDE;
QStringList allNoteIds() override;
Note* loadNote(const QString &id) override;
void deleteNoteResources(const QString &id) override;
private:
QDir m_notesDir;
......
......@@ -35,7 +35,7 @@ public:
}
virtual ~NotesHelper() = default;
~NotesHelper() override = default;
Q_INVOKABLE QString fileContents(const QString &path) const
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment