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 /tests/manual | |
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 'tests/manual')
-rw-r--r-- | tests/manual/qopenglcontext/qopenglcontextwindow.cpp | 6 | ||||
-rw-r--r-- | tests/manual/qtabletevent/regular_widgets/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/touch/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/qopenglcontext/qopenglcontextwindow.cpp b/tests/manual/qopenglcontext/qopenglcontextwindow.cpp index 4a369f8eda..07147a4488 100644 --- a/tests/manual/qopenglcontext/qopenglcontextwindow.cpp +++ b/tests/manual/qopenglcontext/qopenglcontextwindow.cpp @@ -97,8 +97,8 @@ void QOpenGLContextWindow::createForeignContext() // underlying native context. This way the texture, that belongs to the context // created here, will be accessible from m_context too. - using namespace QPlatformInterface; - auto *eglContext = m_context->platformInterface<QEGLContext>(); + using namespace QNativeInterface; + auto *eglContext = m_context->nativeInterface<QEGLContext>(); if (!eglContext) qFatal("Not running with EGL backend"); @@ -132,7 +132,7 @@ void QOpenGLContextWindow::createForeignContext() // Wrap ctx into a QOpenGLContext. QOpenGLContext *ctxWrap = QEGLContext::fromNative(ctx, dpy, m_context); - Q_ASSERT(ctxWrap->platformInterface<QEGLContext>()->nativeContext() == ctx); + Q_ASSERT(ctxWrap->nativeInterface<QEGLContext>()->nativeContext() == ctx); QOffscreenSurface surface; surface.setFormat(fmt); diff --git a/tests/manual/qtabletevent/regular_widgets/main.cpp b/tests/manual/qtabletevent/regular_widgets/main.cpp index 9f20f5412f..3b112450b4 100644 --- a/tests/manual/qtabletevent/regular_widgets/main.cpp +++ b/tests/manual/qtabletevent/regular_widgets/main.cpp @@ -52,7 +52,7 @@ enum TabletPointType { }; #ifdef Q_OS_WIN -using QWindowsApplication = QPlatformInterface::Private::QWindowsApplication; +using QWindowsApplication = QNativeInterface::Private::QWindowsApplication; static void setWinTabEnabled(bool e) { diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index c09d951ff0..fdba80d7bb 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/main.cpp @@ -430,7 +430,7 @@ private slots: void touchTypeToggled(); private: - using QWindowsApplication = QPlatformInterface::Private::QWindowsApplication; + using QWindowsApplication = QNativeInterface::Private::QWindowsApplication; using TouchWindowTouchType = QWindowsApplication::TouchWindowTouchType; using TouchWindowTouchTypes = QWindowsApplication::QWindowsApplication::TouchWindowTouchTypes; diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp index e9e1d91e37..2a78f9d0f0 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/main.cpp @@ -118,7 +118,7 @@ int main(int argc, char **argv) MainWindow *mainWindow = new MainWindow; mainWindow->setGeometry(screen->geometry()); mainWindow->winId(); - using namespace QPlatformInterface::Private; + using namespace QNativeInterface::Private; if (auto *windowsWindow = dynamic_cast<QWindowsWindow *>(mainWindow->windowHandle()->handle())) windowsWindow->setHasBorderInFullScreen(true); mainWindow->showMaximized(); |