diff options
Diffstat (limited to 'src/plugins/platforms')
26 files changed, 41 insertions, 41 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformintegration.h b/src/plugins/platforms/android/qandroidplatformintegration.h index 012616839c..d579bc29ae 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.h +++ b/src/plugins/platforms/android/qandroidplatformintegration.h @@ -72,8 +72,8 @@ protected: }; class QAndroidPlatformIntegration : public QPlatformIntegration - , QPlatformInterface::Private::QEGLIntegration - , QPlatformInterface::Private::QAndroidOffScreenIntegration + , QNativeInterface::Private::QEGLIntegration + , QNativeInterface::Private::QAndroidOffScreenIntegration { friend class QAndroidPlatformScreen; diff --git a/src/plugins/platforms/android/qandroidplatformoffscreensurface.h b/src/plugins/platforms/android/qandroidplatformoffscreensurface.h index 3eef727596..e57ab2afad 100644 --- a/src/plugins/platforms/android/qandroidplatformoffscreensurface.h +++ b/src/plugins/platforms/android/qandroidplatformoffscreensurface.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QOffscreenSurface; class QAndroidPlatformOffscreenSurface : public QPlatformOffscreenSurface, - public QPlatformInterface::QAndroidOffscreenSurface + public QNativeInterface::QAndroidOffscreenSurface { public: QAndroidPlatformOffscreenSurface(ANativeWindow *nativeSurface, EGLDisplay display, QOffscreenSurface *offscreenSurface); diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h index ab8e9d3012..633b9256c8 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.h +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QCocoaWindow; -class QCocoaGLContext : public QPlatformOpenGLContext, public QPlatformInterface::QCocoaGLContext +class QCocoaGLContext : public QPlatformOpenGLContext, public QNativeInterface::QCocoaGLContext { public: QCocoaGLContext(QOpenGLContext *context); diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 1e330344af..4f1969dd98 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QCocoaIntegration : public QObject, public QPlatformIntegration #ifndef QT_NO_OPENGL - , public QPlatformInterface::Private::QCocoaGLIntegration + , public QNativeInterface::Private::QCocoaGLIntegration #endif { Q_OBJECT diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h index 6bd033bfeb..1bf9cface0 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.h +++ b/src/plugins/platforms/cocoa/qcocoamenu.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QCocoaMenuBar; class QCocoaMenu : public QPlatformMenu, public QCocoaMenuObject - , public QPlatformInterface::Private::QCocoaMenu + , public QNativeInterface::Private::QCocoaMenu { public: QCocoaMenu(); diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.h b/src/plugins/platforms/cocoa/qcocoamenubar.h index 94333e3bb1..7186e48829 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.h +++ b/src/plugins/platforms/cocoa/qcocoamenubar.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QCocoaWindow; class QCocoaMenuBar : public QPlatformMenuBar - , public QPlatformInterface::Private::QCocoaMenuBar + , public QNativeInterface::Private::QCocoaMenuBar { Q_OBJECT public: diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index d7c4a66514..9a2fa5f025 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -100,7 +100,7 @@ class QDebug; class QCocoaMenuBar; class QCocoaWindow : public QObject, public QPlatformWindow, - public QPlatformInterface::Private::QCocoaWindow + public QNativeInterface::Private::QCocoaWindow { Q_OBJECT public: diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h index 9bc24f36f9..5ba24b107a 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h @@ -70,10 +70,10 @@ class QEvdevKeyboardManager; class Q_EGLFS_EXPORT QEglFSIntegration : public QPlatformIntegration, public QPlatformNativeInterface #if QT_CONFIG(evdev) - , public QPlatformInterface::Private::QEvdevKeyMapper + , public QNativeInterface::Private::QEvdevKeyMapper #endif #ifndef QT_NO_OPENGL - , public QPlatformInterface::Private::QEGLIntegration + , public QNativeInterface::Private::QEGLIntegration #endif { public: diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h index 369d175bcf..b3dfa77e1b 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QEglFSKmsVsp2Screen : public QEglFSKmsScreen - , public QPlatformInterface::Private::QVsp2Screen + , public QNativeInterface::Private::QVsp2Screen { public: QEglFSKmsVsp2Screen(QEglFSKmsDevice *device, const QKmsOutput &output); diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 1e671ee7fc..3481abb47d 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -53,7 +53,7 @@ class QEvdevKeyboardManager; class QLinuxFbIntegration : public QPlatformIntegration, public QPlatformNativeInterface #if QT_CONFIG(evdev) - , public QPlatformInterface::Private::QEvdevKeyMapper + , public QNativeInterface::Private::QEvdevKeyMapper #endif { public: diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h index 005ac26151..01a75510fb 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h +++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h @@ -90,7 +90,7 @@ private: class QOffscreenX11GLXContextData; class QOffscreenX11GLXContext : public QPlatformOpenGLContext - , public QPlatformInterface::QGLXContext + , public QNativeInterface::QGLXContext { public: QOffscreenX11GLXContext(QOffscreenX11Info *x11, QOpenGLContext *context); diff --git a/src/plugins/platforms/windows/qwindowsapplication.cpp b/src/plugins/platforms/windows/qwindowsapplication.cpp index fc495d999f..9997e0a903 100644 --- a/src/plugins/platforms/windows/qwindowsapplication.cpp +++ b/src/plugins/platforms/windows/qwindowsapplication.cpp @@ -112,13 +112,13 @@ void QWindowsApplication::setDarkModeHandling(QWindowsApplication::DarkModeHandl m_darkModeHandling = handling; } -void QWindowsApplication::registerMime(QPlatformInterface::Private::QWindowsMime *mime) +void QWindowsApplication::registerMime(QNativeInterface::Private::QWindowsMime *mime) { if (auto ctx = QWindowsContext::instance()) ctx->mimeConverter().registerMime(mime); } -void QWindowsApplication::unregisterMime(QPlatformInterface::Private::QWindowsMime *mime) +void QWindowsApplication::unregisterMime(QNativeInterface::Private::QWindowsMime *mime) { if (auto ctx = QWindowsContext::instance()) ctx->mimeConverter().unregisterMime(mime); diff --git a/src/plugins/platforms/windows/qwindowsapplication.h b/src/plugins/platforms/windows/qwindowsapplication.h index 25a0cc7437..d57ce263c9 100644 --- a/src/plugins/platforms/windows/qwindowsapplication.h +++ b/src/plugins/platforms/windows/qwindowsapplication.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -class QWindowsApplication : public QPlatformInterface::Private::QWindowsApplication +class QWindowsApplication : public QNativeInterface::Private::QWindowsApplication { public: void setTouchWindowTouchType(TouchWindowTouchTypes type) override; @@ -62,8 +62,8 @@ public: DarkModeHandling darkModeHandling() const override; void setDarkModeHandling(DarkModeHandling handling) override; - void registerMime(QPlatformInterface::Private::QWindowsMime *mime) override; - void unregisterMime(QPlatformInterface::Private::QWindowsMime *mime) override; + void registerMime(QNativeInterface::Private::QWindowsMime *mime) override; + void unregisterMime(QNativeInterface::Private::QWindowsMime *mime) override; int registerMimeType(const QString &mime) override; diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index 2970f3d333..0e8383e5c0 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -200,7 +200,7 @@ public: static QWindowsOpengl32DLL opengl32; }; -class QWindowsGLContext : public QWindowsOpenGLContext, public QPlatformInterface::QWGLContext +class QWindowsGLContext : public QWindowsOpenGLContext, public QNativeInterface::QWGLContext { public: explicit QWindowsGLContext(QOpenGLStaticContext *staticContext, QOpenGLContext *context); diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 6ec5f6e37f..74e6985980 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -183,8 +183,8 @@ bool parseIntOption(const QString ¶meter,const QLatin1String &option, return true; } -using DarkModeHandlingFlag = QPlatformInterface::Private::QWindowsApplication::DarkModeHandlingFlag; -using DarkModeHandling = QPlatformInterface::Private::QWindowsApplication::DarkModeHandling; +using DarkModeHandlingFlag = QNativeInterface::Private::QWindowsApplication::DarkModeHandlingFlag; +using DarkModeHandling = QNativeInterface::Private::QWindowsApplication::DarkModeHandling; static inline unsigned parseOptions(const QStringList ¶mList, int *tabletAbsoluteRange, diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index e0af1e6512..b5449b4a45 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -58,7 +58,7 @@ class QWindowsStaticOpenGLContext; class QWindowsIntegration : public QPlatformIntegration #ifndef QT_NO_OPENGL - , public QPlatformInterface::Private::QWindowsGLIntegration + , public QNativeInterface::Private::QWindowsGLIntegration #endif , public QWindowsApplication { diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp index 9c43045d6a..49bbe88d34 100644 --- a/src/plugins/platforms/windows/qwindowsmime.cpp +++ b/src/plugins/platforms/windows/qwindowsmime.cpp @@ -544,7 +544,7 @@ QDebug operator<<(QDebug d, IDataObject *dataObj) All subclasses must reimplement this pure virtual function. */ -class QWindowsMimeText : public QPlatformInterface::Private::QWindowsMime +class QWindowsMimeText : public QNativeInterface::Private::QWindowsMime { public: bool canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const override; @@ -700,7 +700,7 @@ QVariant QWindowsMimeText::convertToMime(const QString &mime, LPDATAOBJECT pData return ret; } -class QWindowsMimeURI : public QPlatformInterface::Private::QWindowsMime +class QWindowsMimeURI : public QNativeInterface::Private::QWindowsMime { public: QWindowsMimeURI(); @@ -866,7 +866,7 @@ QVariant QWindowsMimeURI::convertToMime(const QString &mimeType, LPDATAOBJECT pD return QVariant(); } -class QWindowsMimeHtml : public QPlatformInterface::Private::QWindowsMime +class QWindowsMimeHtml : public QNativeInterface::Private::QWindowsMime { public: QWindowsMimeHtml(); @@ -1004,7 +1004,7 @@ bool QWindowsMimeHtml::convertFromMime(const FORMATETC &formatetc, const QMimeDa #ifndef QT_NO_IMAGEFORMAT_BMP -class QWindowsMimeImage : public QPlatformInterface::Private::QWindowsMime +class QWindowsMimeImage : public QNativeInterface::Private::QWindowsMime { public: QWindowsMimeImage(); @@ -1158,7 +1158,7 @@ QVariant QWindowsMimeImage::convertToMime(const QString &mimeType, IDataObject * } #endif -class QBuiltInMimes : public QPlatformInterface::Private::QWindowsMime +class QBuiltInMimes : public QNativeInterface::Private::QWindowsMime { public: QBuiltInMimes(); @@ -1279,7 +1279,7 @@ QString QBuiltInMimes::mimeForFormat(const FORMATETC &formatetc) const } -class QLastResortMimes : public QPlatformInterface::Private::QWindowsMime +class QLastResortMimes : public QNativeInterface::Private::QWindowsMime { public: diff --git a/src/plugins/platforms/windows/qwindowsmime.h b/src/plugins/platforms/windows/qwindowsmime.h index 891ec44ecd..e131dba848 100644 --- a/src/plugins/platforms/windows/qwindowsmime.h +++ b/src/plugins/platforms/windows/qwindowsmime.h @@ -56,7 +56,7 @@ class QWindowsMimeConverter { Q_DISABLE_COPY_MOVE(QWindowsMimeConverter) public: - using QWindowsMime = QPlatformInterface::Private::QWindowsMime; + using QWindowsMime = QNativeInterface::Private::QWindowsMime; QWindowsMimeConverter(); ~QWindowsMimeConverter(); diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 827e4cc288..1f1af82da2 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -125,12 +125,12 @@ struct QWindowsWindowData }; class QWindowsBaseWindow : public QPlatformWindow, - public QPlatformInterface::Private::QWindowsWindow + public QNativeInterface::Private::QWindowsWindow { Q_DISABLE_COPY_MOVE(QWindowsBaseWindow) public: - using TouchWindowTouchType = QPlatformInterface::Private::QWindowsApplication::TouchWindowTouchType; - using TouchWindowTouchTypes = QPlatformInterface::Private::QWindowsApplication::TouchWindowTouchTypes; + using TouchWindowTouchType = QNativeInterface::Private::QWindowsApplication::TouchWindowTouchType; + using TouchWindowTouchTypes = QNativeInterface::Private::QWindowsApplication::TouchWindowTouchTypes; explicit QWindowsBaseWindow(QWindow *window) : QPlatformWindow(window) {} diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h index ddb4488105..be5c75aedc 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QXcbEglNativeInterfaceHandler; class QXcbEglIntegration : public QXcbGlIntegration - , public QPlatformInterface::Private::QEGLIntegration + , public QNativeInterface::Private::QEGLIntegration { public: QXcbEglIntegration(); diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h index a7468c8fac..62a9247fd9 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QGLXContext : public QPlatformOpenGLContext, - public QPlatformInterface::QGLXContext + public QNativeInterface::QGLXContext { public: QGLXContext(Display *display, QXcbScreen *screen, const QSurfaceFormat &format, QPlatformOpenGLContext *share); diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h index 18c1be9489..6b0c6dfee2 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QXcbNativeInterfaceHandler; class QXcbGlxIntegration : public QXcbGlIntegration, - public QPlatformInterface::Private::QGLXIntegration + public QNativeInterface::Private::QGLXIntegration { public: QXcbGlxIntegration(); diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 5dd6fbe57a..89395cb21d 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -276,7 +276,7 @@ QPlatformOpenGLContext *QXcbIntegration::createPlatformOpenGLContext(QOpenGLCont QOpenGLContext *QXcbIntegration::createOpenGLContext(GLXContext context, void *visualInfo, QOpenGLContext *shareContext) const { - using namespace QPlatformInterface::Private; + using namespace QNativeInterface::Private; if (auto *glxIntegration = dynamic_cast<QGLXIntegration*>(m_connection->glIntegration())) return glxIntegration->createOpenGLContext(context, visualInfo, shareContext); else @@ -286,7 +286,7 @@ QOpenGLContext *QXcbIntegration::createOpenGLContext(GLXContext context, void *v #if QT_CONFIG(egl) QOpenGLContext *QXcbIntegration::createOpenGLContext(EGLContext context, EGLDisplay display, QOpenGLContext *shareContext) const { - using namespace QPlatformInterface::Private; + using namespace QNativeInterface::Private; if (auto *eglIntegration = dynamic_cast<QEGLIntegration*>(m_connection->glIntegration())) return eglIntegration->createOpenGLContext(context, display, shareContext); else diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 043dc13711..eb58433967 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -57,9 +57,9 @@ class QXcbNativeInterface; class Q_XCB_EXPORT QXcbIntegration : public QPlatformIntegration #ifndef QT_NO_OPENGL - , public QPlatformInterface::Private::QGLXIntegration + , public QNativeInterface::Private::QGLXIntegration # if QT_CONFIG(egl) - , public QPlatformInterface::Private::QEGLIntegration + , public QNativeInterface::Private::QEGLIntegration # endif #endif { diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index 9be3ce9e7f..267c8b8911 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -139,7 +139,7 @@ private: }; class Q_XCB_EXPORT QXcbScreen : public QXcbObject, public QPlatformScreen - , public QPlatformInterface::Private::QXcbScreen + , public QNativeInterface::Private::QXcbScreen { public: QXcbScreen(QXcbConnection *connection, QXcbVirtualDesktop *virtualDesktop, diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index c05e658652..5e5aa96629 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -57,7 +57,7 @@ class QXcbSyncWindowRequest; class QIcon; class Q_XCB_EXPORT QXcbWindow : public QXcbObject, public QXcbWindowEventListener, public QPlatformWindow - , public QPlatformInterface::Private::QXcbWindow + , public QNativeInterface::Private::QXcbWindow { public: enum NetWmState { |