diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-16 21:40:50 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-16 20:15:56 +0000 |
commit | cd1fa3b72cf2a170216dbec55e580414dadb68d5 (patch) | |
tree | 9f67c79f927b6f4776b3d033b4c38cdb789574b6 | |
parent | e39e6253d1f7f94e421e8e665d2e9c18f64137a6 (diff) |
QQuickUniversalStyle: rename getColor() to systemColor()
Change-Id: I6b4799e929d032a3ddb5430acdbf6d816698d47a
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r-- | src/imports/controls/universal/qquickuniversalstyle.cpp | 50 | ||||
-rw-r--r-- | src/imports/controls/universal/qquickuniversalstyle_p.h | 2 |
2 files changed, 26 insertions, 26 deletions
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp index 4997adb5..53b473a4 100644 --- a/src/imports/controls/universal/qquickuniversalstyle.cpp +++ b/src/imports/controls/universal/qquickuniversalstyle.cpp @@ -264,125 +264,125 @@ void QQuickUniversalStyle::resetAccent() QColor QQuickUniversalStyle::altHighColor() const { - return getColor(AltHigh); + return systemColor(AltHigh); } QColor QQuickUniversalStyle::altLowColor() const { - return getColor(AltLow); + return systemColor(AltLow); } QColor QQuickUniversalStyle::altMediumColor() const { - return getColor(AltMedium); + return systemColor(AltMedium); } QColor QQuickUniversalStyle::altMediumHighColor() const { - return getColor(AltMediumHigh); + return systemColor(AltMediumHigh); } QColor QQuickUniversalStyle::altMediumLowColor() const { - return getColor(AltMediumLow); + return systemColor(AltMediumLow); } QColor QQuickUniversalStyle::baseHighColor() const { - return getColor(BaseHigh); + return systemColor(BaseHigh); } QColor QQuickUniversalStyle::baseLowColor() const { - return getColor(BaseLow); + return systemColor(BaseLow); } QColor QQuickUniversalStyle::baseMediumColor() const { - return getColor(BaseMedium); + return systemColor(BaseMedium); } QColor QQuickUniversalStyle::baseMediumHighColor() const { - return getColor(BaseMediumHigh); + return systemColor(BaseMediumHigh); } QColor QQuickUniversalStyle::baseMediumLowColor() const { - return getColor(BaseMediumLow); + return systemColor(BaseMediumLow); } QColor QQuickUniversalStyle::chromeAltLowColor() const { - return getColor(ChromeAltLow); + return systemColor(ChromeAltLow); } QColor QQuickUniversalStyle::chromeBlackHighColor() const { - return getColor(ChromeBlackHigh); + return systemColor(ChromeBlackHigh); } QColor QQuickUniversalStyle::chromeBlackLowColor() const { - return getColor(ChromeBlackLow); + return systemColor(ChromeBlackLow); } QColor QQuickUniversalStyle::chromeBlackMediumLowColor() const { - return getColor(ChromeBlackMediumLow); + return systemColor(ChromeBlackMediumLow); } QColor QQuickUniversalStyle::chromeBlackMediumColor() const { - return getColor(ChromeBlackMedium); + return systemColor(ChromeBlackMedium); } QColor QQuickUniversalStyle::chromeDisabledHighColor() const { - return getColor(ChromeDisabledHigh); + return systemColor(ChromeDisabledHigh); } QColor QQuickUniversalStyle::chromeDisabledLowColor() const { - return getColor(ChromeDisabledLow); + return systemColor(ChromeDisabledLow); } QColor QQuickUniversalStyle::chromeHighColor() const { - return getColor(ChromeHigh); + return systemColor(ChromeHigh); } QColor QQuickUniversalStyle::chromeLowColor() const { - return getColor(ChromeLow); + return systemColor(ChromeLow); } QColor QQuickUniversalStyle::chromeMediumColor() const { - return getColor(ChromeMedium); + return systemColor(ChromeMedium); } QColor QQuickUniversalStyle::chromeMediumLowColor() const { - return getColor(ChromeMediumLow); + return systemColor(ChromeMediumLow); } QColor QQuickUniversalStyle::chromeWhiteColor() const { - return getColor(ChromeWhite); + return systemColor(ChromeWhite); } QColor QQuickUniversalStyle::listLowColor() const { - return getColor(ListLow); + return systemColor(ListLow); } QColor QQuickUniversalStyle::listMediumColor() const { - return getColor(ListMedium); + return systemColor(ListMedium); } -QColor QQuickUniversalStyle::getColor(SystemColor role) const +QColor QQuickUniversalStyle::systemColor(SystemColor role) const { return QColor::fromRgba(m_theme == QQuickUniversalStyle::Dark ? qquickuniversal_dark_color(role) : qquickuniversal_light_color(role)); } diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h index aafdc4eb..8cca44d5 100644 --- a/src/imports/controls/universal/qquickuniversalstyle_p.h +++ b/src/imports/controls/universal/qquickuniversalstyle_p.h @@ -182,7 +182,7 @@ public: ListMedium }; - QColor getColor(SystemColor role) const; + QColor systemColor(SystemColor role) const; Q_SIGNALS: void themeChanged(); |