diff options
| author | Arvid Nilsson <anilsson@blackberry.com> | 2014-04-01 16:04:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-01 16:42:43 +0200 |
| commit | db46baffab77cd546f16b4b4ccf09bc86d9ef208 (patch) | |
| tree | 04ce816420c05f503b47285d437877acd03dce41 /src/core/clipboard_qt.cpp | |
| parent | d42b33cae9148f187daf266d67b8964d3e223a4c (diff) | |
Add the base qualifier where base::string16 is used
Be explicit about this since the "using base::string16" statement will
be going away eventually.
Change-Id: I292928345eec746bea04e15a3f25e46193704463
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/clipboard_qt.cpp')
| -rw-r--r-- | src/core/clipboard_qt.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index ef2e28603..0430ff9b3 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -202,7 +202,7 @@ void Clipboard::Clear(ClipboardType type) QGuiApplication::clipboard()->clear(type == CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); } -void Clipboard::ReadAvailableTypes(ui::ClipboardType type, std::vector<string16>* types, bool* contains_filenames) const +void Clipboard::ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16>* types, bool* contains_filenames) const { if (!types || !contains_filenames) { NOTREACHED(); @@ -220,7 +220,7 @@ void Clipboard::ReadAvailableTypes(ui::ClipboardType type, std::vector<string16> } -void Clipboard::ReadText(ClipboardType type, string16* result) const +void Clipboard::ReadText(ClipboardType type, base::string16* result) const { const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(type == CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); *result = toString16(mimeData->text()); @@ -232,7 +232,7 @@ void Clipboard::ReadAsciiText(ClipboardType type, std::string* result) const *result = mimeData->text().toStdString(); } -void Clipboard::ReadHTML(ClipboardType type, string16* markup, std::string* src_url, uint32* fragment_start, uint32* fragment_end) const +void Clipboard::ReadHTML(ClipboardType type, base::string16* markup, std::string* src_url, uint32* fragment_start, uint32* fragment_end) const { markup->clear(); if (src_url) @@ -270,14 +270,14 @@ SkBitmap Clipboard::ReadImage(ClipboardType type) const return copy; } -void Clipboard::ReadCustomData(ClipboardType clipboard_type, const string16& type, string16* result) const +void Clipboard::ReadCustomData(ClipboardType clipboard_type, const base::string16& type, base::string16* result) const { const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(clipboard_type == CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); const QByteArray customData = mimeData->data(QString::fromLatin1(kMimeTypeWebCustomDataCopy)); ReadCustomDataForType(customData.constData(), customData.size(), type, result); } -void Clipboard::ReadBookmark(string16* title, std::string* url) const +void Clipboard::ReadBookmark(base::string16* title, std::string* url) const { NOTIMPLEMENTED(); } |