aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/corelib/api/project.cpp16
-rw-r--r--src/lib/corelib/api/project_p.h2
-rw-r--r--src/lib/corelib/buildgraph/buildgraphloader.cpp4
-rw-r--r--src/lib/corelib/language/language.cpp16
-rw-r--r--src/lib/corelib/language/language.h14
-rw-r--r--src/lib/corelib/language/projectresolver.cpp2
-rw-r--r--src/lib/corelib/language/projectresolver.h2
-rw-r--r--tests/auto/language/tst_language.cpp24
8 files changed, 39 insertions, 41 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 108eded8c..eda7ac3e5 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -269,13 +269,13 @@ GroupData ProjectPrivate::createGroupDataFromGroup(const GroupPtr &resolvedGroup
group.d->name = resolvedGroup->name;
group.d->prefix = resolvedGroup->prefix;
group.d->location = resolvedGroup->location;
- for (const SourceArtifactConstPtr &sa : qAsConst(resolvedGroup->files)) {
+ for (const SourceArtifactConstPtr &sa : resolvedGroup->files) {
ArtifactData artifact = createApiSourceArtifact(sa);
setupInstallData(artifact, product);
group.d->sourceArtifacts.push_back(artifact);
}
if (resolvedGroup->wildcards) {
- for (const SourceArtifactConstPtr &sa : qAsConst(resolvedGroup->wildcards->files)) {
+ for (const SourceArtifactConstPtr &sa : resolvedGroup->wildcards->files) {
ArtifactData artifact = createApiSourceArtifact(sa);
setupInstallData(artifact, product);
group.d->sourceArtifactsFromWildcards.push_back(artifact);
@@ -497,7 +497,7 @@ void ProjectPrivate::addFiles(const ProductData &product, const GroupData &group
// due to conditions.
for (const GroupPtr &group : qAsConst(groupContext.resolvedGroups)) {
for (const QString &filePath : qAsConst(filesContext.absoluteFilePaths)) {
- for (const SourceArtifactConstPtr &sa : qAsConst(group->files)) {
+ for (const SourceArtifactConstPtr &sa : group->files) {
if (sa->absoluteFilePath == filePath) {
throw ErrorInfo(Tr::tr("File '%1' already exists in group '%2'.")
.arg(filePath, group->name));
@@ -574,8 +574,8 @@ void ProjectPrivate::removeFiles(const ProductData &product, const GroupData &gr
.arg(filesContext.absoluteFilePathsFromWildcards.join(QLatin1String(", "))));
}
QStringList filesNotFound = filesContext.absoluteFilePaths;
- QList<SourceArtifactPtr> sourceArtifacts;
- for (const SourceArtifactPtr &sa : qAsConst(groupContext.resolvedGroups.front()->files)) {
+ std::vector<SourceArtifactPtr> sourceArtifacts;
+ for (const SourceArtifactPtr &sa : groupContext.resolvedGroups.front()->files) {
if (filesNotFound.removeOne(sa->absoluteFilePath))
sourceArtifacts << sa;
}
@@ -591,8 +591,8 @@ void ProjectPrivate::removeFiles(const ProductData &product, const GroupData &gr
for (int i = 0; i < groupContext.resolvedProducts.size(); ++i) {
removeFilesFromBuildGraph(groupContext.resolvedProducts.at(i), sourceArtifacts);
- for (const SourceArtifactPtr &sa : qAsConst(sourceArtifacts))
- groupContext.resolvedGroups.at(i)->files.removeOne(sa);
+ for (const SourceArtifactPtr &sa : sourceArtifacts)
+ removeOne(groupContext.resolvedGroups.at(i)->files, sa);
}
doSanityChecks(internalProject, logger);
@@ -634,7 +634,7 @@ void ProjectPrivate::removeGroup(const ProductData &product, const GroupData &gr
#endif // QBS_ENABLE_PROJECT_FILE_UPDATES
void ProjectPrivate::removeFilesFromBuildGraph(const ResolvedProductConstPtr &product,
- const QList<SourceArtifactPtr> &files)
+ const std::vector<SourceArtifactPtr> &files)
{
if (!product->enabled)
return;
diff --git a/src/lib/corelib/api/project_p.h b/src/lib/corelib/api/project_p.h
index 252f2225a..58f61a5bc 100644
--- a/src/lib/corelib/api/project_p.h
+++ b/src/lib/corelib/api/project_p.h
@@ -115,7 +115,7 @@ public:
const QStringList &filePaths);
void removeGroup(const ProductData &product, const GroupData &group);
void removeFilesFromBuildGraph(const ResolvedProductConstPtr &product,
- const QList<SourceArtifactPtr> &files);
+ const std::vector<SourceArtifactPtr> &files);
void updateInternalCodeLocations(const ResolvedProjectPtr &project,
const CodeLocation &changeLocation, int lineOffset);
void updateExternalCodeLocations(const ProjectData &project,
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index b8bbb94ec..a65f9f4e8 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -591,10 +591,8 @@ bool BuildGraphLoader::hasProductFileChanged(const QList<ResolvedProductPtr> &re
FileInfo::path(group->location.filePath()),
product->topLevelProject()->buildDirectory);
Set<QString> wcFiles;
- for (const SourceArtifactConstPtr &sourceArtifact
- : qAsConst(group->wildcards->files)) {
+ for (const SourceArtifactConstPtr &sourceArtifact : group->wildcards->files)
wcFiles += sourceArtifact->absoluteFilePath;
- }
if (files == wcFiles)
continue;
hasChanged = true;
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index fd3679f89..a7956931d 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -150,9 +150,9 @@ bool Probe::needsReconfigure(const FileTime &referenceTime) const
* \brief Returns all files specified in the group item as source artifacts.
* This includes the expanded list of wildcards.
*/
-QList<SourceArtifactPtr> ResolvedGroup::allFiles() const
+std::vector<SourceArtifactPtr> ResolvedGroup::allFiles() const
{
- QList<SourceArtifactPtr> lst = files;
+ std::vector<SourceArtifactPtr> lst = files;
if (wildcards)
lst << wildcards->files;
return lst;
@@ -333,9 +333,9 @@ void ResolvedProduct::accept(BuildGraphVisitor *visitor) const
* \brief Returns all files of all groups as source artifacts.
* This includes the expanded list of wildcards.
*/
-QList<SourceArtifactPtr> ResolvedProduct::allFiles() const
+std::vector<SourceArtifactPtr> ResolvedProduct::allFiles() const
{
- QList<SourceArtifactPtr> lst;
+ std::vector<SourceArtifactPtr> lst;
for (const GroupConstPtr &group : groups)
lst << group->allFiles();
return lst;
@@ -345,9 +345,9 @@ QList<SourceArtifactPtr> ResolvedProduct::allFiles() const
* \brief Returns all files of all enabled groups as source artifacts.
* \sa ResolvedProduct::allFiles()
*/
-QList<SourceArtifactPtr> ResolvedProduct::allEnabledFiles() const
+std::vector<SourceArtifactPtr> ResolvedProduct::allEnabledFiles() const
{
- QList<SourceArtifactPtr> lst;
+ std::vector<SourceArtifactPtr> lst;
for (const GroupConstPtr &group : groups) {
if (group->enabled)
lst << group->allFiles();
@@ -879,8 +879,8 @@ bool operator==(const SourceArtifactInternal &sa1, const SourceArtifactInternal
&& *sa1.properties == *sa2.properties;
}
-bool sourceArtifactSetsAreEqual(const QList<SourceArtifactPtr> &l1,
- const QList<SourceArtifactPtr> &l2)
+bool sourceArtifactSetsAreEqual(const std::vector<SourceArtifactPtr> &l1,
+ const std::vector<SourceArtifactPtr> &l2)
{
return listsAreEqual(l1, l2);
}
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index 524c9cb27..ac8231da2 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -245,8 +245,8 @@ inline bool operator!=(const SourceArtifactInternal &sa1, const SourceArtifactIn
return !(sa1 == sa2);
}
-bool sourceArtifactSetsAreEqual(const QList<SourceArtifactPtr> &l1,
- const QList<SourceArtifactPtr> &l2);
+bool sourceArtifactSetsAreEqual(const std::vector<SourceArtifactPtr> &l1,
+ const std::vector<SourceArtifactPtr> &l2);
class SourceWildCards
{
@@ -258,7 +258,7 @@ public:
QStringList patterns;
QStringList excludePatterns;
std::vector<std::pair<QString, FileTime>> dirTimeStamps;
- QList<SourceArtifactPtr> files;
+ std::vector<SourceArtifactPtr> files;
template<PersistentPool::OpType opType> void completeSerializationOp(PersistentPool &pool)
{
@@ -283,14 +283,14 @@ public:
QString name;
bool enabled;
QString prefix;
- QList<SourceArtifactPtr> files;
+ std::vector<SourceArtifactPtr> files;
std::unique_ptr<SourceWildCards> wildcards;
PropertyMapPtr properties;
FileTags fileTags;
QString targetOfModule;
bool overrideTags;
- QList<SourceArtifactPtr> allFiles() const;
+ std::vector<SourceArtifactPtr> allFiles() const;
void load(PersistentPool &pool);
void store(PersistentPool &pool);
@@ -588,8 +588,8 @@ public:
QProcessEnvironment runEnvironment; // must not be saved
void accept(BuildGraphVisitor *visitor) const;
- QList<SourceArtifactPtr> allFiles() const;
- QList<SourceArtifactPtr> allEnabledFiles() const;
+ std::vector<SourceArtifactPtr> allFiles() const;
+ std::vector<SourceArtifactPtr> allEnabledFiles() const;
FileTags fileTagsForFileName(const QString &fileName) const;
void registerArtifactWithChangedInputs(Artifact *artifact);
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index c25e252bf..592a2a41c 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -1386,7 +1386,7 @@ ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies(
}
void ProjectResolver::matchArtifactProperties(const ResolvedProductPtr &product,
- const QList<SourceArtifactPtr> &artifacts)
+ const std::vector<SourceArtifactPtr> &artifacts)
{
for (const SourceArtifactPtr &artifact : artifacts) {
for (const ArtifactPropertiesConstPtr &artifactProperties : product->artifactProperties) {
diff --git a/src/lib/corelib/language/projectresolver.h b/src/lib/corelib/language/projectresolver.h
index cbbf5d804..660bf6259 100644
--- a/src/lib/corelib/language/projectresolver.h
+++ b/src/lib/corelib/language/projectresolver.h
@@ -157,7 +157,7 @@ private:
const PropertyDeclaration &decl) const;
QString sourceCodeForEvaluation(const JSSourceValueConstPtr &value) const;
static void matchArtifactProperties(const ResolvedProductPtr &product,
- const QList<SourceArtifactPtr> &artifacts);
+ const std::vector<SourceArtifactPtr> &artifacts);
void printProfilingInfo();
void collectPropertiesForExportItem(Item *productModuleInstance);
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 3af06466a..1545bc07c 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -611,7 +611,7 @@ void TestLanguage::enumerateProjectProperties()
auto product = products.values().front();
auto files = product->groups.front()->allFiles();
QCOMPARE(product->groups.size(), size_t(1));
- QCOMPARE(files.size(), 1);
+ QCOMPARE(files.size(), size_t(1));
auto fileName = FileInfo::fileName(files.front()->absoluteFilePath);
QCOMPARE(fileName, QString("dummy.txt"));
} catch (const ErrorInfo &e) {
@@ -2061,14 +2061,14 @@ void TestLanguage::outerInGroup()
GroupPtr group = product->groups.at(0);
QVERIFY(!!group);
QCOMPARE(group->name, product->name);
- QCOMPARE(group->files.size(), 1);
+ QCOMPARE(group->files.size(), size_t(1));
SourceArtifactConstPtr artifact = group->files.front();
QVariant installDir = artifact->properties->qbsPropertyValue("installDir");
QCOMPARE(installDir.toString(), QString("/somewhere"));
group = product->groups.at(1);
QVERIFY(!!group);
QCOMPARE(group->name, QString("Special Group"));
- QCOMPARE(group->files.size(), 1);
+ QCOMPARE(group->files.size(), size_t(1));
artifact = group->files.front();
installDir = artifact->properties->qbsPropertyValue("installDir");
QCOMPARE(installDir.toString(), QString("/somewhere/else"));
@@ -2571,27 +2571,27 @@ void TestLanguage::relaxedErrorMode()
const ResolvedProductConstPtr brokenProduct = productMap.value("broken");
QVERIFY(!brokenProduct->enabled);
QVERIFY(brokenProduct->location.isValid());
- QCOMPARE(brokenProduct->allFiles().size(), 0);
+ QCOMPARE(brokenProduct->allFiles().size(), size_t(0));
const ResolvedProductConstPtr dependerRequired = productMap.value("depender required");
QVERIFY(!dependerRequired->enabled);
QVERIFY(dependerRequired->location.isValid());
- QCOMPARE(dependerRequired->allFiles().size(), 1);
+ QCOMPARE(dependerRequired->allFiles().size(), size_t(1));
const ResolvedProductConstPtr dependerNonRequired
= productMap.value("depender nonrequired");
QVERIFY(dependerNonRequired->enabled);
- QCOMPARE(dependerNonRequired->allFiles().size(), 1);
+ QCOMPARE(dependerNonRequired->allFiles().size(), size_t(1));
const ResolvedProductConstPtr recursiveDepender = productMap.value("recursive depender");
QVERIFY(!recursiveDepender->enabled);
QVERIFY(recursiveDepender->location.isValid());
- QCOMPARE(recursiveDepender->allFiles().size(), 1);
+ QCOMPARE(recursiveDepender->allFiles().size(), size_t(1));
const ResolvedProductConstPtr missingFile = productMap.value("missing file");
QVERIFY(missingFile->enabled);
QCOMPARE(missingFile->groups.size(), size_t(1));
QVERIFY(missingFile->groups.front()->enabled);
- QCOMPARE(missingFile->groups.front()->allFiles().size(), 2);
+ QCOMPARE(missingFile->groups.front()->allFiles().size(), size_t(2));
const ResolvedProductConstPtr fine = productMap.value("fine");
QVERIFY(fine->enabled);
- QCOMPARE(fine->allFiles().size(), 1);
+ QCOMPARE(fine->allFiles().size(), size_t(1));
} catch (const ErrorInfo &e) {
QVERIFY2(strictMode, qPrintable(e.toString()));
}
@@ -2754,7 +2754,7 @@ void TestLanguage::fileTags()
QCOMPARE(product->groups.size(), numberOfGroups);
GroupPtr group = *(product->groups.end() - 1);
QVERIFY(!!group);
- QCOMPARE(group->files.size(), 1);
+ QCOMPARE(group->files.size(), size_t(1));
SourceArtifactConstPtr sourceFile = group->files.front();
QStringList fileTags = sourceFile->fileTags.toStringList();
fileTags.sort();
@@ -2981,10 +2981,10 @@ void TestLanguage::wildcards()
group = product->groups.front();
}
QVERIFY(!!group);
- QCOMPARE(group->files.size(), 0);
+ QCOMPARE(group->files.size(), size_t(0));
QVERIFY(!!group->wildcards);
QStringList actualFilePaths;
- for (const SourceArtifactConstPtr &artifact : qAsConst(group->wildcards->files)) {
+ for (const SourceArtifactConstPtr &artifact : group->wildcards->files) {
QString str = artifact->absoluteFilePath;
int idx = str.indexOf(m_wildcardsTestDirPath);
if (idx != -1)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 16:00:10 +0000