aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/imagine
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 /src/imports/controls/imagine
parent2338fdc30b200c516356742802267b8c62bc7788 (diff)
Styles: use C++11 default member initialization
Change-Id: Ifd7521b8a7bfd7da91808dd00ebdcb59f2ba46dc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/imagine')
-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
4 files changed, 5 insertions, 8 deletions
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;
};