summaryrefslogtreecommitdiff
path: root/src/controls/Private/qquickcontrolsettings.cpp
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-15 18:04:36 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-01-16 08:47:20 +0000
commit6e3fd69409849bc4803b104a7674139fa630eec5 (patch)
tree94c5ed626eb2e45049b9c701aacffa370b582d25 /src/controls/Private/qquickcontrolsettings.cpp
parentfa1ff822b779c2d649517a5fefef81af8affaa68 (diff)
downloadqtquickcontrols-6e3fd69409849bc4803b104a7674139fa630eec5.tar.gz
Replace foreach with range-based for
Change-Id: Ieb9019b62696479a4e0317a590bceaeb30abf62c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/Private/qquickcontrolsettings.cpp')
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index 8483830b..0f22f127 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -86,7 +86,8 @@ bool QQuickControlSettings::hasTouchScreen() const
#if defined(Q_OS_ANDROID)
return true;
#else
- foreach (const QTouchDevice *dev, QTouchDevice::devices())
+ const auto devices = QTouchDevice::devices();
+ for (const QTouchDevice *dev : devices)
if (dev->type() == QTouchDevice::TouchScreen)
return true;
return false;
@@ -146,7 +147,8 @@ static QString relativeStyleImportPath(QQmlEngine *engine, const QString &styleN
{
QString path;
bool found = false;
- foreach (const QString &import, engine->importPathList()) {
+ const auto importPathList = engine->importPathList();
+ for (const QString &import : importPathList) {
QDir dir(import + QStringLiteral("/QtQuick/Controls/Styles"));
if (dir.exists(styleName)) {
found = true;
@@ -182,7 +184,8 @@ QQuickControlSettings::QQuickControlSettings(QQmlEngine *engine)
const QString defaultStyle = defaultStyleName();
dir.setPath(relativeStyleImportPath(engine, defaultStyle));
dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
- foreach (const QString &styleDirectory, dir.entryList()) {
+ const auto list = dir.entryList();
+ for (const QString &styleDirectory : list) {
findStyle(engine, styleDirectory);
}
@@ -259,7 +262,8 @@ void QQuickControlSettings::findStyle(QQmlEngine *engine, const QString &styleNa
StyleData styleData;
- foreach (const QString &fileName, dir.entryList()) {
+ const auto list = dir.entryList();
+ for (const QString &fileName : list) {
// This assumes that there is only one library in the style directory,
// which should be a safe assumption. If at some point it's determined
// not to be safe, we'll have to resolve the init and path functions