diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-17 13:29:07 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-17 13:39:32 +0000 |
commit | a2d48676e6272258caf01f4a17dd3405ca7c80c9 (patch) | |
tree | a13faaa8debb1202affd511bb6871816f3c0c1b4 | |
parent | 4f890dea763bb1a4deebe9c415d49340900a4a82 (diff) | |
download | qt-creator-a2d48676e6272258caf01f4a17dd3405ca7c80c9.tar.gz |
CPaster: Introduce override.
Change-Id: I0c002895a6585fac79c8aa1d773b68c4a1540916
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r-- | src/plugins/cpaster/columnindicatortextedit.h | 2 | ||||
-rw-r--r-- | src/plugins/cpaster/cpasterplugin.h | 8 | ||||
-rw-r--r-- | src/plugins/cpaster/fileshareprotocol.h | 26 | ||||
-rw-r--r-- | src/plugins/cpaster/kdepasteprotocol.h | 20 | ||||
-rw-r--r-- | src/plugins/cpaster/pastebindotcaprotocol.h | 24 | ||||
-rw-r--r-- | src/plugins/cpaster/pastebindotcomprotocol.h | 18 | ||||
-rw-r--r-- | src/plugins/cpaster/pasteselectdialog.h | 2 | ||||
-rw-r--r-- | src/plugins/cpaster/pasteview.h | 4 | ||||
-rw-r--r-- | src/plugins/cpaster/settingspage.h | 8 | ||||
-rw-r--r-- | src/plugins/cpaster/urlopenprotocol.h | 8 |
10 files changed, 60 insertions, 60 deletions
diff --git a/src/plugins/cpaster/columnindicatortextedit.h b/src/plugins/cpaster/columnindicatortextedit.h index 93796d92fe..2225399d12 100644 --- a/src/plugins/cpaster/columnindicatortextedit.h +++ b/src/plugins/cpaster/columnindicatortextedit.h @@ -44,7 +44,7 @@ public: int columnIndicator() const { return m_columnIndicator; } protected: - virtual void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: int m_columnIndicator = 0; diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h index 3ac41a767e..632503543a 100644 --- a/src/plugins/cpaster/cpasterplugin.h +++ b/src/plugins/cpaster/cpasterplugin.h @@ -71,11 +71,11 @@ public: Q_DECLARE_FLAGS(PasteSources, PasteSource) CodepasterPlugin(); - ~CodepasterPlugin(); + ~CodepasterPlugin() override; - virtual bool initialize(const QStringList &arguments, QString *errorMessage); - virtual void extensionsInitialized(); - virtual ShutdownFlag aboutToShutdown(); + bool initialize(const QStringList &arguments, QString *errorMessage) override; + void extensionsInitialized() override; + ShutdownFlag aboutToShutdown() override; static CodepasterPlugin *instance(); diff --git a/src/plugins/cpaster/fileshareprotocol.h b/src/plugins/cpaster/fileshareprotocol.h index 2c7b69b498..cab6d17b3d 100644 --- a/src/plugins/cpaster/fileshareprotocol.h +++ b/src/plugins/cpaster/fileshareprotocol.h @@ -49,21 +49,21 @@ class FileShareProtocol : public Protocol public: FileShareProtocol(); - virtual ~FileShareProtocol(); + ~FileShareProtocol() override; - virtual QString name() const; - virtual unsigned capabilities() const; - virtual bool hasSettings() const; - virtual Core::IOptionsPage *settingsPage() const; + QString name() const override; + unsigned capabilities() const override; + bool hasSettings() const override; + Core::IOptionsPage *settingsPage() const override; - virtual bool checkConfiguration(QString *errorMessage = 0); - virtual void fetch(const QString &id); - virtual void list(); - virtual void paste(const QString &text, - ContentType ct = Text, int expiryDays = 1, - const QString &username = QString(), - const QString &comment = QString(), - const QString &description = QString()); + bool checkConfiguration(QString *errorMessage = 0) override; + void fetch(const QString &id) override; + void list() override; + void paste(const QString &text, + ContentType ct = Text, int expiryDays = 1, + const QString &username = QString(), + const QString &comment = QString(), + const QString &description = QString()) override; private: const QSharedPointer<FileShareProtocolSettings> m_settings; diff --git a/src/plugins/cpaster/kdepasteprotocol.h b/src/plugins/cpaster/kdepasteprotocol.h index 76bff75c9d..eb027d6c0e 100644 --- a/src/plugins/cpaster/kdepasteprotocol.h +++ b/src/plugins/cpaster/kdepasteprotocol.h @@ -39,16 +39,16 @@ class StickyNotesPasteProtocol : public NetworkProtocol { Q_OBJECT public: - virtual unsigned capabilities() const; + unsigned capabilities() const override; - virtual void fetch(const QString &id); - virtual void paste(const QString &text, - ContentType ct = Text, - int expiryDays = 1, - const QString &username = QString(), - const QString &comment = QString(), - const QString &description = QString()); - virtual void list(); + void fetch(const QString &id) override; + void paste(const QString &text, + ContentType ct = Text, + int expiryDays = 1, + const QString &username = QString(), + const QString &comment = QString(), + const QString &description = QString()) override; + void list() override; @@ -61,7 +61,7 @@ public slots: void listFinished(); protected: - virtual bool checkConfiguration(QString *errorMessage = 0); + bool checkConfiguration(QString *errorMessage = 0) override; private: QString m_hostUrl; diff --git a/src/plugins/cpaster/pastebindotcaprotocol.h b/src/plugins/cpaster/pastebindotcaprotocol.h index 445afa710c..73ffc60031 100644 --- a/src/plugins/cpaster/pastebindotcaprotocol.h +++ b/src/plugins/cpaster/pastebindotcaprotocol.h @@ -39,19 +39,19 @@ class PasteBinDotCaProtocol : public NetworkProtocol Q_OBJECT public: static QString protocolName(); - QString name() const { return protocolName(); } + QString name() const override { return protocolName(); } - virtual bool hasSettings() const { return false; } - virtual unsigned capabilities() const; + bool hasSettings() const override { return false; } + unsigned capabilities() const override; - virtual void fetch(const QString &id); - virtual void paste(const QString &text, - ContentType ct = Text, - int expiryDays = 1, - const QString &username = QString(), - const QString &comment = QString(), - const QString &description = QString()); - virtual void list(); + void fetch(const QString &id); + void paste(const QString &text, + ContentType ct = Text, + int expiryDays = 1, + const QString &username = QString(), + const QString &comment = QString(), + const QString &description = QString()) override; + void list() override; public slots: void fetchFinished(); @@ -59,7 +59,7 @@ public slots: void pasteFinished(); protected: - virtual bool checkConfiguration(QString *errorMessage); + bool checkConfiguration(QString *errorMessage) override; private: QNetworkReply *m_fetchReply = nullptr; diff --git a/src/plugins/cpaster/pastebindotcomprotocol.h b/src/plugins/cpaster/pastebindotcomprotocol.h index f9000e10f5..08076746a4 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.h +++ b/src/plugins/cpaster/pastebindotcomprotocol.h @@ -42,16 +42,16 @@ public: static QString protocolName(); QString name() const { return protocolName(); } - virtual unsigned capabilities() const; + unsigned capabilities() const override; - virtual void fetch(const QString &id); - virtual void paste(const QString &text, - ContentType ct = Text, - int expiryDays = 1, - const QString &username = QString(), - const QString &comment = QString(), - const QString &description = QString()); - virtual void list(); + void fetch(const QString &id); + void paste(const QString &text, + ContentType ct = Text, + int expiryDays = 1, + const QString &username = QString(), + const QString &comment = QString(), + const QString &description = QString()) override; + void list() override; public slots: void fetchFinished(); diff --git a/src/plugins/cpaster/pasteselectdialog.h b/src/plugins/cpaster/pasteselectdialog.h index 3c58c5bd00..02d72351d9 100644 --- a/src/plugins/cpaster/pasteselectdialog.h +++ b/src/plugins/cpaster/pasteselectdialog.h @@ -46,7 +46,7 @@ class PasteSelectDialog : public QDialog public: explicit PasteSelectDialog(const QList<Protocol*> &protocols, QWidget *parent = 0); - ~PasteSelectDialog(); + ~PasteSelectDialog() override; QString pasteId() const; diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h index dd0abb1321..09ed00d48b 100644 --- a/src/plugins/cpaster/pasteview.h +++ b/src/plugins/cpaster/pasteview.h @@ -54,7 +54,7 @@ public: explicit PasteView(const QList<Protocol *> &protocols, const QString &mimeType, QWidget *parent); - ~PasteView(); + ~PasteView() override; // Show up with checkable list of diff chunks. int show(const QString &user, const QString &description, const QString &comment, @@ -73,7 +73,7 @@ public: void setExpiryDays(int d); int expiryDays() const; - virtual void accept(); + void accept() override; private slots: void contentChanged(); diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index 08d490883a..50ce8c1213 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -63,11 +63,11 @@ class SettingsPage : public Core::IOptionsPage public: explicit SettingsPage(const QSharedPointer<Settings> &settings); - ~SettingsPage(); + ~SettingsPage() override; - QWidget *widget(); - void apply(); - void finish() { } + QWidget *widget() override; + void apply() override; + void finish() override { } void addProtocol(const QString& name); diff --git a/src/plugins/cpaster/urlopenprotocol.h b/src/plugins/cpaster/urlopenprotocol.h index b0da855e65..6783ef952f 100644 --- a/src/plugins/cpaster/urlopenprotocol.h +++ b/src/plugins/cpaster/urlopenprotocol.h @@ -39,10 +39,10 @@ class UrlOpenProtocol : public NetworkProtocol { Q_OBJECT public: - QString name() const; - unsigned capabilities() const; - void fetch(const QString &url); - void paste(const QString &, ContentType, int, const QString &, const QString &, const QString &); + QString name() const override; + unsigned capabilities() const override; + void fetch(const QString &url) override; + void paste(const QString &, ContentType, int, const QString &, const QString &, const QString &) override; private slots: void fetchFinished(); |