diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-12 11:58:21 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-21 11:10:13 +0000 |
commit | a5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch) | |
tree | 61a093917f9c8308d2153335d49c58acc3836981 /src/core/clipboard_qt.h | |
parent | d08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff) |
Standardize override declaration
Update our overrides to Qt coding standard getting rid of
Q_DECL_OVERRIDE and redundant virtual declarations.
Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/clipboard_qt.h')
-rw-r--r-- | src/core/clipboard_qt.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h index 6af4193d9..c2ced4941 100644 --- a/src/core/clipboard_qt.h +++ b/src/core/clipboard_qt.h @@ -65,32 +65,32 @@ private: class ClipboardQt : public ui::Clipboard { public: - virtual uint64_t GetSequenceNumber(ui::ClipboardType type) const Q_DECL_OVERRIDE; - virtual bool IsFormatAvailable(const FormatType& format, ui::ClipboardType type) const Q_DECL_OVERRIDE; - virtual void Clear(ui::ClipboardType type) Q_DECL_OVERRIDE; - virtual void ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16>* types, bool* contains_filenames) const Q_DECL_OVERRIDE; - virtual void ReadText(ui::ClipboardType type, base::string16* result) const Q_DECL_OVERRIDE; - virtual void ReadAsciiText(ui::ClipboardType type, std::string* result) const Q_DECL_OVERRIDE; - virtual void ReadHTML(ui::ClipboardType type, + uint64_t GetSequenceNumber(ui::ClipboardType type) const override; + bool IsFormatAvailable(const FormatType& format, ui::ClipboardType type) const override; + void Clear(ui::ClipboardType type) override; + void ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16>* types, bool* contains_filenames) const override; + void ReadText(ui::ClipboardType type, base::string16* result) const override; + void ReadAsciiText(ui::ClipboardType type, std::string* result) const override; + void ReadHTML(ui::ClipboardType type, base::string16* markup, std::string* src_url, uint32_t* fragment_start, - uint32_t* fragment_end) const Q_DECL_OVERRIDE; - virtual void ReadRTF(ui::ClipboardType type, std::string* result) const Q_DECL_OVERRIDE; - virtual SkBitmap ReadImage(ui::ClipboardType type) const Q_DECL_OVERRIDE; - virtual void ReadCustomData(ui::ClipboardType clipboard_type, const base::string16& type, base::string16* result) const Q_DECL_OVERRIDE; - virtual void ReadBookmark(base::string16* title, std::string* url) const Q_DECL_OVERRIDE; - virtual void ReadData(const FormatType& format, std::string* result) const Q_DECL_OVERRIDE; + uint32_t* fragment_end) const override; + void ReadRTF(ui::ClipboardType type, std::string* result) const override; + SkBitmap ReadImage(ui::ClipboardType type) const override; + void ReadCustomData(ui::ClipboardType clipboard_type, const base::string16& type, base::string16* result) const override; + void ReadBookmark(base::string16* title, std::string* url) const override; + void ReadData(const FormatType& format, std::string* result) const override; protected: - virtual void WriteObjects(ui::ClipboardType type, const ObjectMap& objects) Q_DECL_OVERRIDE; - virtual void WriteText(const char* text_data, size_t text_len) Q_DECL_OVERRIDE; - virtual void WriteHTML(const char* markup_data, size_t markup_len, const char* url_data, size_t url_len) Q_DECL_OVERRIDE; - virtual void WriteRTF(const char* rtf_data, size_t data_len) Q_DECL_OVERRIDE; - virtual void WriteBookmark(const char* title_data, size_t title_len, const char* url_data, size_t url_len) Q_DECL_OVERRIDE; - virtual void WriteWebSmartPaste() Q_DECL_OVERRIDE; - virtual void WriteBitmap(const SkBitmap& bitmap) Q_DECL_OVERRIDE; - virtual void WriteData(const FormatType& format, const char* data_data, size_t data_len) Q_DECL_OVERRIDE; + void WriteObjects(ui::ClipboardType type, const ObjectMap& objects) override; + void WriteText(const char* text_data, size_t text_len) override; + void WriteHTML(const char* markup_data, size_t markup_len, const char* url_data, size_t url_len) override; + void WriteRTF(const char* rtf_data, size_t data_len) override; + void WriteBookmark(const char* title_data, size_t title_len, const char* url_data, size_t url_len) override; + void WriteWebSmartPaste() override; + void WriteBitmap(const SkBitmap& bitmap) override; + void WriteData(const FormatType& format, const char* data_data, size_t data_len) override; }; } // namespace QtWebEngineCore |