aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-05-03 13:13:55 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2018-05-04 12:55:59 +0000
commitbf39c3ce5524d151532d89efef40ff1a8e25f4c0 (patch)
tree301c7384f6b28e94bd18d6682358ccd4db9ab224
parent2338fdc30b200c516356742802267b8c62bc7788 (diff)
Styles: use C++11 default member initialization
Change-Id: Ifd7521b8a7bfd7da91808dd00ebdcb59f2ba46dc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/imports/controls/fusion/qquickfusiondial.cpp3
-rw-r--r--src/imports/controls/fusion/qquickfusiondial_p.h2
-rw-r--r--src/imports/controls/imagine/qquickimageselector.cpp4
-rw-r--r--src/imports/controls/imagine/qquickimageselector_p.h6
-rw-r--r--src/imports/controls/imagine/qquickimaginestyle.cpp1
-rw-r--r--src/imports/controls/imagine/qquickimaginestyle_p.h2
-rw-r--r--src/imports/controls/material/qquickmaterialbusyindicator.cpp19
-rw-r--r--src/imports/controls/material/qquickmaterialbusyindicator_p.h4
-rw-r--r--src/imports/controls/material/qquickmaterialprogressbar.cpp10
-rw-r--r--src/imports/controls/material/qquickmaterialprogressbar_p.h6
-rw-r--r--src/imports/controls/material/qquickmaterialripple.cpp28
-rw-r--r--src/imports/controls/material/qquickmaterialripple_p.h14
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp8
-rw-r--r--src/imports/controls/material/qquickmaterialstyle_p.h34
-rw-r--r--src/imports/controls/qquickdefaultbusyindicator.cpp2
-rw-r--r--src/imports/controls/qquickdefaultbusyindicator_p.h2
-rw-r--r--src/imports/controls/qquickdefaultdial.cpp4
-rw-r--r--src/imports/controls/qquickdefaultdial_p.h4
-rw-r--r--src/imports/controls/qquickdefaultprogressbar.cpp9
-rw-r--r--src/imports/controls/qquickdefaultprogressbar_p.h4
-rw-r--r--src/imports/controls/universal/qquickuniversalbusyindicator.cpp12
-rw-r--r--src/imports/controls/universal/qquickuniversalbusyindicator_p.h6
-rw-r--r--src/imports/controls/universal/qquickuniversalprogressbar.cpp15
-rw-r--r--src/imports/controls/universal/qquickuniversalprogressbar_p.h6
-rw-r--r--src/imports/controls/universal/qquickuniversalstyle.cpp1
-rw-r--r--src/imports/controls/universal/qquickuniversalstyle_p.h20
26 files changed, 95 insertions, 131 deletions
diff --git a/src/imports/controls/fusion/qquickfusiondial.cpp b/src/imports/controls/fusion/qquickfusiondial.cpp
index 014078e6..182f5c0f 100644
--- a/src/imports/controls/fusion/qquickfusiondial.cpp
+++ b/src/imports/controls/fusion/qquickfusiondial.cpp
@@ -42,8 +42,7 @@
QT_BEGIN_NAMESPACE
QQuickFusionDial::QQuickFusionDial(QQuickItem *parent)
- : QQuickPaintedItem(parent),
- m_highlight(false)
+ : QQuickPaintedItem(parent)
{
}
diff --git a/src/imports/controls/fusion/qquickfusiondial_p.h b/src/imports/controls/fusion/qquickfusiondial_p.h
index d3216521..740545d8 100644
--- a/src/imports/controls/fusion/qquickfusiondial_p.h
+++ b/src/imports/controls/fusion/qquickfusiondial_p.h
@@ -71,7 +71,7 @@ public:
void paint(QPainter *painter) override;
private:
- bool m_highlight;
+ bool m_highlight = false;
QPalette m_palette;
};
diff --git a/src/imports/controls/imagine/qquickimageselector.cpp b/src/imports/controls/imagine/qquickimageselector.cpp
index 1b3e80a9..67d3a24b 100644
--- a/src/imports/controls/imagine/qquickimageselector.cpp
+++ b/src/imports/controls/imagine/qquickimageselector.cpp
@@ -106,9 +106,7 @@ static QString findFile(const QDir &dir, const QString &baseName, const QStringL
QQuickImageSelector::QQuickImageSelector(QObject *parent)
: QObject(parent),
- m_cache(cacheSize() > 0),
- m_complete(false),
- m_separator(QLatin1String("-"))
+ m_cache(cacheSize() > 0)
{
}
diff --git a/src/imports/controls/imagine/qquickimageselector_p.h b/src/imports/controls/imagine/qquickimageselector_p.h
index 2bb4e526..d050707d 100644
--- a/src/imports/controls/imagine/qquickimageselector_p.h
+++ b/src/imports/controls/imagine/qquickimageselector_p.h
@@ -110,12 +110,12 @@ protected:
int calculateScore(const QStringList &states) const;
private:
- bool m_cache;
- bool m_complete;
+ bool m_cache = false;
+ bool m_complete = false;
QUrl m_source;
QString m_path;
QString m_name;
- QString m_separator;
+ QString m_separator = QLatin1String("-");
QVariantList m_allStates;
QStringList m_activeStates;
QQmlProperty m_property;
diff --git a/src/imports/controls/imagine/qquickimaginestyle.cpp b/src/imports/controls/imagine/qquickimaginestyle.cpp
index 7617fbf5..9e1431de 100644
--- a/src/imports/controls/imagine/qquickimaginestyle.cpp
+++ b/src/imports/controls/imagine/qquickimaginestyle.cpp
@@ -51,7 +51,6 @@ static const QString ensureSlash(const QString &path)
QQuickImagineStyle::QQuickImagineStyle(QObject *parent)
: QQuickAttachedObject(parent),
- m_explicitPath(false),
m_path(*GlobalPath())
{
init();
diff --git a/src/imports/controls/imagine/qquickimaginestyle_p.h b/src/imports/controls/imagine/qquickimaginestyle_p.h
index 88b92c00..20a4baf0 100644
--- a/src/imports/controls/imagine/qquickimaginestyle_p.h
+++ b/src/imports/controls/imagine/qquickimaginestyle_p.h
@@ -82,7 +82,7 @@ protected:
private:
void init();
- bool m_explicitPath;
+ bool m_explicitPath = false;
QString m_path;
};
diff --git a/src/imports/controls/material/qquickmaterialbusyindicator.cpp b/src/imports/controls/material/qquickmaterialbusyindicator.cpp
index 0a4191be..c18a4005 100644
--- a/src/imports/controls/material/qquickmaterialbusyindicator.cpp
+++ b/src/imports/controls/material/qquickmaterialbusyindicator.cpp
@@ -77,21 +77,16 @@ protected:
void updateCurrentTime(int time) override;
private:
- int m_lastStartAngle;
- int m_lastEndAngle;
- qreal m_width;
- qreal m_height;
- qreal m_devicePixelRatio;
+ int m_lastStartAngle = 0;
+ int m_lastEndAngle = 0;
+ qreal m_width = 0;
+ qreal m_height = 0;
+ qreal m_devicePixelRatio = 1;
QColor m_color;
};
QQuickMaterialBusyIndicatorNode::QQuickMaterialBusyIndicatorNode(QQuickMaterialBusyIndicator *item)
- : QQuickAnimatedNode(item),
- m_lastStartAngle(0),
- m_lastEndAngle(0),
- m_width(0),
- m_height(0),
- m_devicePixelRatio(1)
+ : QQuickAnimatedNode(item)
{
setLoopCount(Infinite);
setCurrentTime(item->elapsed());
@@ -179,7 +174,7 @@ void QQuickMaterialBusyIndicatorNode::sync(QQuickItem *item)
}
QQuickMaterialBusyIndicator::QQuickMaterialBusyIndicator(QQuickItem *parent) :
- QQuickItem(parent), m_elapsed(0), m_color(Qt::black)
+ QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/material/qquickmaterialbusyindicator_p.h b/src/imports/controls/material/qquickmaterialbusyindicator_p.h
index 6c6d2445..d29427c1 100644
--- a/src/imports/controls/material/qquickmaterialbusyindicator_p.h
+++ b/src/imports/controls/material/qquickmaterialbusyindicator_p.h
@@ -75,8 +75,8 @@ protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
private:
- int m_elapsed;
- QColor m_color;
+ int m_elapsed = 0;
+ QColor m_color = Qt::black;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialprogressbar.cpp b/src/imports/controls/material/qquickmaterialprogressbar.cpp
index c1d36d3b..4635c57b 100644
--- a/src/imports/controls/material/qquickmaterialprogressbar.cpp
+++ b/src/imports/controls/material/qquickmaterialprogressbar.cpp
@@ -62,14 +62,12 @@ public:
private:
void moveNode(QSGTransformNode *node, const QRectF &geometry, qreal progress);
- bool m_indeterminate;
- QEasingCurve m_easing;
+ bool m_indeterminate = false;
+ QEasingCurve m_easing = QEasingCurve::OutCubic;
};
QQuickMaterialProgressBarNode::QQuickMaterialProgressBarNode(QQuickMaterialProgressBar *item)
- : QQuickAnimatedNode(item),
- m_indeterminate(false),
- m_easing(QEasingCurve::OutCubic)
+ : QQuickAnimatedNode(item)
{
setLoopCount(Infinite);
setDuration(TotalDuration);
@@ -176,7 +174,7 @@ void QQuickMaterialProgressBarNode::moveNode(QSGTransformNode *transformNode, co
}
QQuickMaterialProgressBar::QQuickMaterialProgressBar(QQuickItem *parent)
- : QQuickItem(parent), m_color(Qt::black), m_progress(0.0), m_indeterminate(false)
+ : QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/material/qquickmaterialprogressbar_p.h b/src/imports/controls/material/qquickmaterialprogressbar_p.h
index 981d9bfb..680f36a4 100644
--- a/src/imports/controls/material/qquickmaterialprogressbar_p.h
+++ b/src/imports/controls/material/qquickmaterialprogressbar_p.h
@@ -77,9 +77,9 @@ protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
private:
- QColor m_color;
- qreal m_progress;
- bool m_indeterminate;
+ QColor m_color = Qt::black;
+ qreal m_progress = 0.0;
+ bool m_indeterminate = false;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialripple.cpp b/src/imports/controls/material/qquickmaterialripple.cpp
index 1c3b3f12..e6287ff9 100644
--- a/src/imports/controls/material/qquickmaterialripple.cpp
+++ b/src/imports/controls/material/qquickmaterialripple.cpp
@@ -64,20 +64,16 @@ public:
void sync(QQuickItem *item) override;
private:
- qreal m_from;
- qreal m_to;
- qreal m_value;
- WavePhase m_phase;
+ qreal m_from = 0;
+ qreal m_to = 0;
+ qreal m_value = 0;
+ WavePhase m_phase = WaveEnter;
QPointF m_anchor;
QRectF m_bounds;
};
QQuickMaterialRippleWaveNode::QQuickMaterialRippleWaveNode(QQuickMaterialRipple *ripple)
- : QQuickAnimatedNode(ripple),
- m_from(0),
- m_to(0),
- m_value(0),
- m_phase(WaveEnter)
+ : QQuickAnimatedNode(ripple)
{
start(qRound(1000.0 * qSqrt(ripple->diameter() / 2.0 / WAVE_TOUCH_DOWN_ACCELERATION)));
@@ -156,12 +152,11 @@ public:
void sync(QQuickItem *item) override;
private:
- bool m_active;
+ bool m_active = false;
};
QQuickMaterialRippleBackgroundNode::QQuickMaterialRippleBackgroundNode(QQuickMaterialRipple *ripple)
- : QQuickAnimatedNode(ripple),
- m_active(false)
+ : QQuickAnimatedNode(ripple)
{
setDuration(OPACITY_ENTER_DURATION_FAST);
@@ -221,14 +216,7 @@ void QQuickMaterialRippleBackgroundNode::sync(QQuickItem *item)
}
QQuickMaterialRipple::QQuickMaterialRipple(QQuickItem *parent)
- : QQuickItem(parent),
- m_active(false),
- m_pressed(false),
- m_waves(0),
- m_enterDelay(0),
- m_trigger(Press),
- m_clipRadius(0.0),
- m_anchor(nullptr)
+ : QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/material/qquickmaterialripple_p.h b/src/imports/controls/material/qquickmaterialripple_p.h
index 712697da..8a80113b 100644
--- a/src/imports/controls/material/qquickmaterialripple_p.h
+++ b/src/imports/controls/material/qquickmaterialripple_p.h
@@ -101,14 +101,14 @@ protected:
void exitWave();
private:
- bool m_active;
- bool m_pressed;
- int m_waves;
- int m_enterDelay;
- Trigger m_trigger;
- qreal m_clipRadius;
+ bool m_active = false;
+ bool m_pressed = false;
+ int m_waves = 0;
+ int m_enterDelay = 0;
+ Trigger m_trigger = Press;
+ qreal m_clipRadius = 0.0;
QColor m_color;
- QQuickItem *m_anchor;
+ QQuickItem *m_anchor = nullptr;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 08d88ec7..4dd4e128 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -427,11 +427,6 @@ static QQuickMaterialStyle::Theme effectiveTheme(QQuickMaterialStyle::Theme them
}
QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject(parent),
- m_explicitTheme(false),
- m_explicitPrimary(false),
- m_explicitAccent(false),
- m_explicitForeground(false),
- m_explicitBackground(false),
m_customPrimary(globalPrimaryCustom),
m_customAccent(globalAccentCustom),
m_customForeground(globalForegroundCustom),
@@ -442,8 +437,7 @@ QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject
m_primary(globalPrimary),
m_accent(globalAccent),
m_foreground(globalForeground),
- m_background(globalBackground),
- m_elevation(0)
+ m_background(globalBackground)
{
init();
}
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 2374eefb..6008b1e0 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -249,31 +249,31 @@ private:
// These reflect whether a color value was explicitly set on the specific
// item that this attached style object represents.
- bool m_explicitTheme;
- bool m_explicitPrimary;
- bool m_explicitAccent;
- bool m_explicitForeground;
- bool m_explicitBackground;
+ bool m_explicitTheme = false;
+ bool m_explicitPrimary = false;
+ bool m_explicitAccent = false;
+ bool m_explicitForeground = false;
+ bool m_explicitBackground = false;
// These reflect whether the color value that was either inherited or
// explicitly set is in the form that QColor expects, rather than one of
// our pre-defined color enum values.
- bool m_customPrimary;
- bool m_customAccent;
- bool m_customForeground;
- bool m_customBackground;
+ bool m_customPrimary = false;
+ bool m_customAccent = false;
+ bool m_customForeground = false;
+ bool m_customBackground = false;
// These will be true when this item has an explicit or inherited foreground/background
// color, or these colors were declared globally via settings (e.g. conf or env vars).
// Some color properties of the style will return different values depending on whether
// or not these are set.
- bool m_hasForeground;
- bool m_hasBackground;
+ bool m_hasForeground = false;
+ bool m_hasBackground = false;
// The actual values for this item, whether explicit, inherited or globally set.
- Theme m_theme;
- uint m_primary;
- uint m_accent;
- uint m_foreground;
- uint m_background;
- int m_elevation;
+ Theme m_theme = Light;
+ uint m_primary = 0;
+ uint m_accent = 0;
+ uint m_foreground = 0;
+ uint m_background = 0;
+ int m_elevation = 0;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/qquickdefaultbusyindicator.cpp b/src/imports/controls/qquickdefaultbusyindicator.cpp
index c02d8128..98a3cae3 100644
--- a/src/imports/controls/qquickdefaultbusyindicator.cpp
+++ b/src/imports/controls/qquickdefaultbusyindicator.cpp
@@ -138,7 +138,7 @@ void QQuickDefaultBusyIndicatorNode::sync(QQuickItem *item)
}
QQuickDefaultBusyIndicator::QQuickDefaultBusyIndicator(QQuickItem *parent) :
- QQuickItem(parent), m_elapsed(0)
+ QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/qquickdefaultbusyindicator_p.h b/src/imports/controls/qquickdefaultbusyindicator_p.h
index 1beeb0c9..eedaf09a 100644
--- a/src/imports/controls/qquickdefaultbusyindicator_p.h
+++ b/src/imports/controls/qquickdefaultbusyindicator_p.h
@@ -79,7 +79,7 @@ protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
private:
- int m_elapsed;
+ int m_elapsed = 0;
QColor m_pen;
QColor m_fill;
};
diff --git a/src/imports/controls/qquickdefaultdial.cpp b/src/imports/controls/qquickdefaultdial.cpp
index 845e634d..1653def7 100644
--- a/src/imports/controls/qquickdefaultdial.cpp
+++ b/src/imports/controls/qquickdefaultdial.cpp
@@ -43,9 +43,7 @@
QT_BEGIN_NAMESPACE
QQuickDefaultDial::QQuickDefaultDial(QQuickItem *parent) :
- QQuickPaintedItem(parent),
- m_progress(0),
- m_color(Qt::black)
+ QQuickPaintedItem(parent)
{
}
diff --git a/src/imports/controls/qquickdefaultdial_p.h b/src/imports/controls/qquickdefaultdial_p.h
index 10490610..73e14321 100644
--- a/src/imports/controls/qquickdefaultdial_p.h
+++ b/src/imports/controls/qquickdefaultdial_p.h
@@ -71,8 +71,8 @@ public:
void paint(QPainter *painter) override;
private:
- qreal m_progress;
- QColor m_color;
+ qreal m_progress = 0;
+ QColor m_color = Qt::black;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/qquickdefaultprogressbar.cpp b/src/imports/controls/qquickdefaultprogressbar.cpp
index f5bd1db8..e8657255 100644
--- a/src/imports/controls/qquickdefaultprogressbar.cpp
+++ b/src/imports/controls/qquickdefaultprogressbar.cpp
@@ -77,13 +77,12 @@ public:
void sync(QQuickItem *item) override;
private:
- bool m_indeterminate;
- qreal m_pixelsPerSecond;
+ bool m_indeterminate = false;
+ qreal m_pixelsPerSecond = 0;
};
QQuickDefaultProgressBarNode::QQuickDefaultProgressBarNode(QQuickDefaultProgressBar *item)
: QQuickAnimatedNode(item),
- m_indeterminate(false),
m_pixelsPerSecond(item->width())
{
setLoopCount(Infinite);
@@ -209,9 +208,7 @@ void QQuickDefaultProgressBarNode::sync(QQuickItem *item)
}
QQuickDefaultProgressBar::QQuickDefaultProgressBar(QQuickItem *parent) :
- QQuickItem(parent),
- m_progress(0),
- m_indeterminate(false)
+ QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/qquickdefaultprogressbar_p.h b/src/imports/controls/qquickdefaultprogressbar_p.h
index 91f8056b..241d0b3b 100644
--- a/src/imports/controls/qquickdefaultprogressbar_p.h
+++ b/src/imports/controls/qquickdefaultprogressbar_p.h
@@ -77,8 +77,8 @@ protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
private:
- qreal m_progress;
- bool m_indeterminate;
+ qreal m_progress = 0;
+ bool m_indeterminate = false;
QColor m_color;
};
diff --git a/src/imports/controls/universal/qquickuniversalbusyindicator.cpp b/src/imports/controls/universal/qquickuniversalbusyindicator.cpp
index a3d09094..70170296 100644
--- a/src/imports/controls/universal/qquickuniversalbusyindicator.cpp
+++ b/src/imports/controls/universal/qquickuniversalbusyindicator.cpp
@@ -58,12 +58,12 @@ public:
private:
struct Phase {
- Phase() : duration(0), from(0), to(0), curve(QEasingCurve::Linear) { }
+ Phase() = default;
Phase(int d, qreal f, qreal t, QEasingCurve::Type c) : duration(d), from(f), to(t), curve(c) { }
- int duration;
- qreal from;
- qreal to;
- QEasingCurve curve;
+ int duration = 0;
+ qreal from = 0;
+ qreal to = 0;
+ QEasingCurve curve = QEasingCurve::Linear;
};
Phase m_phases[PhaseCount];
@@ -186,7 +186,7 @@ void QQuickUniversalBusyIndicatorNode::sync(QQuickItem *item)
}
QQuickUniversalBusyIndicator::QQuickUniversalBusyIndicator(QQuickItem *parent)
- : QQuickItem(parent), m_count(5), m_elapsed(0), m_color(Qt::black)
+ : QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/universal/qquickuniversalbusyindicator_p.h b/src/imports/controls/universal/qquickuniversalbusyindicator_p.h
index 6b888463..119091b5 100644
--- a/src/imports/controls/universal/qquickuniversalbusyindicator_p.h
+++ b/src/imports/controls/universal/qquickuniversalbusyindicator_p.h
@@ -75,9 +75,9 @@ protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
private:
- int m_count;
- int m_elapsed;
- QColor m_color;
+ int m_count = 5;
+ int m_elapsed = 0;
+ QColor m_color = Qt::black;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/universal/qquickuniversalprogressbar.cpp b/src/imports/controls/universal/qquickuniversalprogressbar.cpp
index 25dfda6f..7d4642c5 100644
--- a/src/imports/controls/universal/qquickuniversalprogressbar.cpp
+++ b/src/imports/controls/universal/qquickuniversalprogressbar.cpp
@@ -67,21 +67,20 @@ public:
private:
struct Phase {
- Phase() : duration(0), from(0), to(0) { }
+ Phase() = default;
Phase(int d, qreal f, qreal t) : duration(d), from(f), to(t) { }
- int duration;
- qreal from;
- qreal to;
+ int duration = 0;
+ qreal from = 0;
+ qreal to = 0;
};
- bool m_indeterminate;
+ bool m_indeterminate = false;
Phase m_borderPhases[PhaseCount];
Phase m_ellipsePhases[PhaseCount];
};
QQuickUniversalProgressBarNode::QQuickUniversalProgressBarNode(QQuickUniversalProgressBar *item)
- : QQuickAnimatedNode(item),
- m_indeterminate(false)
+ : QQuickAnimatedNode(item)
{
setLoopCount(Infinite);
setDuration(TotalDuration);
@@ -267,7 +266,7 @@ void QQuickUniversalProgressBarNode::sync(QQuickItem *item)
}
QQuickUniversalProgressBar::QQuickUniversalProgressBar(QQuickItem *parent)
- : QQuickItem(parent), m_color(Qt::black), m_progress(0.0), m_indeterminate(false)
+ : QQuickItem(parent)
{
setFlag(ItemHasContents);
}
diff --git a/src/imports/controls/universal/qquickuniversalprogressbar_p.h b/src/imports/controls/universal/qquickuniversalprogressbar_p.h
index ef34289c..449f7965 100644
--- a/src/imports/controls/universal/qquickuniversalprogressbar_p.h
+++ b/src/imports/controls/universal/qquickuniversalprogressbar_p.h
@@ -77,9 +77,9 @@ protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override;
private:
- QColor m_color;
- qreal m_progress;
- bool m_indeterminate;
+ QColor m_color = Qt::black;
+ qreal m_progress = 0.0;
+ bool m_indeterminate = false;
};
QT_END_NAMESPACE
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index dbc409fd..d46752f3 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/imports/controls/universal/qquickuniversalstyle.cpp
@@ -152,7 +152,6 @@ static bool HasGlobalForeground = false;
static bool HasGlobalBackground = false;
QQuickUniversalStyle::QQuickUniversalStyle(QObject *parent) : QQuickAttachedObject(parent),
- m_explicitTheme(false), m_explicitAccent(false), m_explicitForeground(false), m_explicitBackground(false),
m_hasForeground(HasGlobalForeground), m_hasBackground(HasGlobalBackground), m_theme(GlobalTheme),
m_accent(GlobalAccent), m_foreground(GlobalForeground), m_background(GlobalBackground)
{
diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h
index eb9f6d83..429621d7 100644
--- a/src/imports/controls/universal/qquickuniversalstyle_p.h
+++ b/src/imports/controls/universal/qquickuniversalstyle_p.h
@@ -217,21 +217,21 @@ private:
// These reflect whether a color value was explicitly set on the specific
// item that this attached style object represents.
- bool m_explicitTheme;
- bool m_explicitAccent;
- bool m_explicitForeground;
- bool m_explicitBackground;
+ bool m_explicitTheme = false;
+ bool m_explicitAccent = false;
+ bool m_explicitForeground = false;
+ bool m_explicitBackground = false;
// These will be true when this item has an explicit or inherited foreground/background
// color, or these colors were declared globally via settings (e.g. conf or env vars).
// Some color properties of the style will return different values depending on whether
// or not these are set.
- bool m_hasForeground;
- bool m_hasBackground;
+ bool m_hasForeground = false;
+ bool m_hasBackground = false;
// The actual values for this item, whether explicit, inherited or globally set.
- QQuickUniversalStyle::Theme m_theme;
- QRgb m_accent;
- QRgb m_foreground;
- QRgb m_background;
+ Theme m_theme = Light;
+ QRgb m_accent = Qt::blue;
+ QRgb m_foreground = Qt::black;
+ QRgb m_background = Qt::white;
};
QT_END_NAMESPACE