feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Some const& adjustments

Browse Source 
Change-Id: Ib675463d93c060d8ef73a548b5e8943faf98c2eb
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-04 16:51:38 +01:00
parent 801275669a
commit 804aec1417
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidsdkmanager.cpp
View File

@@ -281,7 +281,8 @@ private:
void compilePackageAssociations(); void compilePackageAssociations();
void parsePackageData(MarkerTag packageMarker, const QStringList &data); void parsePackageData(MarkerTag packageMarker, const QStringList &data);
bool parseAbstractData(GenericPackageData &output, const QStringList &input, int minParts, bool parseAbstractData(GenericPackageData &output, const QStringList &input, int minParts,
const QString &logStrTag, QStringList extraKeys = QStringList()) const; const QString &logStrTag,
const QStringList &extraKeys = QStringList()) const;
AndroidSdkPackage *parsePlatform(const QStringList &data) const; AndroidSdkPackage *parsePlatform(const QStringList &data) const;
QPair<SystemImage *, int> parseSystemImage(const QStringList &data) const; QPair<SystemImage *, int> parseSystemImage(const QStringList &data) const;
BuildTools *parseBuildToolsPackage(const QStringList &data) const; BuildTools *parseBuildToolsPackage(const QStringList &data) const;
@@ -453,7 +454,7 @@ void SdkManagerOutputParser::parsePackageListing(const QString &output)
}; };
QRegularExpression delimiters("[\\n\\r]"); QRegularExpression delimiters("[\\n\\r]");
foreach (QString outputLine, output.split(delimiters)) { for (const QString &outputLine : output.split(delimiters)) {
MarkerTag marker = parseMarkers(outputLine.trimmed()); MarkerTag marker = parseMarkers(outputLine.trimmed());
if (marker & SectionMarkers) { if (marker & SectionMarkers) {
// Section marker found. Update the current section being parsed. // Section marker found. Update the current section being parsed.
@@ -605,7 +606,7 @@ void SdkManagerOutputParser::parsePackageData(MarkerTag packageMarker, const QSt
bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPackageData &output, bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPackageData &output,
const QStringList &input, int minParts, const QStringList &input, int minParts,
const QString &logStrTag, const QString &logStrTag,
QStringList extraKeys) const const QStringList &extraKeys) const
{ {
if (input.isEmpty()) { if (input.isEmpty()) {
qCDebug(sdkManagerLog) << logStrTag + ": Empty input"; qCDebug(sdkManagerLog) << logStrTag + ": Empty input";
@@ -618,10 +619,11 @@ bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPa
return false; return false;
} }
extraKeys << installLocationKey << revisionKey << descriptionKey; QStringList keys = extraKeys;
foreach (QString line, input) { keys << installLocationKey << revisionKey << descriptionKey;
for (const QString &line : input) {
QString value; QString value;
for (const auto &key: qAsConst(extraKeys)) { for (const auto &key: qAsConst(keys)) {
if (valueForKey(key, line, &value)) { if (valueForKey(key, line, &value)) {
if (key == installLocationKey) if (key == installLocationKey)
output.installedLocation = Utils::FilePath::fromString(value); output.installedLocation = Utils::FilePath::fromString(value);