feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: fix nullptr warnings

Browse Source 
Change-Id: Id546a9a5c065ae8b0cc9c251051b2fd36e34803a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2019-01-16 14:28:59 +01:00
parent 616e19ff9e
commit 0157e009be
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -75,7 +75,7 @@ QMLJS_EXPORT Q_LOGGING_CATEGORY(qmljsLog, "qtc.qmljs.common", QtWarningMsg)
ModelManagerInterface::newestSnapshot(). ModelManagerInterface::newestSnapshot().
*/ */
static ModelManagerInterface *g_instance = 0; static ModelManagerInterface *g_instance = nullptr;
const char qtQuickUISuffix[] = "ui.qml"; const char qtQuickUISuffix[] = "ui.qml";
@@ -98,7 +98,7 @@ static QStringList environmentImportPaths()
ModelManagerInterface::ModelManagerInterface(QObject *parent) ModelManagerInterface::ModelManagerInterface(QObject *parent)
: QObject(parent), : QObject(parent),
m_shouldScanImports(false), m_shouldScanImports(false),
m_defaultProject(0), m_defaultProject(nullptr),
m_pluginDumper(new PluginDumper(this)) m_pluginDumper(new PluginDumper(this))
{ {
m_indexerEnabled = qgetenv("QTC_NO_CODE_INDEXER") != "1"; m_indexerEnabled = qgetenv("QTC_NO_CODE_INDEXER") != "1";
@@ -137,7 +137,7 @@ ModelManagerInterface::~ModelManagerInterface()
m_cppQmlTypesUpdater.cancel(); m_cppQmlTypesUpdater.cancel();
m_cppQmlTypesUpdater.waitForFinished(); m_cppQmlTypesUpdater.waitForFinished();
Q_ASSERT(g_instance == this); Q_ASSERT(g_instance == this);
g_instance = 0; g_instance = nullptr;
} }
static QHash<QString, Dialect> defaultLanguageMapping() static QHash<QString, Dialect> defaultLanguageMapping()
@@ -1368,7 +1368,7 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx,
ProjectInfo info; ProjectInfo info;
if (!doc.isNull()) if (!doc.isNull())
info = projectInfoForPath(doc->fileName()); 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(); ProjectInfo defaultInfo = defaultProjectInfo();
if (info.qtImportsPath.isEmpty()) if (info.qtImportsPath.isEmpty())
info.qtImportsPath = defaultInfo.qtImportsPath; info.qtImportsPath = defaultInfo.qtImportsPath;

18
src/libs/qmljs/qmljsmodelmanagerinterface.h
View File

@@ -136,7 +136,7 @@ public:
typedef QHashIterator<QString, CppData> CppDataHashIterator; typedef QHashIterator<QString, CppData> CppDataHashIterator;
public: public:
ModelManagerInterface(QObject *parent = 0); ModelManagerInterface(QObject *parent = nullptr);
~ModelManagerInterface() override; ~ModelManagerInterface() override;
static Dialect guessLanguageOfFile(const QString &fileName); static Dialect guessLanguageOfFile(const QString &fileName);
@@ -153,15 +153,15 @@ public:
bool emitDocumentOnDiskChanged); bool emitDocumentOnDiskChanged);
void fileChangedOnDisk(const QString &path); void fileChangedOnDisk(const QString &path);
void removeFiles(const QStringList &files); void removeFiles(const QStringList &files);
QStringList qrcPathsForFile(const QString &file, const QLocale *locale = 0, QStringList qrcPathsForFile(const QString &file, const QLocale *locale = nullptr,
ProjectExplorer::Project *project = 0, ProjectExplorer::Project *project = nullptr,
QrcResourceSelector resources = AllQrcResources); QrcResourceSelector resources = AllQrcResources);
QStringList filesAtQrcPath(const QString &path, const QLocale *locale = 0, QStringList filesAtQrcPath(const QString &path, const QLocale *locale = nullptr,
ProjectExplorer::Project *project = 0, ProjectExplorer::Project *project = nullptr,
QrcResourceSelector resources = AllQrcResources); QrcResourceSelector resources = AllQrcResources);
QMap<QString,QStringList> filesInQrcPath(const QString &path, QMap<QString,QStringList> filesInQrcPath(const QString &path,
const QLocale *locale = 0, const QLocale *locale = nullptr,
ProjectExplorer::Project *project = 0, ProjectExplorer::Project *project = nullptr,
bool addDirs = false, bool addDirs = false,
QrcResourceSelector resources = AllQrcResources); QrcResourceSelector resources = AllQrcResources);
@@ -188,9 +188,9 @@ public:
CppDataHash cppData() const; CppDataHash cppData() const;
LibraryInfo builtins(const Document::Ptr &doc) const; LibraryInfo builtins(const Document::Ptr &doc) const;
ViewerContext completeVContext(const ViewerContext &vCtx, 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, ViewerContext defaultVContext(Dialect language = Dialect::Qml,
const Document::Ptr &doc = Document::Ptr(0), const Document::Ptr &doc = Document::Ptr(nullptr),
bool autoComplete = true) const; bool autoComplete = true) const;
void setDefaultVContext(const ViewerContext &vContext); void setDefaultVContext(const ViewerContext &vContext);
virtual ProjectInfo defaultProjectInfo() const; virtual ProjectInfo defaultProjectInfo() const;

2
src/libs/qmljs/qmljsplugindumper.h
View File

@@ -84,7 +84,7 @@ private:
QStringList &errors, QStringList &errors,
QStringList &warnings, QStringList &warnings,
QList<LanguageUtils::FakeMetaObject::ConstPtr> &objects, QList<LanguageUtils::FakeMetaObject::ConstPtr> &objects,
QSet<QString> *visited=0) const; QSet<QString> *visited = nullptr) const;
void loadQmltypesFile(const QStringList &qmltypesFilePaths, void loadQmltypesFile(const QStringList &qmltypesFilePaths,
const QString &libraryPath, const QString &libraryPath,
QmlJS::LibraryInfo libraryInfo); QmlJS::LibraryInfo libraryInfo);