diff options
author | Tobias Hunger <[email protected]> | 2018-05-07 17:31:39 +0200 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2018-05-13 19:47:14 +0000 |
commit | ebf2d6f4e25282d0aeedfaccfddbb333c59f606b (patch) | |
tree | c1f3d664c373b71c7fa0b14e5cc588e214498ea9 | |
parent | 79aa48e9a4de7054eb3d1e89a5d18e4f8726a94d (diff) |
QtSupport: Consistently use nullptr
Fixed by clang-tidy modernize-use-nullptr.
Change-Id: I534c782f9ef047a307ef440335fd7fc0a7979e08
Reviewed-by: Orgad Shaneh <[email protected]>
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.h | 9 | ||||
-rw-r--r-- | src/plugins/qtsupport/codegenerator.h | 2 | ||||
-rw-r--r-- | src/plugins/qtsupport/qtversionfactory.h | 11 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 672d3c98af5..ca7deba6127 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -265,9 +265,12 @@ private: QString findHostBinary(HostBinaries binary) const; void updateMkspec() const; QHash<ProKey, ProString> versionInfo() const; - static bool queryQMakeVariables(const Utils::FileName &binary, const Utils::Environment &env, - QHash<ProKey, ProString> *versionInfo, QString *error = 0); - static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo, const QByteArray &name, + static bool queryQMakeVariables(const Utils::FileName &binary, + const Utils::Environment &env, + QHash<ProKey, ProString> *versionInfo, + QString *error = nullptr); + static QString qmakeProperty(const QHash<ProKey, ProString> &versionInfo, + const QByteArray &name, PropertyVariant variant = PropertyVariantGet); static Utils::FileName mkspecDirectoryFromVersionInfo(const QHash<ProKey,ProString> &versionInfo); static Utils::FileName mkspecFromVersionInfo(const QHash<ProKey,ProString> &versionInfo); diff --git a/src/plugins/qtsupport/codegenerator.h b/src/plugins/qtsupport/codegenerator.h index dd916518cb4..f6c22e55b85 100644 --- a/src/plugins/qtsupport/codegenerator.h +++ b/src/plugins/qtsupport/codegenerator.h @@ -37,7 +37,7 @@ class QTSUPPORT_EXPORT CodeGenerator : public QObject Q_OBJECT public: - CodeGenerator(QObject *parent = 0) : QObject(parent) { } + CodeGenerator(QObject *parent = nullptr) : QObject(parent) { } // Ui file related: // Change the class name in a UI XML form diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h index 63642b09130..fad90280cdb 100644 --- a/src/plugins/qtsupport/qtversionfactory.h +++ b/src/plugins/qtsupport/qtversionfactory.h @@ -46,7 +46,7 @@ class QTSUPPORT_EXPORT QtVersionFactory : public QObject Q_OBJECT public: - explicit QtVersionFactory(QObject *parent = 0); + explicit QtVersionFactory(QObject *parent = nullptr); ~QtVersionFactory() override; static const QList<QtVersionFactory *> allQtVersionFactories(); @@ -58,9 +58,14 @@ public: /// a qtversion, the priority of the desktop factory is 0 and /// the desktop factory claims to handle all paths virtual int priority() const = 0; - virtual BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString()) = 0; + virtual BaseQtVersion *create(const Utils::FileName &qmakePath, + ProFileEvaluator *evaluator, + bool isAutoDetected = false, + const QString &autoDetectionSource = QString()) = 0; - static BaseQtVersion *createQtVersionFromQMakePath(const Utils::FileName &qmakePath, bool isAutoDetected = false, const QString &autoDetectionSource = QString(), QString *error = 0); + static BaseQtVersion *createQtVersionFromQMakePath( + const Utils::FileName &qmakePath, bool isAutoDetected = false, + const QString &autoDetectionSource = QString(), QString *error = nullptr); }; } // namespace QtSupport |