diff options
| author | Marc Mutz <[email protected]> | 2019-06-18 20:11:18 +0200 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2019-07-15 10:56:00 +0200 |
| commit | 0ca7c0a5757a496af24d621ce54a3c93f24be976 (patch) | |
| tree | 3bfa7f35116ee864cd4f7a1646c33d39436d1990 | |
| parent | 8155d0693f596c6b73d0acd977d5077dd7a6e6ea (diff) | |
QMake: be less laissez-faire with implicit conversions to QChar
QChar currently is convertible from nearly every integral type. This
is bad code hygiene and should be fixed come Qt 6.
The present patch is the result of compile fixes from marking these
constructors explicit.
Amends 60ca2f5f7c38178cfe62d3dbe1b8dacfe43cbac9.
Change-Id: I06887104d42f8327eb6196afcde5f942a74a6a78
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Mårten Nordheim <[email protected]>
| -rw-r--r-- | qmake/library/proitems.cpp | 4 | ||||
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 4 | ||||
| -rw-r--r-- | qmake/library/qmakeparser.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qmake/library/proitems.cpp b/qmake/library/proitems.cpp index 41bed69f00a..9330c2b1bf8 100644 --- a/qmake/library/proitems.cpp +++ b/qmake/library/proitems.cpp @@ -238,7 +238,7 @@ ProString &ProString::append(const ProString &other, bool *pending) QChar *ptr; if (pending && !*pending) { ptr = prepareExtend(1 + other.m_length, 0, m_length); - *ptr++ = 32; + *ptr++ = QLatin1Char(' '); } else { ptr = prepareExtend(other.m_length, 0, m_length); } @@ -276,7 +276,7 @@ ProString &ProString::append(const ProStringList &other, bool *pending, bool ski QChar *ptr = prepareExtend(totalLength, 0, m_length); for (int i = startIdx; i < sz; ++i) { if (putSpace) - *ptr++ = 32; + *ptr++ = QLatin1Char(' '); else putSpace = true; const ProString &str = other.at(i); diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index ba617932ce1..e15a4bfc501 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1583,8 +1583,8 @@ void QMakeEvaluator::updateFeaturePaths() } for (int i = 0; i < feature_roots.count(); ++i) - if (!feature_roots.at(i).endsWith((ushort)'/')) - feature_roots[i].append((ushort)'/'); + if (!feature_roots.at(i).endsWith(QLatin1Char('/'))) + feature_roots[i].append(QLatin1Char('/')); feature_roots.removeDuplicates(); diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index 4c8360b4598..ffe90ebda71 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/qmakeparser.cpp @@ -621,7 +621,7 @@ void QMakeParser::read(ProFile *pro, const QStringRef &in, int line, SubGrammar if (c != term) { parseError(fL1S("Missing %1 terminator [found %2]") .arg(QChar(term)) - .arg(c ? QString(c) : QString::fromLatin1("end-of-line"))); + .arg(c ? QString(QChar(c)) : QString::fromLatin1("end-of-line"))); m_inError = true; // Just parse on, as if there was a terminator ... } else { |