diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-03-22 17:09:51 +0100 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-03-22 17:13:00 +0100 |
| commit | 51b887576cdfc5ababb368a62a9f96df47e9ce1c (patch) | |
| tree | ca39ba8ee1ee9a14582e0da911ade6208133f438 /src/core/clipboard_qt.h | |
| parent | 23f7e8bb628c60a5f62764e7f3f87f8799be7959 (diff) | |
| parent | 7794aadf9076774296c38743e3be69dd6143d0da (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8aff2a3d2d4ae9351dc65689a4db9d3ab0d017b3
Diffstat (limited to 'src/core/clipboard_qt.h')
| -rw-r--r-- | src/core/clipboard_qt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h index 6a2ea104a..6af4193d9 100644 --- a/src/core/clipboard_qt.h +++ b/src/core/clipboard_qt.h @@ -65,7 +65,7 @@ private: class ClipboardQt : public ui::Clipboard { public: - virtual uint64 GetSequenceNumber(ui::ClipboardType type) const Q_DECL_OVERRIDE; + 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; @@ -74,8 +74,8 @@ public: virtual void ReadHTML(ui::ClipboardType type, base::string16* markup, std::string* src_url, - uint32* fragment_start, - uint32* fragment_end) const Q_DECL_OVERRIDE; + 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; |