diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2019-01-16 14:28:59 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-01-17 16:14:21 +0000 |
commit | 0157e009bede679e0777d3af9ec7052223e949b4 (patch) | |
tree | b8146ec2b968030ab169291bb825802523d1f126 | |
parent | 616e19ff9e91a9ce8a1ee379553f9325beed035d (diff) |
QmlJS: fix nullptr warnings
Change-Id: Id546a9a5c065ae8b0cc9c251051b2fd36e34803a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 8 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.h | 18 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsplugindumper.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 1f478f6d0e..1d5d178664 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -75,7 +75,7 @@ QMLJS_EXPORT Q_LOGGING_CATEGORY(qmljsLog, "qtc.qmljs.common", QtWarningMsg) ModelManagerInterface::newestSnapshot(). */ -static ModelManagerInterface *g_instance = 0; +static ModelManagerInterface *g_instance = nullptr; const char qtQuickUISuffix[] = "ui.qml"; @@ -98,7 +98,7 @@ static QStringList environmentImportPaths() ModelManagerInterface::ModelManagerInterface(QObject *parent) : QObject(parent), m_shouldScanImports(false), - m_defaultProject(0), + m_defaultProject(nullptr), m_pluginDumper(new PluginDumper(this)) { m_indexerEnabled = qgetenv("QTC_NO_CODE_INDEXER") != "1"; @@ -137,7 +137,7 @@ ModelManagerInterface::~ModelManagerInterface() m_cppQmlTypesUpdater.cancel(); m_cppQmlTypesUpdater.waitForFinished(); Q_ASSERT(g_instance == this); - g_instance = 0; + g_instance = nullptr; } static QHash<QString, Dialect> defaultLanguageMapping() @@ -1368,7 +1368,7 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx, ProjectInfo info; if (!doc.isNull()) info = projectInfoForPath(doc->fileName()); - ViewerContext defaultVCtx = defaultVContext(res.language, Document::Ptr(0), false); + ViewerContext defaultVCtx = defaultVContext(res.language, Document::Ptr(nullptr), false); ProjectInfo defaultInfo = defaultProjectInfo(); if (info.qtImportsPath.isEmpty()) info.qtImportsPath = defaultInfo.qtImportsPath; diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index 430f4b880e..b4256f35e8 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -136,7 +136,7 @@ public: typedef QHashIterator<QString, CppData> CppDataHashIterator; public: - ModelManagerInterface(QObject *parent = 0); + ModelManagerInterface(QObject *parent = nullptr); ~ModelManagerInterface() override; static Dialect guessLanguageOfFile(const QString &fileName); @@ -153,15 +153,15 @@ public: bool emitDocumentOnDiskChanged); void fileChangedOnDisk(const QString &path); void removeFiles(const QStringList &files); - QStringList qrcPathsForFile(const QString &file, const QLocale *locale = 0, - ProjectExplorer::Project *project = 0, + QStringList qrcPathsForFile(const QString &file, const QLocale *locale = nullptr, + ProjectExplorer::Project *project = nullptr, QrcResourceSelector resources = AllQrcResources); - QStringList filesAtQrcPath(const QString &path, const QLocale *locale = 0, - ProjectExplorer::Project *project = 0, + QStringList filesAtQrcPath(const QString &path, const QLocale *locale = nullptr, + ProjectExplorer::Project *project = nullptr, QrcResourceSelector resources = AllQrcResources); QMap<QString,QStringList> filesInQrcPath(const QString &path, - const QLocale *locale = 0, - ProjectExplorer::Project *project = 0, + const QLocale *locale = nullptr, + ProjectExplorer::Project *project = nullptr, bool addDirs = false, QrcResourceSelector resources = AllQrcResources); @@ -188,9 +188,9 @@ public: CppDataHash cppData() const; LibraryInfo builtins(const Document::Ptr &doc) const; ViewerContext completeVContext(const ViewerContext &vCtx, - const Document::Ptr &doc = Document::Ptr(0)) const; + const Document::Ptr &doc = Document::Ptr(nullptr)) const; ViewerContext defaultVContext(Dialect language = Dialect::Qml, - const Document::Ptr &doc = Document::Ptr(0), + const Document::Ptr &doc = Document::Ptr(nullptr), bool autoComplete = true) const; void setDefaultVContext(const ViewerContext &vContext); virtual ProjectInfo defaultProjectInfo() const; diff --git a/src/libs/qmljs/qmljsplugindumper.h b/src/libs/qmljs/qmljsplugindumper.h index 586275f021..d6ff9224ba 100644 --- a/src/libs/qmljs/qmljsplugindumper.h +++ b/src/libs/qmljs/qmljsplugindumper.h @@ -84,7 +84,7 @@ private: QStringList &errors, QStringList &warnings, QList<LanguageUtils::FakeMetaObject::ConstPtr> &objects, - QSet<QString> *visited=0) const; + QSet<QString> *visited = nullptr) const; void loadQmltypesFile(const QStringList &qmltypesFilePaths, const QString &libraryPath, QmlJS::LibraryInfo libraryInfo); |