diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2012-10-23 18:24:59 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-10-29 14:58:46 +0100 |
commit | 92f64152b4d1e756d072ce434c4d4da8cb91f140 (patch) | |
tree | 2b3e2c151e30606d084eb17407c0d25065a38d92 /src/app/shared | |
parent | d0e2b2fa077a05a2f9b9a7f231e83e576d7ba90f (diff) |
Document some classes.
Along the way, rename some things to help understand them:
- Configuration -> PropertyMap
- Rule::fileScript -> Rule::fileName
Change-Id: Ibff62526fe8e0be92b23456c942665ebb7db10dc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/app/shared')
-rw-r--r-- | src/app/shared/commandlineparser.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/app/shared/commandlineparser.cpp b/src/app/shared/commandlineparser.cpp index e9ed18e62..37faa9d8e 100644 --- a/src/app/shared/commandlineparser.cpp +++ b/src/app/shared/commandlineparser.cpp @@ -348,7 +348,7 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const { // Key: build variant, value: properties. Empty key used for global properties. typedef QMap<QString, QVariantMap> PropertyMaps; - PropertyMaps propertyMaps; + PropertyMaps properties; const QString buildVariantKey = QLatin1String("qbs.buildVariant"); QString currentKey = QString(); @@ -356,7 +356,7 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const foreach (const QString &arg, m_positional) { const int sepPos = arg.indexOf(QLatin1Char(':')); if (sepPos == -1) { // New build variant found. - propertyMaps.insert(currentKey, currentProperties); + properties.insert(currentKey, currentProperties); currentKey = arg; currentProperties.clear(); continue; @@ -369,19 +369,19 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const else currentProperties.insert(property, arg.mid(sepPos + 1)); } - propertyMaps.insert(currentKey, currentProperties); + properties.insert(currentKey, currentProperties); - if (propertyMaps.count() == 1) // No build variant specified on command line. - propertyMaps.insert(m_settings->buildVariant(), QVariantMap()); + if (properties.count() == 1) // No build variant specified on command line. + properties.insert(m_settings->buildVariant(), QVariantMap()); - const PropertyMaps::Iterator globalMapIt = propertyMaps.find(QString()); - Q_ASSERT(globalMapIt != propertyMaps.end()); + const PropertyMaps::Iterator globalMapIt = properties.find(QString()); + Q_ASSERT(globalMapIt != properties.end()); const QVariantMap globalProperties = globalMapIt.value(); - propertyMaps.erase(globalMapIt); + properties.erase(globalMapIt); QList<QVariantMap> buildConfigs; - for (PropertyMaps::ConstIterator mapsIt = propertyMaps.constBegin(); - mapsIt != propertyMaps.constEnd(); ++mapsIt) { + for (PropertyMaps::ConstIterator mapsIt = properties.constBegin(); + mapsIt != properties.constEnd(); ++mapsIt) { QVariantMap properties = mapsIt.value(); for (QVariantMap::ConstIterator globalPropIt = globalProperties.constBegin(); globalPropIt != globalProperties.constEnd(); ++globalPropIt) { |