diff options
Diffstat (limited to 'src/plugins/platforms/windows')
8 files changed, 19 insertions, 19 deletions
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) {} |