diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-06 11:11:44 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-09-05 07:07:44 +0200 |
commit | 8ef41d1713036c63510e9900a7b5e752bba485bc (patch) | |
tree | 5798e388d898c669c665297437c6535e974a21fb /qmake/generators | |
parent | 973a795bec836be88eb1d19657dfad26b9aa959f (diff) |
Use QList instead of QVector in qmake
Task-number: QTBUG-84469
Change-Id: I4a3da94702f1dad1ee10b1ba3c6712b6f40338c9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/makefile.cpp | 8 | ||||
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/makefiledeps.h | 10 | ||||
-rw-r--r-- | qmake/generators/metamakefile.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/projectgenerator.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d38b8ad9f4..51f7eb95a3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -601,7 +601,7 @@ MakefileGenerator::init() int x; //build up a list of compilers - QVector<Compiler> compilers; + QList<Compiler> compilers; { const char *builtins[] = { "OBJECTS", "SOURCES", "PRECOMPILED_HEADER", nullptr }; for(x = 0; builtins[x]; ++x) { @@ -764,7 +764,7 @@ MakefileGenerator::init() ProStringList incDirs = v["DEPENDPATH"] + v["QMAKE_ABSOLUTE_SOURCE_PATH"]; if(project->isActiveConfig("depend_includepath")) incDirs += v["INCLUDEPATH"]; - QVector<QMakeLocalFileName> deplist; + QList<QMakeLocalFileName> deplist; deplist.reserve(incDirs.size()); for (ProStringList::Iterator it = incDirs.begin(); it != incDirs.end(); ++it) deplist.append(QMakeLocalFileName((*it).toQString())); @@ -1826,7 +1826,7 @@ static QStringList splitDeps(const QString &indeps, bool lineMode) QString MakefileGenerator::resolveDependency(const QDir &outDir, const QString &file) { - const QVector<QMakeLocalFileName> &depdirs = QMakeSourceFileInfo::dependencyPaths(); + const QList<QMakeLocalFileName> &depdirs = QMakeSourceFileInfo::dependencyPaths(); for (const auto &depdir : depdirs) { const QString &local = depdir.local(); QString lf = outDir.absoluteFilePath(local + '/' + file); @@ -3095,7 +3095,7 @@ MakefileGenerator::findFileForDep(const QMakeLocalFileName &dep, const QMakeLoca if(Option::output_dir != qmake_getpwd() && QDir::isRelativePath(dep.real())) { //is it from the shadow tree - QVector<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths(); + QList<QMakeLocalFileName> depdirs = QMakeSourceFileInfo::dependencyPaths(); depdirs.prepend(fileInfo(file.real()).absoluteDir().path()); QString pwd = qmake_getpwd(); if(pwd.at(pwd.length()-1) != '/') diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 0ff64c4fbc..f1b1e4b216 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -192,10 +192,10 @@ void QMakeSourceFileInfo::dependTreeWalker(SourceFile *node, SourceDependChildre } } -void QMakeSourceFileInfo::setDependencyPaths(const QVector<QMakeLocalFileName> &l) +void QMakeSourceFileInfo::setDependencyPaths(const QList<QMakeLocalFileName> &l) { // Ensure that depdirs does not contain the same paths several times, to minimize the stats - QVector<QMakeLocalFileName> ll; + QList<QMakeLocalFileName> ll; for (int i = 0; i < l.count(); ++i) { if (!ll.contains(l.at(i))) ll.append(l.at(i)); diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index b97ace42a6..31587371ef 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -31,9 +31,9 @@ #include <proitems.h> -#include <qstringlist.h> #include <qfileinfo.h> -#include <qvector.h> +#include <qlist.h> +#include <qstringlist.h> QT_BEGIN_NAMESPACE @@ -66,7 +66,7 @@ private: //quick project lookups SourceFiles *files, *includes; bool files_changed; - QVector<QMakeLocalFileName> depdirs; + QList<QMakeLocalFileName> depdirs; QStringList systemIncludes; //sleezy buffer code @@ -89,8 +89,8 @@ public: QMakeSourceFileInfo(); virtual ~QMakeSourceFileInfo(); - QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; } - void setDependencyPaths(const QVector<QMakeLocalFileName> &); + QList<QMakeLocalFileName> dependencyPaths() const { return depdirs; } + void setDependencyPaths(const QList<QMakeLocalFileName> &); enum DependencyMode { Recursive, NonRecursive }; inline void setDependencyMode(DependencyMode mode) { dep_mode = mode; } diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp index 7776d77008..8d1eb1d886 100644 --- a/qmake/generators/metamakefile.cpp +++ b/qmake/generators/metamakefile.cpp @@ -258,7 +258,7 @@ void BuildsMetaMakefileGenerator::checkForConflictingTargets() const return; } using TargetInfo = std::pair<Build *, ProString>; - QVector<TargetInfo> targets; + QList<TargetInfo> targets; const int last = makefiles.count() - 1; targets.resize(last); for (int i = 0; i < last; ++i) { diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index ac6793cbf3..4e1b32fb69 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -215,7 +215,7 @@ ProjectGenerator::init() } //setup deplist - QVector<QMakeLocalFileName> deplist; + QList<QMakeLocalFileName> deplist; { const ProStringList &d = v["DEPENDPATH"]; for(int i = 0; i < d.size(); ++i) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index f7bd6dc663..07f8d861dc 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -391,7 +391,7 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) bool UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) { - QVector<QMakeLocalFileName> libdirs, frameworkdirs; + QList<QMakeLocalFileName> libdirs, frameworkdirs; int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) libdirs.append(QMakeLocalFileName(dlib.toQString())); diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 8793c793ef..67310cc33c 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -958,7 +958,7 @@ public: VCCLCompilerTool CompilerTool; }; -typedef QVector<VCFilter> VCFilterList; +typedef QList<VCFilter> VCFilterList; class VCProjectSingleConfig { public: diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index ddb6bf5b4e..477205a7f7 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -355,7 +355,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt QHash<QString, ProStringList> &subdirProjectLookup, const ProStringList &allDependencies) { - QVector<QPair<QString, ProStringList> > collectedSubdirs; + QList<QPair<QString, ProStringList>> collectedSubdirs; ProStringList tmp_proj_subdirs = proj->values("SUBDIRS"); ProStringList projectsInProject; const int numSubdirs = tmp_proj_subdirs.size(); diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 0c32be8ef6..422919b872 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -102,7 +102,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS"); if (impexts.isEmpty()) impexts = project->values("QMAKE_EXTENSION_STATICLIB"); - QVector<LibrarySearchPath> dirs; + QList<LibrarySearchPath> dirs; int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) dirs.append(LibrarySearchPath(dlib.toQString(), true)); |