From afe4433ae7af5491a19e85d69dce1caa93c33cca Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 22 May 2015 20:39:11 +0200 Subject: Theme: fix int->real Change-Id: I9833aee821e4c7d436e0c999dbeefe3e12b34875 Reviewed-by: J-P Nurmi --- src/imports/controls/qquicktheme.cpp | 30 +++++++++++++++--------------- src/imports/controls/qquicktheme_p.h | 18 +++++++++--------- src/imports/controls/qquickthemedata_p.h | 18 +++++++++--------- 3 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp index a816b077..4252bbbb 100644 --- a/src/imports/controls/qquicktheme.cpp +++ b/src/imports/controls/qquicktheme.cpp @@ -99,15 +99,15 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlattachedproperty int QtQuickControls2::Theme::padding + \qmlattachedproperty real QtQuickControls2::Theme::padding */ /*! - \qmlattachedproperty int QtQuickControls2::Theme::roundness + \qmlattachedproperty real QtQuickControls2::Theme::roundness */ /*! - \qmlattachedproperty int QtQuickControls2::Theme::spacing + \qmlattachedproperty real QtQuickControls2::Theme::spacing */ /*! @@ -244,9 +244,9 @@ public: void setSelectionColor(const QColor &color, Method method); void setShadowColor(const QColor &color, Method method); void setTextColor(const QColor &color, Method method); - void setPadding(int padding, Method method); - void setRoundness(int roundness, Method method); - void setSpacing(int spacing, Method method); + void setPadding(qreal padding, Method method); + void setRoundness(qreal roundness, Method method); + void setSpacing(qreal spacing, Method method); void setDisabledOpacity(qreal opacity, Method method); void inherit(QQuickTheme *theme); @@ -442,7 +442,7 @@ void QQuickThemePrivate::setTextColor(const QColor &color, Method method) } } -void QQuickThemePrivate::setPadding(int padding, Method method) +void QQuickThemePrivate::setPadding(qreal padding, Method method) { Q_Q(QQuickTheme); if (!explicitPadding || method != Inherit) { @@ -457,7 +457,7 @@ void QQuickThemePrivate::setPadding(int padding, Method method) } } -void QQuickThemePrivate::setRoundness(int roundness, Method method) +void QQuickThemePrivate::setRoundness(qreal roundness, Method method) { Q_Q(QQuickTheme); if (!explicitRoundness || method != Inherit) { @@ -472,7 +472,7 @@ void QQuickThemePrivate::setRoundness(int roundness, Method method) } } -void QQuickThemePrivate::setSpacing(int spacing, Method method) +void QQuickThemePrivate::setSpacing(qreal spacing, Method method) { Q_Q(QQuickTheme); if (!explicitSpacing || method != Inherit) { @@ -792,13 +792,13 @@ void QQuickTheme::resetTextColor() d->setTextColor(d->resolve().textColor(), QQuickThemePrivate::Implicit); } -int QQuickTheme::padding() const +qreal QQuickTheme::padding() const { Q_D(const QQuickTheme); return d->data.padding(); } -void QQuickTheme::setPadding(int padding) +void QQuickTheme::setPadding(qreal padding) { Q_D(QQuickTheme); d->setPadding(padding, QQuickThemePrivate::Explicit); @@ -810,13 +810,13 @@ void QQuickTheme::resetPadding() d->setPadding(d->resolve().padding(), QQuickThemePrivate::Implicit); } -int QQuickTheme::roundness() const +qreal QQuickTheme::roundness() const { Q_D(const QQuickTheme); return d->data.roundness(); } -void QQuickTheme::setRoundness(int roundness) +void QQuickTheme::setRoundness(qreal roundness) { Q_D(QQuickTheme); d->setRoundness(roundness, QQuickThemePrivate::Explicit); @@ -828,13 +828,13 @@ void QQuickTheme::resetRoundness() d->setRoundness(d->resolve().roundness(), QQuickThemePrivate::Implicit); } -int QQuickTheme::spacing() const +qreal QQuickTheme::spacing() const { Q_D(const QQuickTheme); return d->data.spacing(); } -void QQuickTheme::setSpacing(int spacing) +void QQuickTheme::setSpacing(qreal spacing) { Q_D(QQuickTheme); d->setSpacing(spacing, QQuickThemePrivate::Explicit); diff --git a/src/imports/controls/qquicktheme_p.h b/src/imports/controls/qquicktheme_p.h index f3e3d38c..a6294c78 100644 --- a/src/imports/controls/qquicktheme_p.h +++ b/src/imports/controls/qquicktheme_p.h @@ -71,9 +71,9 @@ class QQuickTheme : public QObject Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor RESET resetSelectionColor NOTIFY selectionColorChanged FINAL) Q_PROPERTY(QColor shadowColor READ shadowColor WRITE setShadowColor RESET resetShadowColor NOTIFY shadowColorChanged FINAL) Q_PROPERTY(QColor textColor READ textColor WRITE setTextColor RESET resetTextColor NOTIFY textColorChanged FINAL) - Q_PROPERTY(int padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) - Q_PROPERTY(int roundness READ roundness WRITE setRoundness RESET resetRoundness NOTIFY roundnessChanged FINAL) - Q_PROPERTY(int spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL) + Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) + Q_PROPERTY(qreal roundness READ roundness WRITE setRoundness RESET resetRoundness NOTIFY roundnessChanged FINAL) + Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL) Q_PROPERTY(qreal disabledOpacity READ disabledOpacity WRITE setDisabledOpacity RESET resetDisabledOpacity NOTIFY disabledOpacityChanged FINAL) public: @@ -129,16 +129,16 @@ public: void setTextColor(const QColor &color); void resetTextColor(); - int padding() const; - void setPadding(int padding); + qreal padding() const; + void setPadding(qreal padding); void resetPadding(); - int roundness() const; - void setRoundness(int roundness); + qreal roundness() const; + void setRoundness(qreal roundness); void resetRoundness(); - int spacing() const; - void setSpacing(int spacing); + qreal spacing() const; + void setSpacing(qreal spacing); void resetSpacing(); qreal disabledOpacity() const; diff --git a/src/imports/controls/qquickthemedata_p.h b/src/imports/controls/qquickthemedata_p.h index c86ad5ee..893cae9c 100644 --- a/src/imports/controls/qquickthemedata_p.h +++ b/src/imports/controls/qquickthemedata_p.h @@ -94,14 +94,14 @@ public: QColor textColor() const { return d->textColor; } void setTextColor(const QColor &color) { d->textColor = color; } - int padding() const { return d->padding; } - void setPadding(int padding) { d->padding = padding; } + qreal padding() const { return d->padding; } + void setPadding(qreal padding) { d->padding = padding; } - int roundness() const { return d->roundness; } - void setRoundness(int roundness) { d->roundness = roundness; } + qreal roundness() const { return d->roundness; } + void setRoundness(qreal roundness) { d->roundness = roundness; } - int spacing() const { return d->spacing; } - void setSpacing(int spacing) { d->spacing = spacing; } + qreal spacing() const { return d->spacing; } + void setSpacing(qreal spacing) { d->spacing = spacing; } qreal disabledOpacity() const { return d->disabledOpacity; } void setDisabledOpacity(qreal opacity) { d->disabledOpacity = opacity; } @@ -119,9 +119,9 @@ private: QColor selectionColor; QColor shadowColor; QColor textColor; - int padding; - int spacing; - int roundness; + qreal padding; + qreal spacing; + qreal roundness; qreal disabledOpacity; }; QSharedDataPointer d; -- cgit v1.2.3