diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-07 12:11:46 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-07 13:03:27 +0200 |
| commit | 0efe79f80d6f249040f47162ebbfc82289ca073d (patch) | |
| tree | b2326e1c7392367e438a16370f4cfb0ad63b09a0 /src/gui/platform/windows | |
| parent | 4ef79853528dcc908ad3737f7bebf38b059de959 (diff) | |
Rename the new platform APIs from QPlatformInterface to QNativeInterface
We were already using the 'native' nomenclature when referring to these
kinds of APIs, e.g. when talking about native handles, or the existing
QPlatformNativeInterface on a QPA level. Using 'native' for the user
facing APIs also distinguishes them from the 'platform' backend layer
in QPA and elsewhere.
Change-Id: I0f3273265904f0f19c0b6d62471f8820d3c3232e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/platform/windows')
| -rw-r--r-- | src/gui/platform/windows/qwindowsmime_p.h | 4 | ||||
| -rw-r--r-- | src/gui/platform/windows/qwindowsplatforminterface.cpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/platform/windows/qwindowsmime_p.h b/src/gui/platform/windows/qwindowsmime_p.h index 5d71b9ee94..71b1c8a87f 100644 --- a/src/gui/platform/windows/qwindowsmime_p.h +++ b/src/gui/platform/windows/qwindowsmime_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QMimeData; -namespace QPlatformInterface::Private { +namespace QNativeInterface::Private { class Q_GUI_EXPORT QWindowsMime { @@ -78,7 +78,7 @@ public: virtual QString mimeForFormat(const FORMATETC &formatetc) const = 0; }; -} // QPlatformInterface::Private +} // QNativeInterface::Private QT_END_NAMESPACE diff --git a/src/gui/platform/windows/qwindowsplatforminterface.cpp b/src/gui/platform/windows/qwindowsplatforminterface.cpp index e1aa3b6970..950c86d7fb 100644 --- a/src/gui/platform/windows/qwindowsplatforminterface.cpp +++ b/src/gui/platform/windows/qwindowsplatforminterface.cpp @@ -47,20 +47,20 @@ QT_BEGIN_NAMESPACE -using namespace QPlatformInterface::Private; +using namespace QNativeInterface::Private; #ifndef QT_NO_OPENGL -QT_DEFINE_PLATFORM_INTERFACE(QWGLContext, QOpenGLContext); -QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QWindowsGLIntegration); +QT_DEFINE_NATIVE_INTERFACE(QWGLContext, QOpenGLContext); +QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QWindowsGLIntegration); -HMODULE QPlatformInterface::QWGLContext::openGLModuleHandle() +HMODULE QNativeInterface::QWGLContext::openGLModuleHandle() { return QGuiApplicationPrivate::platformIntegration()->call< &QWindowsGLIntegration::openGLModuleHandle>(); } -QOpenGLContext *QPlatformInterface::QWGLContext::fromNative(HGLRC context, HWND window, QOpenGLContext *shareContext) +QOpenGLContext *QNativeInterface::QWGLContext::fromNative(HGLRC context, HWND window, QOpenGLContext *shareContext) { return QGuiApplicationPrivate::platformIntegration()->call< &QWindowsGLIntegration::createOpenGLContext>(context, window, shareContext); @@ -68,7 +68,7 @@ QOpenGLContext *QPlatformInterface::QWGLContext::fromNative(HGLRC context, HWND #endif // QT_NO_OPENGL -QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QWindowsApplication); -QT_DEFINE_PRIVATE_PLATFORM_INTERFACE(QWindowsWindow); +QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QWindowsApplication); +QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QWindowsWindow); QT_END_NAMESPACE |