aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/api
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-10-24 08:40:54 -0700
committerJake Petroules <jake.petroules@qt.io>2017-11-14 18:24:18 +0000
commitb5613da1391789fe661063ab9d30850aa96efd59 (patch)
treed38dba0aefb774dd32268ec94bea5ddc0c9cea0d /src/lib/corelib/api
parentf40667f6fb026fa1747a1e330d6e397bf79435c7 (diff)
STL compatibility: use front() instead of first()
This is a simple find and replace with manual sanity check. Change-Id: I82f0eb38b6a5a3b75a4ed38d97bdb6ce164d09b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/api')
-rw-r--r--src/lib/corelib/api/changeset.cpp4
-rw-r--r--src/lib/corelib/api/project.cpp20
-rw-r--r--src/lib/corelib/api/projectfileupdater.cpp14
3 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/corelib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp
index ad070744c..bd04fe006 100644
--- a/src/lib/corelib/api/changeset.cpp
+++ b/src/lib/corelib/api/changeset.cpp
@@ -373,7 +373,7 @@ void ChangeSet::apply_helper()
QList<EditOp> replaceList;
{
while (!m_operationList.isEmpty()) {
- const EditOp cmd(m_operationList.first());
+ const EditOp cmd(m_operationList.front());
m_operationList.removeFirst();
convertToReplace(cmd, &replaceList);
}
@@ -384,7 +384,7 @@ void ChangeSet::apply_helper()
m_cursor->beginEditBlock();
while (!replaceList.isEmpty()) {
- const EditOp cmd(replaceList.first());
+ const EditOp cmd(replaceList.front());
replaceList.removeFirst();
doReplace(cmd, &replaceList);
}
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 648022b32..4101f705d 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -337,14 +337,14 @@ void ProjectPrivate::addGroup(const ProductData &product, const QString &groupNa
const QList<ResolvedProductPtr> resolvedProducts = internalProducts(products);
QBS_CHECK(products.count() == resolvedProducts.count());
- for (const GroupPtr &resolvedGroup : qAsConst(resolvedProducts.first()->groups)) {
+ for (const GroupPtr &resolvedGroup : qAsConst(resolvedProducts.front()->groups)) {
if (resolvedGroup->name == groupName) {
throw ErrorInfo(Tr::tr("Group '%1' already exists in product '%2'.")
.arg(groupName, product.name()), resolvedGroup->location);
}
}
- ProjectFileGroupInserter groupInserter(products.first(), groupName);
+ ProjectFileGroupInserter groupInserter(products.front(), groupName);
groupInserter.apply();
m_projectData.d.detach(); // The data we already gave out must stay as it is.
@@ -354,7 +354,7 @@ void ProjectPrivate::addGroup(const ProductData &product, const QString &groupNa
updateExternalCodeLocations(m_projectData, groupInserter.itemPosition(),
groupInserter.lineOffset());
- products = findProductsByName(products.first().name()); // These are new objects.
+ products = findProductsByName(products.front().name()); // These are new objects.
QBS_CHECK(products.count() == resolvedProducts.count());
for (int i = 0; i < products.count(); ++i) {
const GroupPtr resolvedGroup = ResolvedGroup::create();
@@ -451,7 +451,7 @@ ProjectPrivate::FileListUpdateContext ProjectPrivate::getFileListContext(const P
throw ErrorInfo(Tr::tr("File '%1' appears more than once.").arg(absPath));
if (forAdding && !FileInfo(absPath).exists())
throw ErrorInfo(Tr::tr("File '%1' does not exist.").arg(absPath));
- if (matchesWildcard(absPath, groupContext.resolvedGroups.first())) {
+ if (matchesWildcard(absPath, groupContext.resolvedGroups.front())) {
filesContext.absoluteFilePathsFromWildcards << absPath;
} else {
filesContext.absoluteFilePaths << absPath;
@@ -490,8 +490,8 @@ void ProjectPrivate::addFiles(const ProductData &product, const GroupData &group
}
}
- ProjectFileFilesAdder adder(groupContext.products.first(),
- group.isValid() ? groupContext.groups.first() : GroupData(),
+ ProjectFileFilesAdder adder(groupContext.products.front(),
+ group.isValid() ? groupContext.groups.front() : GroupData(),
filesContext.relativeFilePaths);
adder.apply();
@@ -559,7 +559,7 @@ void ProjectPrivate::removeFiles(const ProductData &product, const GroupData &gr
}
QStringList filesNotFound = filesContext.absoluteFilePaths;
QList<SourceArtifactPtr> sourceArtifacts;
- for (const SourceArtifactPtr &sa : qAsConst(groupContext.resolvedGroups.first()->files)) {
+ for (const SourceArtifactPtr &sa : qAsConst(groupContext.resolvedGroups.front()->files)) {
if (filesNotFound.removeOne(sa->absoluteFilePath))
sourceArtifacts << sa;
}
@@ -568,8 +568,8 @@ void ProjectPrivate::removeFiles(const ProductData &product, const GroupData &gr
.arg(filesNotFound.join(QLatin1String(", "))));
}
- ProjectFileFilesRemover remover(groupContext.products.first(),
- group.isValid() ? groupContext.groups.first() : GroupData(),
+ ProjectFileFilesRemover remover(groupContext.products.front(),
+ group.isValid() ? groupContext.groups.front() : GroupData(),
filesContext.relativeFilePaths);
remover.apply();
@@ -595,7 +595,7 @@ void ProjectPrivate::removeGroup(const ProductData &product, const GroupData &gr
{
GroupUpdateContext context = getGroupContext(product, group);
- ProjectFileGroupRemover remover(context.products.first(), context.groups.first());
+ ProjectFileGroupRemover remover(context.products.front(), context.groups.front());
remover.apply();
for (int i = 0; i < context.resolvedProducts.count(); ++i) {
diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp
index 942ab0efa..ced85e123 100644
--- a/src/lib/corelib/api/projectfileupdater.cpp
+++ b/src/lib/corelib/api/projectfileupdater.cpp
@@ -233,7 +233,7 @@ void ProjectFileGroupInserter::doApply(QString &fileContent, UiProgram *ast)
int lineOffset = 3 + 1; // Our text + a leading newline that is always added by the rewriter.
const QList<ChangeSet::EditOp> &editOps = changeSet.operationList();
QBS_CHECK(editOps.count() == 1);
- const ChangeSet::EditOp &insertOp = editOps.first();
+ const ChangeSet::EditOp &insertOp = editOps.front();
setLineOffset(lineOffset);
int insertionLine = fileContent.left(insertOp.pos1).count(QLatin1Char('\n'));
@@ -256,7 +256,7 @@ static const ChangeSet::EditOp &getEditOp(const ChangeSet &changeSet)
{
const QList<ChangeSet::EditOp> &editOps = changeSet.operationList();
QBS_CHECK(editOps.count() == 1);
- return editOps.first();
+ return editOps.front();
}
static int getLineOffsetForChangedBinding(const ChangeSet &changeSet, const QString &oldRhs)
@@ -345,9 +345,9 @@ void ProjectFileFilesAdder::doApply(QString &fileContent, UiProgram *ast)
}
// Insert new files "sorted", but do not change the order of existing files.
- const QString firstNewFileRepr = toJSLiteral(sortedFiles.first());
+ const QString firstNewFileRepr = toJSLiteral(sortedFiles.front());
while (!oldFileReprs.isEmpty()) {
- if (oldFileReprs.first() > firstNewFileRepr)
+ if (oldFileReprs.front() > firstNewFileRepr)
break;
addToFilesRepr(filesRepresentation, oldFileReprs.takeFirst(), arrayElemIndentation);
}
@@ -486,9 +486,9 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast)
}
const QString existingFile
= static_cast<StringLiteral *>(exprStatement->expression)->value.toString();
- if (existingFile != m_files.first()) {
+ if (existingFile != m_files.front()) {
throw ErrorInfo(Tr::tr("File '%1' could not be found in the 'files' list.")
- .arg(m_files.first()), bindingLocation);
+ .arg(m_files.front()), bindingLocation);
}
rewriter.changeBinding(itemFinder.item()->initializer, QLatin1String("files"),
QLatin1String("[]"), Rewriter::ScriptBinding);
@@ -539,7 +539,7 @@ void ProjectFileGroupRemover::doApply(QString &fileContent, UiProgram *ast)
setItemPosition(m_group.location());
const QList<ChangeSet::EditOp> &editOps = changeSet.operationList();
QBS_CHECK(editOps.count() == 1);
- const ChangeSet::EditOp &op = editOps.first();
+ const ChangeSet::EditOp &op = editOps.front();
const QString removedText = fileContent.mid(op.pos1, op.length1);
setLineOffset(-removedText.count(QLatin1Char('\n')));