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/widgets | |
| 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/widgets')
| -rw-r--r-- | src/widgets/dialogs/qwizard_win.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenu_mac.mm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 9575dc7fba..692583666d 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -168,7 +168,7 @@ QVistaHelper::~QVistaHelper() void QVistaHelper::updateCustomMargins(bool vistaMargins) { - using namespace QPlatformInterface::Private; + using namespace QNativeInterface::Private; if (QWindow *window = wizard->windowHandle()) { // Reduce top frame to zero since we paint it ourselves. Use diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 8040560e7c..4bcc0f5df0 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -121,7 +121,7 @@ QT_BEGIN_NAMESPACE -using namespace QPlatformInterface::Private; +using namespace QNativeInterface::Private; Q_LOGGING_CATEGORY(lcWidgetPainting, "qt.widgets.painting", QtWarningMsg); diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index e3c2a54051..28a195bba8 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -133,7 +133,7 @@ bool QWindowsStylePrivate::isDarkMode() { bool result = false; #ifdef Q_OS_WIN - using QWindowsApplication = QPlatformInterface::Private::QWindowsApplication; + using QWindowsApplication = QNativeInterface::Private::QWindowsApplication; // Windows only: Return whether dark mode style support is desired and // dark mode is in effect. if (auto windowsApp = dynamic_cast<QWindowsApplication *>(QGuiApplicationPrivate::platformIntegration())) { diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index aa6706f0bb..8aa2c24592 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -1360,7 +1360,7 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool enabled) d->useUnifiedToolBar = enabled; createWinId(); - using namespace QPlatformInterface::Private; + using namespace QNativeInterface::Private; if (auto *platformWindow = dynamic_cast<QCocoaWindow*>(window()->windowHandle()->handle())) platformWindow->setContentBorderEnabled(enabled); diff --git a/src/widgets/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm index 7bff4f3341..d6e09d9512 100644 --- a/src/widgets/widgets/qmenu_mac.mm +++ b/src/widgets/widgets/qmenu_mac.mm @@ -56,7 +56,7 @@ QT_USE_NAMESPACE #include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformmenu_p.h> -using namespace QPlatformInterface::Private; +using namespace QNativeInterface::Private; QT_BEGIN_NAMESPACE |