1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Q_NULLPTR with nullptr in corelib

Browse Source 
Change-Id: I9cdb5b7015c62c50b35f8a6519ea4e777db97683
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Allan Sandfeld Jensen 2019-04-02 10:58:32 +02:00
parent 53abc0f664
commit 6c761a0db1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qflags.h
View File

@ -118,7 +118,7 @@ public:
Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other); Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other);
#endif #endif
Q_DECL_CONSTEXPR inline QFlags(Enum flags) Q_DECL_NOTHROW : i(Int(flags)) {} Q_DECL_CONSTEXPR inline QFlags(Enum flags) Q_DECL_NOTHROW : i(Int(flags)) {}
Q_DECL_CONSTEXPR inline QFlags(Zero = Q_NULLPTR) Q_DECL_NOTHROW : i(0) {} Q_DECL_CONSTEXPR inline QFlags(Zero = nullptr) Q_DECL_NOTHROW : i(0) {}
Q_DECL_CONSTEXPR inline QFlags(QFlag flag) Q_DECL_NOTHROW : i(flag) {} Q_DECL_CONSTEXPR inline QFlags(QFlag flag) Q_DECL_NOTHROW : i(flag) {}
#ifdef Q_COMPILER_INITIALIZER_LISTS #ifdef Q_COMPILER_INITIALIZER_LISTS

2
src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
View File

@ -55,7 +55,7 @@ public:
struct SourceModelForRowResult struct SourceModelForRowResult
{ {
SourceModelForRowResult() : sourceModel(Q_NULLPTR), sourceRow(-1) {} SourceModelForRowResult() : sourceModel(nullptr), sourceRow(-1) {}
QAbstractItemModel *sourceModel; QAbstractItemModel *sourceModel;
int sourceRow; int sourceRow;
}; };

2
src/corelib/kernel/qtestsupport_core.cpp
View File

@ -102,7 +102,7 @@ Q_CORE_EXPORT void QTest::qWait(int ms)
int remaining = ms; int remaining = ms;
do { do {
QCoreApplication::processEvents(QEventLoop::AllEvents, remaining); QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
QCoreApplication::sendPostedEvents(Q_NULLPTR, QEvent::DeferredDelete); QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
remaining = timer.remainingTime(); remaining = timer.remainingTime();
if (remaining <= 0) if (remaining <= 0)
break; break;