From 667fb80cf26e46859e09a32cd40948901e24adfd Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 1 Jun 2019 12:06:50 +0200 Subject: Fix some warnings about null pointers Some of them are false positives, some of them are possible bugs. Change-Id: Ic9c8a2970587e5152659b5b19f6b6d6df67e6809 Reviewed-by: Christian Kandeler --- src/app/qbs/commandlinefrontend.h | 4 ++-- src/lib/corelib/api/internaljobs.cpp | 2 +- src/lib/corelib/buildgraph/buildgraph.cpp | 2 +- src/lib/corelib/buildgraph/executor.h | 2 +- src/lib/corelib/jsextensions/moduleproperties.cpp | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/app/qbs/commandlinefrontend.h b/src/app/qbs/commandlinefrontend.h index 346b46166..5f598cb35 100644 --- a/src/app/qbs/commandlinefrontend.h +++ b/src/app/qbs/commandlinefrontend.h @@ -106,7 +106,7 @@ private: QString buildDirectory(const QString &profileName) const; const CommandLineParser &m_parser; - Settings * const m_settings = nullptr; + Settings * const m_settings; QList m_resolveJobs; QList m_buildJobs; QList m_projects; @@ -115,7 +115,7 @@ private: enum CancelStatus { CancelStatusNone, CancelStatusRequested, CancelStatusCanceling }; CancelStatus m_cancelStatus = CancelStatus::CancelStatusNone; - QTimer * const m_cancelTimer = nullptr; + QTimer * const m_cancelTimer; int m_buildEffortsNeeded = 0; int m_buildEffortsRetrieved = 0; diff --git a/src/lib/corelib/api/internaljobs.cpp b/src/lib/corelib/api/internaljobs.cpp index 5cd4bd439..c74c3d8a4 100644 --- a/src/lib/corelib/api/internaljobs.cpp +++ b/src/lib/corelib/api/internaljobs.cpp @@ -120,7 +120,7 @@ private: int m_maximum = 0; mutable std::mutex m_cancelMutex; bool m_canceled = false; - InternalJob * const m_job = nullptr; + InternalJob * const m_job; TimedActivityLogger *m_timedLogger = nullptr; }; diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index 283e8dc2a..3726c654d 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -118,7 +118,7 @@ private: } getProduct(object); - QBS_ASSERT(m_product, {}); + QBS_ASSERT(m_product, return {}); const auto it = m_product->productProperties.find(name); diff --git a/src/lib/corelib/buildgraph/executor.h b/src/lib/corelib/buildgraph/executor.h index 895e066a7..1fd591176 100644 --- a/src/lib/corelib/buildgraph/executor.h +++ b/src/lib/corelib/buildgraph/executor.h @@ -185,7 +185,7 @@ private: FileTags m_tagsOfFilesToConsider; FileTags m_tagsNeededForFilesToConsider; QList m_productsOfFilesToConsider; - QTimer * const m_cancelationTimer = nullptr; + QTimer * const m_cancelationTimer; QStringList m_artifactsRemovedFromDisk; bool m_partialBuild = false; qint64 m_elapsedTimeRules = 0; diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index 91169d24b..c0fd8ca84 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -130,7 +130,7 @@ private: } setup(object); - QBS_ASSERT(m_product || m_artifact, return {}); + QBS_ASSERT(m_product, return {}); bool isPresent; m_result = getModuleProperty(m_product, m_artifact, static_cast(engine()), m_moduleName, name, &isPresent); @@ -336,8 +336,10 @@ QScriptValue ModuleProperties::moduleProperty(QScriptContext *context, QScriptEn const ResolvedProduct *product = nullptr; const Artifact *artifact = nullptr; if (typeScriptValue.toString() == StringConstants::productValue()) { + QBS_ASSERT(ptr, return {}); product = static_cast(ptr); } else if (typeScriptValue.toString() == artifactType()) { + QBS_ASSERT(ptr, return {}); artifact = static_cast(ptr); product = artifact->product.get(); } else { -- cgit v1.2.3