diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-27 15:02:50 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:14:59 +0000 |
commit | aa30f49d6a38c77693ecf58ea9cbd13470e5fe9c (patch) | |
tree | 571f9387ce53f085b4208698c3e7967f1e5eb281 /qmake/generators/makefile.cpp | |
parent | 2b31356ac9faaa3ad9522d3e8b0dd00d90877476 (diff) | |
download | qtbase-aa30f49d6a38c77693ecf58ea9cbd13470e5fe9c.tar.gz |
prune pointless assignments of QString::replace() and remove() results
they operate in-place.
Change-Id: Iab6f2f6a9f6f67b9d70feb77ec719e424909022d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r-- | qmake/generators/makefile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 5d9ce7af08..395e9e08c5 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2280,7 +2280,7 @@ MakefileGenerator::findSubDirsSubTargets() const ProString ofile = subdirs[subdir]; QString oname = ofile.toQString(); QString fixedSubdir = oname; - fixedSubdir = fixedSubdir.replace(QRegExp("[^a-zA-Z0-9_]"),"-"); + fixedSubdir.replace(QRegExp("[^a-zA-Z0-9_]"),"-"); SubTarget *st = new SubTarget; st->name = oname; @@ -2345,7 +2345,7 @@ MakefileGenerator::findSubDirsSubTargets() const if(subdirs[subDep] == depends.at(depend)) { QString subName = subdirs[subDep].toQString(); QString fixedSubDep = subName; - fixedSubDep = fixedSubDep.replace(QRegExp("[^a-zA-Z0-9_]"),"-"); + fixedSubDep.replace(QRegExp("[^a-zA-Z0-9_]"),"-"); const ProKey dtkey(fixedSubDep + ".target"); if (!project->isEmpty(dtkey)) { st->depends += project->first(dtkey); @@ -2376,7 +2376,7 @@ MakefileGenerator::findSubDirsSubTargets() const st->target = project->first(tkey).toQString(); } else { st->target = "sub-" + file; - st->target = st->target.replace(QRegExp("[^a-zA-Z0-9_]"),"-"); + st->target.replace(QRegExp("[^a-zA-Z0-9_]"), "-"); } } } @@ -3146,7 +3146,7 @@ MakefileGenerator::pkgConfigFixPath(QString path) const { QString prefix = pkgConfigPrefix(); if(path.startsWith(prefix)) - path = path.replace(prefix, "${prefix}"); + path.replace(prefix, "${prefix}"); return path; } |