diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-12-12 15:06:29 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-02 13:18:46 +0000 |
| commit | 0c49002d833b6c8ccf822d1ebd29a86b3f15f389 (patch) | |
| tree | a414da48ea946a97daba4eb9106f0e2387f18a42 /src/core/clipboard_qt.cpp | |
| parent | 26ae2ce0a8401698a2b1c1f0a8162ebf83dcafef (diff) | |
Add namespace to internal QtWebEngine API
Adds the QtWebEngineCore namespace to all internal core API. This
ensures we don't export any internal symbols in the global namespace.
Change-Id: I26af888ea7c6c4c4d0f04c24a377c1a9d3c92751
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/clipboard_qt.cpp')
| -rw-r--r-- | src/core/clipboard_qt.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index 21ea457ce..f7ca9764d 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -51,6 +51,8 @@ #include <QImage> #include <QMimeData> +namespace QtWebEngineCore { + Q_GLOBAL_STATIC(ClipboardChangeObserver, clipboardChangeObserver) ClipboardChangeObserver::ClipboardChangeObserver() @@ -63,6 +65,10 @@ void ClipboardChangeObserver::trackChange(QClipboard::Mode mode) ++sequenceNumber[mode]; } +} // namespace QtWebEngineCore + +using namespace QtWebEngineCore; + namespace { const char kMimeTypeBitmap[] = "image/bmp"; @@ -188,6 +194,8 @@ bool Clipboard::FormatType::operator<(const FormatType& other) const } // namespace ui +namespace QtWebEngineCore { + void ClipboardQt::WriteObjects(ui::ClipboardType type, const ObjectMap& objects) { DCHECK(CalledOnValidThread()); @@ -358,4 +366,4 @@ uint64 ClipboardQt::GetSequenceNumber(ui::ClipboardType type) return clipboardChangeObserver()->getSequenceNumber(type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); } - +} // namespace QtWebEngineCore |