diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2017-11-18 19:07:25 +0300 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-20 21:03:07 +0000 |
commit | 7494bf59c28570dcc6ed6019f979e5625956c8af (patch) | |
tree | 3fb1e7fab1d064ebda1e78ffb21b06bd83e5107f /src/lib/corelib/api | |
parent | 95c1e81382246f5235322eeb6876f77f65b22c19 (diff) |
Use nullptr to initialize the pointers
Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/api')
-rw-r--r-- | src/lib/corelib/api/changeset.cpp | 12 | ||||
-rw-r--r-- | src/lib/corelib/api/internaljobs.cpp | 8 | ||||
-rw-r--r-- | src/lib/corelib/api/internaljobs.h | 10 | ||||
-rw-r--r-- | src/lib/corelib/api/projectfileupdater.cpp | 4 | ||||
-rw-r--r-- | src/lib/corelib/api/qmljsrewriter.cpp | 32 |
5 files changed, 33 insertions, 33 deletions
diff --git a/src/lib/corelib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp index f5d60df80..699270b39 100644 --- a/src/lib/corelib/api/changeset.cpp +++ b/src/lib/corelib/api/changeset.cpp @@ -44,12 +44,12 @@ namespace QbsQmlJS { ChangeSet::ChangeSet() - : m_string(0), m_cursor(0), m_error(false) + : m_string(nullptr), m_cursor(nullptr), m_error(false) { } ChangeSet::ChangeSet(const QList<EditOp> &operations) - : m_string(0), m_cursor(0), m_operationList(operations), m_error(false) + : m_string(nullptr), m_cursor(nullptr), m_operationList(operations), m_error(false) { } @@ -130,8 +130,8 @@ QList<ChangeSet::EditOp> ChangeSet::operationList() const void ChangeSet::clear() { - m_string = 0; - m_cursor = 0; + m_string = nullptr; + m_cursor = nullptr; m_operationList.clear(); m_error = false; } @@ -345,14 +345,14 @@ void ChangeSet::apply(QString *s) { m_string = s; apply_helper(); - m_string = 0; + m_string = nullptr; } void ChangeSet::apply(QTextCursor *textCursor) { m_cursor = textCursor; apply_helper(); - m_cursor = 0; + m_cursor = nullptr; } QString ChangeSet::textAt(int pos, int length) diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index 61acab258..2a2731331 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -70,7 +70,7 @@ namespace Internal { class JobObserver : public ProgressObserver { public: - JobObserver(InternalJob *job) : m_canceled(false), m_job(job), m_timedLogger(0) { } + JobObserver(InternalJob *job) : m_canceled(false), m_job(job), m_timedLogger(nullptr) { } ~JobObserver() { delete m_timedLogger; } void cancel() @@ -103,7 +103,7 @@ private: m_value = value; if (value == m_maximum) { delete m_timedLogger; - m_timedLogger = 0; + m_timedLogger = nullptr; } emit m_job->taskProgress(value, m_job); } @@ -266,7 +266,7 @@ void InternalSetupProjectJob::start() } execute(); if (m_existingProject) - m_existingProject->bgLocker = 0; + m_existingProject->bgLocker = nullptr; m_newProject->bgLocker = bgLocker; deleteLocker = false; } catch (const ErrorInfo &error) { @@ -362,7 +362,7 @@ void BuildGraphTouchingJob::storeBuildGraph() } InternalBuildJob::InternalBuildJob(const Logger &logger, QObject *parent) - : BuildGraphTouchingJob(logger, parent), m_executor(0) + : BuildGraphTouchingJob(logger, parent), m_executor(nullptr) { } diff --git a/src/lib/corelib/api/internaljobs.h b/src/lib/corelib/api/internaljobs.h index f0260cc98..4ed6bf1f4 100644 --- a/src/lib/corelib/api/internaljobs.h +++ b/src/lib/corelib/api/internaljobs.h @@ -80,7 +80,7 @@ public: void shareObserverWith(InternalJob *otherJob); protected: - explicit InternalJob(const Logger &logger, QObject *parent = 0); + explicit InternalJob(const Logger &logger, QObject *parent = nullptr); JobObserver *observer() const { return m_observer; } void setTimed(bool timed) { m_timed = timed; } @@ -105,7 +105,7 @@ class InternalJobThreadWrapper : public InternalJob { Q_OBJECT public: - InternalJobThreadWrapper(InternalJob *synchronousJob, QObject *parent = 0); + InternalJobThreadWrapper(InternalJob *synchronousJob, QObject *parent = nullptr); ~InternalJobThreadWrapper(); void start() override; @@ -159,7 +159,7 @@ signals: void reportProcessResult(const qbs::ProcessResult &result); protected: - BuildGraphTouchingJob(const Logger &logger, QObject *parent = 0); + BuildGraphTouchingJob(const Logger &logger, QObject *parent = nullptr); ~BuildGraphTouchingJob(); void setup(const TopLevelProjectPtr &project, const QList<ResolvedProductPtr> &products, @@ -177,7 +177,7 @@ class InternalBuildJob : public BuildGraphTouchingJob { Q_OBJECT public: - InternalBuildJob(const Logger &logger, QObject *parent = 0); + InternalBuildJob(const Logger &logger, QObject *parent = nullptr); void build(const TopLevelProjectPtr &project, const QList<ResolvedProductPtr> &products, const BuildOptions &buildOptions); @@ -194,7 +194,7 @@ class InternalCleanJob : public BuildGraphTouchingJob { Q_OBJECT public: - InternalCleanJob(const Logger &logger, QObject *parent = 0); + InternalCleanJob(const Logger &logger, QObject *parent = nullptr); void init(const TopLevelProjectPtr &project, const QList<ResolvedProductPtr> &products, const CleanOptions &options); diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp index 37dfb7688..648235731 100644 --- a/src/lib/corelib/api/projectfileupdater.cpp +++ b/src/lib/corelib/api/projectfileupdater.cpp @@ -65,7 +65,7 @@ namespace Internal { class ItemFinder : public Visitor { public: - ItemFinder(const CodeLocation &cl) : m_cl(cl), m_item(0) { } + ItemFinder(const CodeLocation &cl) : m_cl(cl), m_item(nullptr) { } UiObjectDefinition *item() const { return m_item; } @@ -87,7 +87,7 @@ class FilesBindingFinder : public Visitor { public: FilesBindingFinder(const UiObjectDefinition *startItem) - : m_startItem(startItem), m_binding(0) + : m_startItem(startItem), m_binding(nullptr) { } diff --git a/src/lib/corelib/api/qmljsrewriter.cpp b/src/lib/corelib/api/qmljsrewriter.cpp index 8d8d071a9..ebcc00b07 100644 --- a/src/lib/corelib/api/qmljsrewriter.cpp +++ b/src/lib/corelib/api/qmljsrewriter.cpp @@ -93,7 +93,7 @@ Rewriter::Range Rewriter::addBinding(AST::UiObjectInitializer *ast, SourceLocation endOfPreviousMember; SourceLocation startOfNextMember; - if (insertAfter == 0 || insertAfter->member == 0) { + if (insertAfter == nullptr || insertAfter->member == nullptr) { // insert as first member endOfPreviousMember = ast->lbraceToken; @@ -114,7 +114,7 @@ Rewriter::Range Rewriter::addBinding(AST::UiObjectInitializer *ast, bool needsTrailingSemicolon = false; if (isOneLiner) { - if (insertAfter == 0) { // we're inserting after an lbrace + if (insertAfter == nullptr) { // we're inserting after an lbrace if (ast->members) { // we're inserting before a member (and not the rbrace) needsTrailingSemicolon = bindingType == ScriptBinding; } @@ -168,8 +168,8 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb { const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString()); - UiObjectMemberList *lastObjectDef = 0; - UiObjectMemberList *lastNonObjectDef = 0; + UiObjectMemberList *lastObjectDef = nullptr; + UiObjectMemberList *lastNonObjectDef = nullptr; for (UiObjectMemberList *iter = members; iter; iter = iter->next) { UiObjectMember *member = iter->member; @@ -201,8 +201,8 @@ UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *member { const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString()); - UiArrayMemberList *lastObjectDef = 0; - UiArrayMemberList *lastNonObjectDef = 0; + UiArrayMemberList *lastObjectDef = nullptr; + UiArrayMemberList *lastNonObjectDef = nullptr; for (UiArrayMemberList *iter = members; iter; iter = iter->next) { UiObjectMember *member = iter->member; @@ -234,7 +234,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb const QStringList &propertyOrder) { if (!members) - return 0; // empty members + return nullptr; // empty members QHash<QString, UiObjectMemberList *> orderedMembers; @@ -266,7 +266,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb return candidate; } - return 0; + return nullptr; } void Rewriter::changeBinding(UiObjectInitializer *ast, @@ -382,7 +382,7 @@ void Rewriter::insertIntoArray(UiArrayBinding *ast, const QString &newValue) if (!ast) return; - UiObjectMember *lastMember = 0; + UiObjectMember *lastMember = nullptr; for (UiArrayMemberList *iter = ast->members; iter; iter = iter->next) { lastMember = iter->member; } @@ -426,7 +426,7 @@ void Rewriter::removeGroupedProperty(UiObjectDefinition *ast, const QString propName = propertyName.mid(dotIdx + 1); - UiObjectMember *wanted = 0; + UiObjectMember *wanted = nullptr; unsigned memberCount = 0; for (UiObjectMemberList *it = ast->initializer->members; it; it = it->next) { ++memberCount; @@ -545,8 +545,8 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m { const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString::null); - UiObjectMemberList *lastObjectDef = 0; - UiObjectMemberList *lastNonObjectDef = 0; + UiObjectMemberList *lastObjectDef = nullptr; + UiObjectMemberList *lastNonObjectDef = nullptr; for (UiObjectMemberList *iter = members; iter; iter = iter->next) { UiObjectMember *member = iter->member; @@ -576,7 +576,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *members, const QString &propertyName, const QStringList &propertyOrder) { if (!members) - return 0; // empty members + return nullptr; // empty members QHash<QString, UiObjectMemberList *> orderedMembers; @@ -608,7 +608,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m return candidate; } - return 0; + return nullptr; } #endif @@ -616,7 +616,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m void Rewriter::appendToArrayBinding(UiArrayBinding *arrayBinding, const QString &content) { - UiObjectMember *lastMember = 0; + UiObjectMember *lastMember = nullptr; for (UiArrayMemberList *iter = arrayBinding->members; iter; iter = iter->next) if (iter->member) lastMember = iter->member; @@ -697,7 +697,7 @@ void Rewriter::extendToLeadingOrTrailingComma(UiArrayBinding *parentArray, int &start, int &end) const { - UiArrayMemberList *currentMember = 0; + UiArrayMemberList *currentMember = nullptr; for (UiArrayMemberList *it = parentArray->members; it; it = it->next) { if (it->member == member) { currentMember = it; |