From 4973155512969300c848a3aae8dbb21f07e50c45 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Tue, 20 Sep 2022 14:06:40 +0200 Subject: Replace QPlatformTheme::Appearance by Qt:Appearance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the introduction of Qt:Appearance, its predecessor in QPlatformTheme has become redundant. This patch replaces all occurrences of QPlatformTheme::Appearance with the new enum class. Task-number: QTBUG-106381 Change-Id: I5406f1b7c19f68571f074617c681318c96a6517e Reviewed-by: Volker Hilsheimer Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/android/androidjnimain.cpp | 2 +- .../platforms/android/qandroidplatformintegration.cpp | 4 ++-- .../platforms/android/qandroidplatformintegration.h | 6 +++--- src/plugins/platforms/android/qandroidplatformtheme.cpp | 2 +- src/plugins/platforms/android/qandroidplatformtheme.h | 2 +- src/plugins/platforms/cocoa/qcocoatheme.h | 2 +- src/plugins/platforms/cocoa/qcocoatheme.mm | 4 ++-- src/plugins/platforms/ios/qiostheme.h | 2 +- src/plugins/platforms/ios/qiostheme.mm | 8 ++++---- src/plugins/platforms/windows/qwindowstheme.cpp | 4 ++-- src/plugins/platforms/windows/qwindowstheme.h | 2 +- src/plugins/platformthemes/gtk3/qgtk3theme.cpp | 10 +++++----- src/plugins/platformthemes/gtk3/qgtk3theme.h | 2 +- .../xdgdesktopportal/qxdgdesktopportaltheme.cpp | 14 +++++++------- .../xdgdesktopportal/qxdgdesktopportaltheme.h | 2 +- src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 10c0e844de..9ce899d4a3 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -758,7 +758,7 @@ static void handleRefreshRateChanged(JNIEnv */*env*/, jclass /*cls*/, jfloat ref static void handleUiDarkModeChanged(JNIEnv */*env*/, jobject /*thiz*/, jint newUiMode) { QAndroidPlatformIntegration::setAppearance( - (newUiMode == 1 ) ? QPlatformTheme::Appearance::Dark : QPlatformTheme::Appearance::Light); + (newUiMode == 1 ) ? Qt::Appearance::Dark : Qt::Appearance::Light); } static void onActivityResult(JNIEnv */*env*/, jclass /*cls*/, diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 335d0ba11e..890f978768 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -488,9 +488,9 @@ void QAndroidPlatformIntegration::setScreenSize(int width, int height) QMetaObject::invokeMethod(m_primaryScreen, "setSize", Qt::AutoConnection, Q_ARG(QSize, QSize(width, height))); } -QPlatformTheme::Appearance QAndroidPlatformIntegration::m_appearance = QPlatformTheme::Appearance::Light; +Qt::Appearance QAndroidPlatformIntegration::m_appearance = Qt::Appearance::Light; -void QAndroidPlatformIntegration::setAppearance(QPlatformTheme::Appearance newAppearance) +void QAndroidPlatformIntegration::setAppearance(Qt::Appearance newAppearance) { if (m_appearance == newAppearance) return; diff --git a/src/plugins/platforms/android/qandroidplatformintegration.h b/src/plugins/platforms/android/qandroidplatformintegration.h index 1b26710d73..4685ba32d4 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.h +++ b/src/plugins/platforms/android/qandroidplatformintegration.h @@ -104,8 +104,8 @@ public: void flushPendingUpdates(); - static void setAppearance(QPlatformTheme::Appearance newAppearance); - static QPlatformTheme::Appearance appearance() { return m_appearance; } + static void setAppearance(Qt::Appearance newAppearance); + static Qt::Appearance appearance() { return m_appearance; } #if QT_CONFIG(vulkan) QPlatformVulkanInstance *createPlatformVulkanInstance(QVulkanInstance *instance) const override; #endif @@ -118,7 +118,7 @@ private: QThread *m_mainThread; - static QPlatformTheme::Appearance m_appearance; + static Qt::Appearance m_appearance; static QRect m_defaultAvailableGeometry; static QSize m_defaultPhysicalSize; diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp index 73cff62e81..6f950dc4fb 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp @@ -358,7 +358,7 @@ void QAndroidPlatformTheme::showPlatformMenuBar() QtAndroidMenu::openOptionsMenu(); } -QPlatformTheme::Appearance QAndroidPlatformTheme::appearance() const +Qt::Appearance QAndroidPlatformTheme::appearance() const { return QAndroidPlatformIntegration::appearance(); } diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h index e495e6d5cc..0fc3c152c5 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.h +++ b/src/plugins/platforms/android/qandroidplatformtheme.h @@ -35,7 +35,7 @@ public: QPlatformMenu *createPlatformMenu() const override; QPlatformMenuItem *createPlatformMenuItem() const override; void showPlatformMenuBar() override; - Appearance appearance() const override; + Qt::Appearance appearance() const override; const QPalette *palette(Palette type = SystemPalette) const override; const QFont *font(Font type = SystemFont) const override; QVariant themeHint(ThemeHint hint) const override; diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h index db8ade1fe7..d19e20e7c2 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.h +++ b/src/plugins/platforms/cocoa/qcocoatheme.h @@ -37,7 +37,7 @@ public: QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions options = {}) const override; QVariant themeHint(ThemeHint hint) const override; - Appearance appearance() const override; + Qt::Appearance appearance() const override; QString standardButtonText(int button) const override; QKeySequence standardButtonShortcut(int button) const override; diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index eb0621d386..a6c33c6e30 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -459,9 +459,9 @@ QVariant QCocoaTheme::themeHint(ThemeHint hint) const return QPlatformTheme::themeHint(hint); } -QPlatformTheme::Appearance QCocoaTheme::appearance() const +Qt::Appearance QCocoaTheme::appearance() const { - return qt_mac_applicationIsInDarkMode() ? Appearance::Dark : Appearance::Light; + return qt_mac_applicationIsInDarkMode() ? Qt::Appearance::Dark : Qt::Appearance::Light; } QString QCocoaTheme::standardButtonText(int button) const diff --git a/src/plugins/platforms/ios/qiostheme.h b/src/plugins/platforms/ios/qiostheme.h index ea5169800b..5d551663d0 100644 --- a/src/plugins/platforms/ios/qiostheme.h +++ b/src/plugins/platforms/ios/qiostheme.h @@ -21,7 +21,7 @@ public: const QPalette *palette(Palette type = SystemPalette) const override; QVariant themeHint(ThemeHint hint) const override; - Appearance appearance() const override; + Qt::Appearance appearance() const override; QPlatformMenuItem* createPlatformMenuItem() const override; QPlatformMenu* createPlatformMenu() const override; diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm index 02143bd7a2..51d88710bd 100644 --- a/src/plugins/platforms/ios/qiostheme.mm +++ b/src/plugins/platforms/ios/qiostheme.mm @@ -132,15 +132,15 @@ QVariant QIOSTheme::themeHint(ThemeHint hint) const } } -QPlatformTheme::Appearance QIOSTheme::appearance() const +Qt::Appearance QIOSTheme::appearance() const { if (UIWindow *window = qt_apple_sharedApplication().windows.lastObject) { return window.rootViewController.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark - ? QPlatformTheme::Appearance::Dark - : QPlatformTheme::Appearance::Light; + ? Qt::Appearance::Dark + : Qt::Appearance::Light; } - return QPlatformTheme::Appearance::Unknown; + return Qt::Appearance::Unknown; } const QFont *QIOSTheme::font(Font type) const diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 87861956a0..3704fce15e 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -564,9 +564,9 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const return QPlatformTheme::themeHint(hint); } -QPlatformTheme::Appearance QWindowsTheme::appearance() const +Qt::Appearance QWindowsTheme::appearance() const { - return QWindowsContext::isDarkMode() ? Appearance::Dark : Appearance::Light; + return QWindowsContext::isDarkMode() ? Qt::Appearance::Dark : Qt::Appearance::Light; } void QWindowsTheme::clearPalettes() diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h index 85a7607d7f..661519b312 100644 --- a/src/plugins/platforms/windows/qwindowstheme.h +++ b/src/plugins/platforms/windows/qwindowstheme.h @@ -31,7 +31,7 @@ public: #endif QVariant themeHint(ThemeHint) const override; - Appearance appearance() const override; + Qt::Appearance appearance() const override; const QPalette *palette(Palette type = SystemPalette) const override { return m_palettes[type]; } diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp index ab607a0c6d..c2bc49af47 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp +++ b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp @@ -149,7 +149,7 @@ QString QGtk3Theme::gtkFontName() const return QGnomeTheme::gtkFontName(); } -QPlatformTheme::Appearance QGtk3Theme::appearance() const +Qt::Appearance QGtk3Theme::appearance() const { /* https://docs.gtk.org/gtk3/running.html @@ -167,7 +167,7 @@ QPlatformTheme::Appearance QGtk3Theme::appearance() const QString themeName = qEnvironmentVariable("GTK_THEME"); const QRegularExpression darkRegex(QStringLiteral("[:-]dark"), QRegularExpression::CaseInsensitiveOption); if (!themeName.isEmpty()) - return darkRegex.match(themeName).hasMatch() ? Appearance::Dark : Appearance::Light; + return darkRegex.match(themeName).hasMatch() ? Qt::Appearance::Dark : Qt::Appearance::Light; /* https://docs.gtk.org/gtk3/property.Settings.gtk-application-prefer-dark-theme.html @@ -178,16 +178,16 @@ QPlatformTheme::Appearance QGtk3Theme::appearance() const */ const auto preferDark = gtkSetting("gtk-application-prefer-dark-theme"); if (preferDark) - return Appearance::Dark; + return Qt::Appearance::Dark; /* https://docs.gtk.org/gtk3/property.Settings.gtk-theme-name.html */ themeName = gtkSetting("gtk-theme-name"); if (!themeName.isEmpty()) - return darkRegex.match(themeName).hasMatch() ? Appearance::Dark : Appearance::Light; + return darkRegex.match(themeName).hasMatch() ? Qt::Appearance::Dark : Qt::Appearance::Light; - return Appearance::Unknown; + return Qt::Appearance::Unknown; } bool QGtk3Theme::usePlatformNativeDialog(DialogType type) const diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.h b/src/plugins/platformthemes/gtk3/qgtk3theme.h index 8c7a1da7cc..ca78f9c709 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3theme.h +++ b/src/plugins/platformthemes/gtk3/qgtk3theme.h @@ -17,7 +17,7 @@ public: virtual QVariant themeHint(ThemeHint hint) const override; virtual QString gtkFontName() const override; - Appearance appearance() const override; + Qt::Appearance appearance() const override; bool usePlatformNativeDialog(DialogType type) const override; QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override; diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp index e6a72e4289..a25a630ffc 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp @@ -40,7 +40,7 @@ public: /*! \internal - Converts the given Freedesktop color scheme setting \a colorschemePref to a QPlatformTheme::Appearance value. + Converts the given Freedesktop color scheme setting \a colorschemePref to a Qt::Appearance value. Specification: https://github.com/flatpak/xdg-desktop-portal/blob/d7a304a00697d7d608821253cd013f3b97ac0fb6/data/org.freedesktop.impl.portal.Settings.xml#L33-L45 Unfortunately the enum numerical values are not defined identically, so we have to convert them. @@ -53,18 +53,18 @@ public: 1: Prefer dark appearance | 2: Dark 2: Prefer light appearance | 1: Light */ - static QPlatformTheme::Appearance appearanceFromXdgPref(const XdgColorschemePref colorschemePref) + static Qt::Appearance appearanceFromXdgPref(const XdgColorschemePref colorschemePref) { switch (colorschemePref) { - case PreferDark: return QPlatformTheme::Appearance::Dark; - case PreferLight: return QPlatformTheme::Appearance::Light; - default: return QPlatformTheme::Appearance::Unknown; + case PreferDark: return Qt::Appearance::Dark; + case PreferLight: return Qt::Appearance::Light; + default: return Qt::Appearance::Unknown; } } QPlatformTheme *baseTheme = nullptr; uint fileChooserPortalVersion = 0; - QPlatformTheme::Appearance appearance = QPlatformTheme::Appearance::Unknown; + Qt::Appearance appearance = Qt::Appearance::Unknown; }; QXdgDesktopPortalTheme::QXdgDesktopPortalTheme() @@ -205,7 +205,7 @@ QVariant QXdgDesktopPortalTheme::themeHint(ThemeHint hint) const return d->baseTheme->themeHint(hint); } -QPlatformTheme::Appearance QXdgDesktopPortalTheme::appearance() const +Qt::Appearance QXdgDesktopPortalTheme::appearance() const { Q_D(const QXdgDesktopPortalTheme); return d->appearance; diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h index 4390ab73d8..8e1cd37932 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.h @@ -34,7 +34,7 @@ public: QVariant themeHint(ThemeHint hint) const override; - Appearance appearance() const override; + Qt::Appearance appearance() const override; QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override; QIcon fileIcon(const QFileInfo &fileInfo, diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 3646e16c8a..01ff4db45f 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -160,7 +160,7 @@ const int pushButtonBevelRectOffsets[3] = { QVector > QMacStylePrivate::scrollBars; -bool isDarkMode() { return QGuiApplicationPrivate::platformTheme()->appearance() == QPlatformTheme::Appearance::Dark; } +bool isDarkMode() { return QGuiApplicationPrivate::platformTheme()->appearance() == Qt::Appearance::Dark; } // Title bar gradient colors for Lion were determined by inspecting PSDs exported // using CoreUI's CoreThemeDocument; there is no public API to retrieve them -- cgit v1.2.3