forked from qt-creator/qt-creator
QtSupport: Omit default parameter
Less noise. Change-Id: I5ea7f258b10a35374afb161b63729a5a4fa4ab2b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -58,8 +58,7 @@ static QHash<QString, QStringList> parseMeta(QXmlStreamReader *reader)
|
|||||||
reader->raiseError("Tag \"entry\" requires \"name\" attribute");
|
reader->raiseError("Tag \"entry\" requires \"name\" attribute");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
const QString value = reader->readElementText(
|
const QString value = reader->readElementText();
|
||||||
QXmlStreamReader::ErrorOnUnexpectedElement);
|
|
||||||
if (!value.isEmpty())
|
if (!value.isEmpty())
|
||||||
result[key].append(value);
|
result[key].append(value);
|
||||||
}
|
}
|
||||||
@@ -125,28 +124,22 @@ static QList<ExampleItem *> parseExamples(QXmlStreamReader *reader,
|
|||||||
const QString mainFileAttribute
|
const QString mainFileAttribute
|
||||||
= reader->attributes().value(QLatin1String("mainFile")).toString();
|
= reader->attributes().value(QLatin1String("mainFile")).toString();
|
||||||
const FilePath filePath
|
const FilePath filePath
|
||||||
= relativeOrInstallPath(FilePath::fromUserInput(reader->readElementText(
|
= relativeOrInstallPath(FilePath::fromUserInput(reader->readElementText()),
|
||||||
QXmlStreamReader::ErrorOnUnexpectedElement)),
|
|
||||||
projectsOffset,
|
projectsOffset,
|
||||||
examplesInstallPath);
|
examplesInstallPath);
|
||||||
item->filesToOpen.append(filePath);
|
item->filesToOpen.append(filePath);
|
||||||
if (mainFileAttribute.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0)
|
if (mainFileAttribute.compare(QLatin1String("true"), Qt::CaseInsensitive) == 0)
|
||||||
item->mainFile = filePath;
|
item->mainFile = filePath;
|
||||||
} else if (reader->name() == QLatin1String("description")) {
|
} else if (reader->name() == QLatin1String("description")) {
|
||||||
item->description = fixStringForTags(
|
item->description = fixStringForTags(reader->readElementText());
|
||||||
reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
|
||||||
} else if (reader->name() == QLatin1String("dependency")) {
|
} else if (reader->name() == QLatin1String("dependency")) {
|
||||||
item->dependencies.append(
|
item->dependencies.append(projectsOffset / reader->readElementText());
|
||||||
projectsOffset
|
|
||||||
/ reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
|
||||||
} else if (reader->name() == QLatin1String("tags")) {
|
} else if (reader->name() == QLatin1String("tags")) {
|
||||||
item->tags = trimStringList(
|
item->tags = trimStringList(
|
||||||
reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement)
|
reader->readElementText().split(QLatin1Char(','), Qt::SkipEmptyParts));
|
||||||
.split(QLatin1Char(','), Qt::SkipEmptyParts));
|
|
||||||
} else if (reader->name() == QLatin1String("platforms")) {
|
} else if (reader->name() == QLatin1String("platforms")) {
|
||||||
item->platforms = trimStringList(
|
item->platforms = trimStringList(
|
||||||
reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement)
|
reader->readElementText().split(QLatin1Char(','), Qt::SkipEmptyParts));
|
||||||
.split(QLatin1Char(','), Qt::SkipEmptyParts));
|
|
||||||
} else if (reader->name() == QLatin1String("meta")) {
|
} else if (reader->name() == QLatin1String("meta")) {
|
||||||
item->metaData = parseMeta(reader);
|
item->metaData = parseMeta(reader);
|
||||||
}
|
}
|
||||||
@@ -192,20 +185,18 @@ static QList<ExampleItem *> parseDemos(QXmlStreamReader *reader,
|
|||||||
== QLatin1String("true");
|
== QLatin1String("true");
|
||||||
} else if (reader->name() == QLatin1String("fileToOpen")) {
|
} else if (reader->name() == QLatin1String("fileToOpen")) {
|
||||||
item->filesToOpen.append(
|
item->filesToOpen.append(
|
||||||
relativeOrInstallPath(FilePath::fromUserInput(reader->readElementText(
|
relativeOrInstallPath(FilePath::fromUserInput(reader->readElementText()),
|
||||||
QXmlStreamReader::ErrorOnUnexpectedElement)),
|
|
||||||
projectsOffset,
|
projectsOffset,
|
||||||
demosInstallPath));
|
demosInstallPath));
|
||||||
} else if (reader->name() == QLatin1String("description")) {
|
} else if (reader->name() == QLatin1String("description")) {
|
||||||
item->description = fixStringForTags(
|
item->description = fixStringForTags(
|
||||||
reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
reader->readElementText());
|
||||||
} else if (reader->name() == QLatin1String("dependency")) {
|
} else if (reader->name() == QLatin1String("dependency")) {
|
||||||
item->dependencies.append(
|
item->dependencies.append(
|
||||||
projectsOffset
|
projectsOffset
|
||||||
/ reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
/ reader->readElementText());
|
||||||
} else if (reader->name() == QLatin1String("tags")) {
|
} else if (reader->name() == QLatin1String("tags")) {
|
||||||
item->tags = reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement)
|
item->tags = reader->readElementText().split(QLatin1Char(','));
|
||||||
.split(QLatin1Char(','));
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QXmlStreamReader::EndElement:
|
case QXmlStreamReader::EndElement:
|
||||||
@@ -249,17 +240,13 @@ static QList<ExampleItem *> parseTutorials(QXmlStreamReader *reader, const FileP
|
|||||||
} else if (reader->name() == QLatin1String("fileToOpen")) {
|
} else if (reader->name() == QLatin1String("fileToOpen")) {
|
||||||
item->filesToOpen.append(
|
item->filesToOpen.append(
|
||||||
projectsOffset
|
projectsOffset
|
||||||
/ reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
/ reader->readElementText());
|
||||||
} else if (reader->name() == QLatin1String("description")) {
|
} else if (reader->name() == QLatin1String("description")) {
|
||||||
item->description = fixStringForTags(
|
item->description = fixStringForTags(reader->readElementText());
|
||||||
reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
|
||||||
} else if (reader->name() == QLatin1String("dependency")) {
|
} else if (reader->name() == QLatin1String("dependency")) {
|
||||||
item->dependencies.append(
|
item->dependencies.append(projectsOffset / reader->readElementText());
|
||||||
projectsOffset
|
|
||||||
/ reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
|
|
||||||
} else if (reader->name() == QLatin1String("tags")) {
|
} else if (reader->name() == QLatin1String("tags")) {
|
||||||
item->tags = reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement)
|
item->tags = reader->readElementText().split(QLatin1Char(','));
|
||||||
.split(QLatin1Char(','));
|
|
||||||
} else if (reader->name() == QLatin1String("meta")) {
|
} else if (reader->name() == QLatin1String("meta")) {
|
||||||
item->metaData = parseMeta(reader);
|
item->metaData = parseMeta(reader);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user