From b554c761fb5bcf8c2882a7cf5d59a973c1ca86ce Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 7 May 2018 17:36:22 +0200 Subject: [PATCH] CppTools: Consistently use nullptr Fixed by clang-tidy modernize-use-nullptr. Change-Id: I951627ba3543faa357f67ee76527518290efe3f1 Reviewed-by: Ivan Donchevskii --- src/plugins/cpptools/abstracteditorsupport.h | 2 +- src/plugins/cpptools/clangdiagnosticconfigswidget.h | 2 +- src/plugins/cpptools/cppchecksymbols.h | 2 +- src/plugins/cpptools/cppcodeformatter.h | 2 +- src/plugins/cpptools/cppcodestylepreferences.h | 2 +- src/plugins/cpptools/cppcompletionassistprovider.h | 2 +- src/plugins/cpptools/cppindexingsupport.h | 2 +- src/plugins/cpptools/cppselectionchanger.h | 4 ++-- src/plugins/cpptools/cpptoolsreuse.h | 2 +- src/plugins/cpptools/functionutils.h | 4 ++-- src/plugins/cpptools/includeutils.h | 4 ++-- src/plugins/cpptools/modelmanagertesthelper.h | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/plugins/cpptools/abstracteditorsupport.h b/src/plugins/cpptools/abstracteditorsupport.h index 559b8d76926..3351ce0856c 100644 --- a/src/plugins/cpptools/abstracteditorsupport.h +++ b/src/plugins/cpptools/abstracteditorsupport.h @@ -37,7 +37,7 @@ class CPPTOOLS_EXPORT AbstractEditorSupport : public QObject { Q_OBJECT public: - explicit AbstractEditorSupport(CppModelManager *modelmanager, QObject *parent = 0); + explicit AbstractEditorSupport(CppModelManager *modelmanager, QObject *parent = nullptr); ~AbstractEditorSupport() override; /// \returns the contents, encoded as UTF-8 diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.h b/src/plugins/cpptools/clangdiagnosticconfigswidget.h index 2cbd5cede15..73688a83819 100644 --- a/src/plugins/cpptools/clangdiagnosticconfigswidget.h +++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.h @@ -57,7 +57,7 @@ public: explicit ClangDiagnosticConfigsWidget( const ClangDiagnosticConfigsModel &diagnosticConfigsModel = ClangDiagnosticConfigsModel(), const Core::Id &configToSelect = Core::Id(), - QWidget *parent = 0); + QWidget *parent = nullptr); ~ClangDiagnosticConfigsWidget() override; Core::Id currentConfigId() const; diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index 153001bf197..a32886cef59 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -118,7 +118,7 @@ protected: bool maybeFunction(const CPlusPlus::Name *name) const; void checkNamespace(CPlusPlus::NameAST *name); - void checkName(CPlusPlus::NameAST *ast, CPlusPlus::Scope *scope = 0); + void checkName(CPlusPlus::NameAST *ast, CPlusPlus::Scope *scope = nullptr); CPlusPlus::ClassOrNamespace *checkNestedName(CPlusPlus::QualifiedNameAST *ast); void addUse(const Result &use); diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h index 55e2a233ae3..02fb12833f3 100644 --- a/src/plugins/cpptools/cppcodeformatter.h +++ b/src/plugins/cpptools/cppcodeformatter.h @@ -217,7 +217,7 @@ private: QStringRef currentTokenText() const; - int tokenizeBlock(const QTextBlock &block, bool *endedJoined = 0); + int tokenizeBlock(const QTextBlock &block, bool *endedJoined = nullptr); void turnInto(int newState); diff --git a/src/plugins/cpptools/cppcodestylepreferences.h b/src/plugins/cpptools/cppcodestylepreferences.h index 1b225c0b713..5e1f9ac28aa 100644 --- a/src/plugins/cpptools/cppcodestylepreferences.h +++ b/src/plugins/cpptools/cppcodestylepreferences.h @@ -37,7 +37,7 @@ class CPPTOOLS_EXPORT CppCodeStylePreferences : public TextEditor::ICodeStylePre Q_OBJECT public: explicit CppCodeStylePreferences( - QObject *parent = 0); + QObject *parent = nullptr); QVariant value() const override; void setValue(const QVariant &) override; diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index c2188b9d388..66597ea84bc 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -48,7 +48,7 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio Q_OBJECT public: - CppCompletionAssistProvider(QObject *parent = 0); + CppCompletionAssistProvider(QObject *parent = nullptr); int activationCharSequenceLength() const override; bool isActivationCharSequence(const QString &sequence) const override; bool isContinuationChar(const QChar &c) const override; diff --git a/src/plugins/cpptools/cppindexingsupport.h b/src/plugins/cpptools/cppindexingsupport.h index 75fb99bf634..58b0b262985 100644 --- a/src/plugins/cpptools/cppindexingsupport.h +++ b/src/plugins/cpptools/cppindexingsupport.h @@ -67,7 +67,7 @@ public: public: - SymbolSearcher(QObject *parent = 0); + SymbolSearcher(QObject *parent = nullptr); ~SymbolSearcher() override = 0; virtual void runSearch(QFutureInterface &future) = 0; }; diff --git a/src/plugins/cpptools/cppselectionchanger.h b/src/plugins/cpptools/cppselectionchanger.h index 1a29989df26..d205e2ce2e1 100644 --- a/src/plugins/cpptools/cppselectionchanger.h +++ b/src/plugins/cpptools/cppselectionchanger.h @@ -42,7 +42,7 @@ public: ASTNodePositions(CPlusPlus::AST *_ast) : ast(_ast) {} operator bool() const { return ast; } - CPlusPlus::AST *ast = 0; + CPlusPlus::AST *ast = nullptr; unsigned firstTokenIndex = 0; unsigned lastTokenIndex = 0; unsigned secondToLastTokenIndex = 0; @@ -54,7 +54,7 @@ class CPPTOOLS_EXPORT CppSelectionChanger : public QObject { Q_OBJECT public: - explicit CppSelectionChanger(QObject *parent = 0); + explicit CppSelectionChanger(QObject *parent = nullptr); enum Direction { ExpandSelection, diff --git a/src/plugins/cpptools/cpptoolsreuse.h b/src/plugins/cpptools/cpptoolsreuse.h index c015691a376..505de401034 100644 --- a/src/plugins/cpptools/cpptoolsreuse.h +++ b/src/plugins/cpptools/cpptoolsreuse.h @@ -68,7 +68,7 @@ const CPlusPlus::Macro CPPTOOLS_EXPORT *findCanonicalMacro(const QTextCursor &cu enum class CacheUsage { ReadWrite, ReadOnly }; -QString CPPTOOLS_EXPORT correspondingHeaderOrSource(const QString &fileName, bool *wasHeader = 0, +QString CPPTOOLS_EXPORT correspondingHeaderOrSource(const QString &fileName, bool *wasHeader = nullptr, CacheUsage cacheUsage = CacheUsage::ReadWrite); void CPPTOOLS_EXPORT switchHeaderSource(); diff --git a/src/plugins/cpptools/functionutils.h b/src/plugins/cpptools/functionutils.h index 312492a8738..adf6b7af8cd 100644 --- a/src/plugins/cpptools/functionutils.h +++ b/src/plugins/cpptools/functionutils.h @@ -46,11 +46,11 @@ class CPPTOOLS_EXPORT FunctionUtils public: static bool isVirtualFunction(const CPlusPlus::Function *function, const CPlusPlus::LookupContext &context, - const CPlusPlus::Function **firstVirtual = 0); + const CPlusPlus::Function **firstVirtual = nullptr); static bool isPureVirtualFunction(const CPlusPlus::Function *function, const CPlusPlus::LookupContext &context, - const CPlusPlus::Function **firstVirtual = 0); + const CPlusPlus::Function **firstVirtual = nullptr); static QList overrides(CPlusPlus::Function *function, CPlusPlus::Class *functionsClass, diff --git a/src/plugins/cpptools/includeutils.h b/src/plugins/cpptools/includeutils.h index 5375877ded7..cadbac37b41 100644 --- a/src/plugins/cpptools/includeutils.h +++ b/src/plugins/cpptools/includeutils.h @@ -90,8 +90,8 @@ public: /// Returns the line (1-based) at which the include directive should be inserted. /// On error, -1 is returned. - int operator()(const QString &newIncludeFileName, unsigned *newLinesToPrepend = 0, - unsigned *newLinesToAppend = 0); + int operator()(const QString &newIncludeFileName, unsigned *newLinesToPrepend = nullptr, + unsigned *newLinesToAppend = nullptr); private: int findInsertLineForVeryFirstInclude(unsigned *newLinesToPrepend, unsigned *newLinesToAppend); diff --git a/src/plugins/cpptools/modelmanagertesthelper.h b/src/plugins/cpptools/modelmanagertesthelper.h index a228f70a834..51c947af1d1 100644 --- a/src/plugins/cpptools/modelmanagertesthelper.h +++ b/src/plugins/cpptools/modelmanagertesthelper.h @@ -55,7 +55,7 @@ class CPPTOOLS_EXPORT ModelManagerTestHelper: public QObject public: typedef ProjectExplorer::Project Project; - explicit ModelManagerTestHelper(QObject *parent = 0, + explicit ModelManagerTestHelper(QObject *parent = nullptr, bool testOnlyForCleanedProjects = true); ~ModelManagerTestHelper() override;