From 72153bf6ef8630e739fcbf164b7a66e3c8480a97 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 18 Apr 2025 22:58:34 +0200 Subject: [PATCH] Windows11/VistaStyle: use delegating ctor Use delegating ctor for QWindows11Style and QWindowsVistaStyle to avoid code duplication. Change-Id: Ia5048d989a1d6556b64a3ffc95da5d05624cd634 Reviewed-by: Volker Hilsheimer (cherry picked from commit e19607611c996505c859b264122b8d44d8298b9c) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/styles/modernwindows/qwindows11style.cpp | 4 +--- src/plugins/styles/modernwindows/qwindowsvistastyle.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp index f4f559779f4..039c52a9c98 100644 --- a/src/plugins/styles/modernwindows/qwindows11style.cpp +++ b/src/plugins/styles/modernwindows/qwindows11style.cpp @@ -148,10 +148,8 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut /*! Constructs a QWindows11Style object. */ -QWindows11Style::QWindows11Style() : QWindowsVistaStyle(*new QWindows11StylePrivate) +QWindows11Style::QWindows11Style() : QWindows11Style(*new QWindows11StylePrivate) { - highContrastTheme = QGuiApplicationPrivate::styleHints->colorScheme() == Qt::ColorScheme::Unknown; - colorSchemeIndex = QGuiApplicationPrivate::styleHints->colorScheme() == Qt::ColorScheme::Light ? 0 : 1; } /*! diff --git a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp index 2ba3b196565..2737b1f8a94 100644 --- a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp +++ b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp @@ -1276,7 +1276,7 @@ static inline bool supportsStateTransition(QStyle::PrimitiveElement element, /*! Constructs a QWindowsVistaStyle object. */ -QWindowsVistaStyle::QWindowsVistaStyle() : QWindowsStyle(*new QWindowsVistaStylePrivate) +QWindowsVistaStyle::QWindowsVistaStyle() : QWindowsVistaStyle(*new QWindowsVistaStylePrivate) { }