diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-23 19:59:35 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-25 22:59:51 +0000 |
commit | 4024fab4cbfe5576429c20d1910306d392accf2b (patch) | |
tree | f18b387f0182681e4f002a183cf926d3dd0ab5ec /src/imports | |
parent | 929df0fa5039dce6430ca695d95c5094844aa647 (diff) |
Remove unused Material::primary
Change-Id: Ied4c732ed9147f6f8f03b7165057e74a17274b7f
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 48 | ||||
-rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 14 |
2 files changed, 0 insertions, 62 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 83a52829..67519008 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -383,7 +383,6 @@ static const QRgb colors[][14] = { }; static QQuickMaterialStyle::Theme defaultTheme = QQuickMaterialStyle::Light; -static QQuickMaterialStyle::Color defaultPrimary = QQuickMaterialStyle::BlueGrey; static QQuickMaterialStyle::Color defaultAccent = QQuickMaterialStyle::Teal; static const QRgb backgroundColorLight = 0xFFFAFAFA; static const QRgb backgroundColorDark = 0xFF303030; @@ -418,10 +417,8 @@ static const QRgb checkBoxUncheckedRippleColorDark = 0x20FFFFFF; QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickStyle(parent), m_explicitTheme(false), - m_explicitPrimary(false), m_explicitAccent(false), m_theme(defaultTheme), - m_primary(defaultPrimary), m_accent(defaultAccent) { init(); @@ -476,49 +473,6 @@ void QQuickMaterialStyle::resetTheme() } } -QQuickMaterialStyle::Color QQuickMaterialStyle::primary() const -{ - return m_primary; -} - -void QQuickMaterialStyle::setPrimary(QQuickMaterialStyle::Color color) -{ - m_explicitPrimary = true; - if (m_primary != color) { - m_primary = color; - propagatePrimary(); - emit primaryChanged(); - emit paletteChanged(); - } -} - -void QQuickMaterialStyle::inheritPrimary(QQuickMaterialStyle::Color color) -{ - if (!m_explicitPrimary && m_primary != color) { - m_primary = color; - propagatePrimary(); - emit primaryChanged(); - } -} - -void QQuickMaterialStyle::propagatePrimary() -{ - foreach (QQuickStyle *child, childStyles()) { - QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child); - if (material) - material->inheritPrimary(m_primary); - } -} - -void QQuickMaterialStyle::resetPrimary() -{ - if (m_explicitPrimary) { - m_explicitPrimary = false; - QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle()); - inheritPrimary(material ? material->primary() : defaultPrimary); - } -} - QQuickMaterialStyle::Color QQuickMaterialStyle::accent() const { return m_accent; @@ -753,7 +707,6 @@ void QQuickMaterialStyle::parentStyleChange(QQuickStyle *newParent, QQuickStyle Q_UNUSED(oldParent); QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(newParent); if (material) { - inheritPrimary(material->primary()); inheritAccent(material->accent()); inheritTheme(material->theme()); } @@ -781,7 +734,6 @@ void QQuickMaterialStyle::init() if (!settings.isNull()) { defaultTheme = m_theme = readEnumValue<Theme>(settings.data(), QStringLiteral("Theme"), m_theme); defaultAccent = m_accent = readEnumValue<Color>(settings.data(), QStringLiteral("Accent"), m_accent); - defaultPrimary = m_primary = readEnumValue<Color>(settings.data(), QStringLiteral("Primary"), m_primary); } defaultsInitialized = true; } diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index de751473..87255383 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -59,7 +59,6 @@ class QQuickMaterialStyle : public QQuickStyle { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL) - Q_PROPERTY(Color primary READ primary WRITE setPrimary RESET resetPrimary NOTIFY primaryChanged FINAL) Q_PROPERTY(Color accent READ accent WRITE setAccent RESET resetAccent NOTIFY accentChanged FINAL) Q_PROPERTY(QColor accentColor READ accentColor NOTIFY accentChanged FINAL) Q_PROPERTY(QColor backgroundColor READ backgroundColor NOTIFY paletteChanged FINAL) @@ -154,16 +153,6 @@ public: void propagateTheme(); void resetTheme(); - QColor primaryColorLight() const; - - Color primary() const; - void setPrimary(Color color); - void inheritPrimary(Color color); - void propagatePrimary(); - void resetPrimary(); - - QColor primaryColorDark() const; - Color accent() const; void setAccent(Color color); void inheritAccent(Color color); @@ -208,7 +197,6 @@ public: Q_SIGNALS: void themeChanged(); - void primaryChanged(); void accentChanged(); void paletteChanged(); @@ -219,10 +207,8 @@ private: void init(); bool m_explicitTheme; - bool m_explicitPrimary; bool m_explicitAccent; Theme m_theme; - Color m_primary; Color m_accent; }; |