diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-08-03 00:22:24 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-14 13:51:18 +0000 |
commit | 22809a142e08955554c54be452f6ff2e079a7fd8 (patch) | |
tree | 721f56e8c6eba300b24adf036c14550e74798379 | |
parent | 5989ab6e8482862c3888eeab4d5bc806b81e1db8 (diff) | |
download | qttools-22809a142e08955554c54be452f6ff2e079a7fd8.tar.gz |
qmake: Apply modernize-use-nullptr
Use nullptr instead of 0.
Change-Id: Ib3120b9c424a274a2d4dd4c42ec5d7cd5bdead65
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from qtbase/a959a0e20695c4b38cf201d194e1ed7b0331e233)
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r-- | src/linguist/shared/ioutils.cpp | 6 | ||||
-rw-r--r-- | src/linguist/shared/proitems.h | 12 | ||||
-rw-r--r-- | src/linguist/shared/qmakebuiltins.cpp | 2 | ||||
-rw-r--r-- | src/linguist/shared/qmakeevaluator.cpp | 12 | ||||
-rw-r--r-- | src/linguist/shared/qmakeevaluator.h | 4 | ||||
-rw-r--r-- | src/linguist/shared/qmakeparser.cpp | 12 | ||||
-rw-r--r-- | src/linguist/shared/qmakeparser.h | 2 | ||||
-rw-r--r-- | src/linguist/shared/qmakevfs.cpp | 2 |
8 files changed, 26 insertions, 26 deletions
diff --git a/src/linguist/shared/ioutils.cpp b/src/linguist/shared/ioutils.cpp index 4abbbfc6d..12e3d63f5 100644 --- a/src/linguist/shared/ioutils.cpp +++ b/src/linguist/shared/ioutils.cpp @@ -201,7 +201,7 @@ QString IoUtils::shellQuoteWin(const QString &arg) # if defined(Q_OS_WIN) static QString windowsErrorCode() { - wchar_t *string = 0; + wchar_t *string = nullptr; FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), @@ -245,7 +245,7 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF return false; } FILETIME ft; - GetFileTime(rHand, 0, 0, &ft); + GetFileTime(rHand, NULL, NULL, &ft); CloseHandle(rHand); HANDLE wHand = CreateFile((wchar_t*)targetFileName.utf16(), GENERIC_WRITE, FILE_SHARE_READ, @@ -254,7 +254,7 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF *errorString = fL1S("Cannot open %1: %2").arg(targetFileName, windowsErrorCode()); return false; } - SetFileTime(wHand, 0, 0, &ft); + SetFileTime(wHand, NULL, NULL, &ft); CloseHandle(wHand); # endif return true; diff --git a/src/linguist/shared/proitems.h b/src/linguist/shared/proitems.h index 7ecc663f6..c7af53b1c 100644 --- a/src/linguist/shared/proitems.h +++ b/src/linguist/shared/proitems.h @@ -78,12 +78,12 @@ public: int sourceFile() const { return m_file; } ProString &prepend(const ProString &other); - ProString &append(const ProString &other, bool *pending = 0); + ProString &append(const ProString &other, bool *pending = nullptr); ProString &append(const QString &other) { return append(ProString(other)); } ProString &append(const QLatin1String other); ProString &append(const char *other) { return append(QLatin1String(other)); } ProString &append(QChar other); - ProString &append(const ProStringList &other, bool *pending = 0, bool skipEmpty1st = false); + ProString &append(const ProStringList &other, bool *pending = nullptr, bool skipEmpty1st = false); ProString &operator+=(const ProString &other) { return append(other); } ProString &operator+=(const QString &other) { return append(other); } ProString &operator+=(const QLatin1String other) { return append(other); } @@ -133,9 +133,9 @@ public: bool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(s, 0, cs) >= 0; } bool contains(const char *s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(QLatin1String(s), 0, cs) >= 0; } bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return indexOf(c, 0, cs) >= 0; } - int toLongLong(bool *ok = 0, int base = 10) const { return toQStringRef().toLongLong(ok, base); } - int toInt(bool *ok = 0, int base = 10) const { return toQStringRef().toInt(ok, base); } - short toShort(bool *ok = 0, int base = 10) const { return toQStringRef().toShort(ok, base); } + int toLongLong(bool *ok = nullptr, int base = 10) const { return toQStringRef().toLongLong(ok, base); } + int toInt(bool *ok = nullptr, int base = 10) const { return toQStringRef().toInt(ok, base); } + short toShort(bool *ok = nullptr, int base = 10) const { return toQStringRef().toShort(ok, base); } uint hash() const { return m_hash; } static uint hash(const QChar *p, int n); @@ -261,7 +261,7 @@ class ProStringRwUser : public ProStringRoUser { public: ProStringRwUser(QString &rs) - : ProStringRoUser(rs), m_ps(0) {} + : ProStringRoUser(rs), m_ps(nullptr) {} ProStringRwUser(const ProString &ps, QString &rs) : ProStringRoUser(ps, rs), m_ps(&ps) {} QString &set(const ProString &ps) { m_ps = &ps; return ProStringRoUser::set(ps); } diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp index 0f28717e3..b8eafa0b3 100644 --- a/src/linguist/shared/qmakebuiltins.cpp +++ b/src/linguist/shared/qmakebuiltins.cpp @@ -1680,7 +1680,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( #endif case T_INCLUDE: { QString parseInto; - LoadFlags flags = 0; + LoadFlags flags; if (m_cumulative) flags = LoadSilent; if (args.count() >= 2) { diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp index f594748f3..b72163248 100644 --- a/src/linguist/shared/qmakeevaluator.cpp +++ b/src/linguist/shared/qmakeevaluator.cpp @@ -118,7 +118,7 @@ bool operator==(const QMakeBaseKey &one, const QMakeBaseKey &two) } QMakeBaseEnv::QMakeBaseEnv() - : evaluator(0) + : evaluator(nullptr) { #ifdef PROEVALUATOR_THREAD_SAFE inProgress = false; @@ -215,7 +215,7 @@ QMakeEvaluator::QMakeEvaluator(QMakeGlobals *option, QMakeParser *parser, QMakeV initStatics(); // Configuration, more or less - m_caller = 0; + m_caller = nullptr; #ifdef PROEVALUATOR_CUMULATIVE m_cumulative = false; #endif @@ -941,7 +941,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProVariable( if (varName == statics.strTEMPLATE) setTemplate(); else if (varName == statics.strQMAKE_PLATFORM) - m_featureRoots = 0; + m_featureRoots = nullptr; else if (varName == statics.strQMAKE_DIR_SEP) m_dirSep = first(varName); else if (varName == statics.strQMAKESPEC) { @@ -950,7 +950,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProVariable( if (IoUtils::isAbsolutePath(spec)) { m_qmakespec = spec; m_qmakespecName = IoUtils::fileName(m_qmakespec).toString(); - m_featureRoots = 0; + m_featureRoots = nullptr; } } } @@ -1594,7 +1594,7 @@ ProFile *QMakeEvaluator::currentProFile() const { if (m_profileStack.count() > 0) return m_profileStack.top(); - return 0; + return nullptr; } int QMakeEvaluator::currentFileId() const @@ -1874,7 +1874,7 @@ ProValueMap *QMakeEvaluator::findValues(const ProKey &variableName, ProValueMap: if (first && isFunctParam(variableName)) break; } - return 0; + return nullptr; } ProStringList &QMakeEvaluator::valuesRef(const ProKey &variableName) diff --git a/src/linguist/shared/qmakeevaluator.h b/src/linguist/shared/qmakeevaluator.h index 92a24a569..83adda3f6 100644 --- a/src/linguist/shared/qmakeevaluator.h +++ b/src/linguist/shared/qmakeevaluator.h @@ -282,9 +282,9 @@ public: #endif struct Location { - Location() : pro(0), line(0) {} + Location() : pro(nullptr), line(0) {} Location(ProFile *_pro, ushort _line) : pro(_pro), line(_line) {} - void clear() { pro = 0; line = 0; } + void clear() { pro = nullptr; line = 0; } ProFile *pro; ushort line; }; diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index 9c13b8a7f..f7ad73b35 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -221,7 +221,7 @@ ProFile *QMakeParser::parsedProFile(const QString &fileName, ParseFlags flags) pro->itemsRef()->squeeze(); pro->ref(); } else { - pro = 0; + pro = nullptr; } ent->pro = pro; #ifdef PROPARSER_THREAD_SAFE @@ -240,7 +240,7 @@ ProFile *QMakeParser::parsedProFile(const QString &fileName, ParseFlags flags) if (readFile(id, flags, &contents)) pro = parsedProBlock(QStringRef(&contents), id, fileName, 1, FullGrammar); else - pro = 0; + pro = nullptr; } return pro; } @@ -443,7 +443,7 @@ void QMakeParser::read(ProFile *pro, const QStringRef &in, int line, SubGrammar if (context == CtxPureValue) { end = inend; - cptr = 0; + cptr = nullptr; lineCont = false; indent = 0; // just gcc being stupid goto nextChr; @@ -455,7 +455,7 @@ void QMakeParser::read(ProFile *pro, const QStringRef &in, int line, SubGrammar // First, skip leading whitespace for (indent = 0; ; ++cur, ++indent) { if (cur == inend) { - cur = 0; + cur = nullptr; goto flushLine; } c = *cur; @@ -1118,7 +1118,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg if (uc == ptr) { // for(literal) (only "ever" would be legal if qmake was sane) putTok(tokPtr, TokForLoop); - putHashStr(tokPtr, (ushort *)0, (uint)0); + putHashStr(tokPtr, nullptr, (uint)0); putBlockLen(tokPtr, 1 + 3 + nlen + 1); putTok(tokPtr, TokHashLiteral); putHashStr(tokPtr, uce + 2, nlen); @@ -1141,7 +1141,7 @@ void QMakeParser::finalizeCall(ushort *&tokPtr, ushort *uc, ushort *ptr, int arg } else if (argc == 1) { // for(non-literal) (this wouldn't be here if qmake was sane) putTok(tokPtr, TokForLoop); - putHashStr(tokPtr, (ushort *)0, (uint)0); + putHashStr(tokPtr, nullptr, (uint)0); uc = uce; goto doFor; } diff --git a/src/linguist/shared/qmakeparser.h b/src/linguist/shared/qmakeparser.h index af3403df7..ae76d8c46 100644 --- a/src/linguist/shared/qmakeparser.h +++ b/src/linguist/shared/qmakeparser.h @@ -110,7 +110,7 @@ private: }; struct BlockScope { - BlockScope() : start(0), braceLevel(0), special(false), inBranch(false), nest(NestNone) {} + BlockScope() : start(nullptr), braceLevel(0), special(false), inBranch(false), nest(NestNone) {} BlockScope(const BlockScope &other) { *this = other; } ushort *start; // Where this block started; store length here int braceLevel; // Nesting of braces in scope diff --git a/src/linguist/shared/qmakevfs.cpp b/src/linguist/shared/qmakevfs.cpp index c3bf02b1d..2dec62a18 100644 --- a/src/linguist/shared/qmakevfs.cpp +++ b/src/linguist/shared/qmakevfs.cpp @@ -50,7 +50,7 @@ QMakeVfs::QMakeVfs() #endif { #ifndef QT_NO_TEXTCODEC - m_textCodec = 0; + m_textCodec = nullptr; #endif ref(); } |