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

ClangCodeModel: Modernize

Browse Source 
modernize-use-nullptr
modernize-use-auto
modernize-use-override
modernize-use-equals-default
modernize-use-using

Change-Id: I386f885860c01574035c69226240fe3b8e38392c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Alessandro Portale
2018-11-04 21:44:21 +01:00
parent 7d1cf8db39
commit 62abfd7b50
16 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangassistproposalitem.h
View File

@@ -38,7 +38,7 @@ class ClangAssistProposalItem final : public TextEditor::AssistProposalItemInter
{
friend bool operator<(const ClangAssistProposalItem &first, const ClangAssistProposalItem &second);
public:
~ClangAssistProposalItem() noexcept {}
~ClangAssistProposalItem() noexcept override = default;
bool prematurelyApplies(const QChar &typedCharacter) const final;
bool implicitlyApplies() const final;
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator, int basePosition) const final;

2
src/plugins/clangcodemodel/clangbackendcommunicator.cpp
View File

@@ -110,7 +110,7 @@ BackendCommunicator::BackendCommunicator()
BackendCommunicator::~BackendCommunicator()
{
disconnect(&m_connection, 0, this, 0);
disconnect(&m_connection, nullptr, this, nullptr);
}
void BackendCommunicator::initializeBackend()

2
src/plugins/clangcodemodel/clangbackendcommunicator.h
View File

@@ -59,7 +59,7 @@ public:
public:
BackendCommunicator();
~BackendCommunicator();
~BackendCommunicator() override;
void documentsOpened(const FileContainers &fileContainers);
void documentsChanged(Core::IDocument *document);

4
src/plugins/clangcodemodel/clangbackendreceiver.cpp
View File

@@ -63,9 +63,7 @@ static bool printAliveMessage()
return print;
}
BackendReceiver::BackendReceiver()
{
}
BackendReceiver::BackendReceiver() = default;
BackendReceiver::~BackendReceiver()
{

8
src/plugins/clangcodemodel/clangcodemodelplugin.h
View File

@@ -42,9 +42,9 @@ class ClangCodeModelPlugin final: public ExtensionSystem::IPlugin
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangCodeModel.json")
public:
~ClangCodeModelPlugin();
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
~ClangCodeModelPlugin() override;
bool initialize(const QStringList &arguments, QString *errorMessage) override;
void extensionsInitialized() override;
private:
void maybeHandleBatchFileAndExit() const;
@@ -57,7 +57,7 @@ private:
Utils::ParameterAction *m_generateCompilationDBAction = nullptr;
QFutureWatcher<void> m_generatorWatcher;
#ifdef WITH_TESTS
QList<QObject *> createTestObjects() const;
QList<QObject *> createTestObjects() const override;
#endif
};

8
src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
View File

@@ -69,7 +69,7 @@ static void addAssistProposalItem(QList<AssistProposalItemInterface *> &items,
const CodeCompletion &codeCompletion,
const QString &name)
{
ClangAssistProposalItem *item = new ClangAssistProposalItem;
auto item = new ClangAssistProposalItem;
items.push_back(item);
item->setText(name);
@@ -164,9 +164,7 @@ ClangCompletionAssistProcessor::ClangCompletionAssistProcessor()
{
}
ClangCompletionAssistProcessor::~ClangCompletionAssistProcessor()
{
}
ClangCompletionAssistProcessor::~ClangCompletionAssistProcessor() = default;
IAssistProposal *ClangCompletionAssistProcessor::perform(const AssistInterface *interface)
{
@@ -301,7 +299,7 @@ IAssistProposal *ClangCompletionAssistProcessor::startCompletionHelper()
break;
}
return 0;
return nullptr;
}
int ClangCompletionAssistProcessor::startOfOperator(int positionInDocument,

3
src/plugins/clangcodemodel/clangcompletionassistprocessor.h
View File

@@ -91,7 +91,8 @@ private:
QScopedPointer<const ClangCompletionAssistInterface> m_interface;
unsigned m_completionOperator;
enum CompletionRequestType { NormalCompletion, FunctionHintCompletion } m_sentRequestType;
enum CompletionRequestType { NormalCompletion, FunctionHintCompletion };
CompletionRequestType m_sentRequestType = NormalCompletion;
bool m_requestSent = false;
bool m_addSnippets = false; // For type == Type::NormalCompletion
};

2
src/plugins/clangcodemodel/clangcompletionassistprovider.cpp
View File

@@ -76,7 +76,7 @@ TextEditor::AssistInterface *ClangCompletionAssistProvider::createAssistInterfac
projectPart->languageFeatures);
}
return 0;
return nullptr;
}
} // namespace Internal

2
src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
View File

@@ -300,7 +300,7 @@ void ClangDiagnosticManager::cleanMarks()
}
void ClangDiagnosticManager::generateTextMarks()
{
QObject::disconnect(&m_textMarkDelay, &QTimer::timeout, 0, 0);
QObject::disconnect(&m_textMarkDelay, &QTimer::timeout, nullptr, nullptr);
cleanMarks();
m_clangTextMarks.reserve(m_warningDiagnostics.size() + m_errorDiagnostics.size());
addClangTextMarks(m_warningDiagnostics);

2
src/plugins/clangcodemodel/clanghoverhandler.cpp
View File

@@ -56,7 +56,7 @@ static CppTools::BaseEditorDocumentProcessor *editorDocumentProcessor(TextEditor
if (editorHandle)
return editorHandle->processor();
return 0;
return nullptr;
}
static bool editorDocumentProcessorHasDiagnosticAt(TextEditorWidget *editorWidget, int pos)

18
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -61,7 +61,7 @@
using namespace ClangCodeModel;
using namespace ClangCodeModel::Internal;
static ClangModelManagerSupport *m_instance = 0;
static ClangModelManagerSupport *m_instance = nullptr;
static CppTools::CppModelManager *cppModelManager()
{
@@ -113,7 +113,7 @@ ClangModelManagerSupport::ClangModelManagerSupport()
ClangModelManagerSupport::~ClangModelManagerSupport()
{
QTC_CHECK(m_projectSettings.isEmpty());
m_instance = 0;
m_instance = nullptr;
}
CppTools::CppCompletionAssistProvider *ClangModelManagerSupport::completionAssistProvider()
@@ -238,7 +238,7 @@ void ClangModelManagerSupport::onEditorOpened(Core::IEditor *editor)
QTC_ASSERT(editor, return);
Core::IDocument *document = editor->document();
QTC_ASSERT(document, return);
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(document);
auto textDocument = qobject_cast<TextEditor::TextDocument *>(document);
if (textDocument && cppModelManager()->isCppEditor(editor)) {
connectTextDocumentToTranslationUnit(textDocument);
@@ -255,7 +255,7 @@ void ClangModelManagerSupport::onEditorClosed(const QList<Core::IEditor *> &)
void ClangModelManagerSupport::onCppDocumentAboutToReloadOnTranslationUnit()
{
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
auto textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
disconnect(textDocument, &TextEditor::TextDocument::contentsChangedWithPosition,
this, &ClangModelManagerSupport::onCppDocumentContentsChangedOnTranslationUnit);
}
@@ -263,7 +263,7 @@ void ClangModelManagerSupport::onCppDocumentAboutToReloadOnTranslationUnit()
void ClangModelManagerSupport::onCppDocumentReloadFinishedOnTranslationUnit(bool success)
{
if (success) {
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
auto textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
connectToTextDocumentContentsChangedForTranslationUnit(textDocument);
m_communicator.documentsChangedWithRevisionCheck(textDocument);
}
@@ -282,7 +282,7 @@ void ClangModelManagerSupport::onCppDocumentContentsChangedOnTranslationUnit(int
int /*charsRemoved*/,
int /*charsAdded*/)
{
Core::IDocument *document = qobject_cast<Core::IDocument *>(sender());
auto document = qobject_cast<Core::IDocument *>(sender());
m_communicator.updateChangeContentStartPosition(document->filePath().toString(),
position);
@@ -293,7 +293,7 @@ void ClangModelManagerSupport::onCppDocumentContentsChangedOnTranslationUnit(int
void ClangModelManagerSupport::onCppDocumentAboutToReloadOnUnsavedFile()
{
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
auto textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
disconnect(textDocument, &TextEditor::TextDocument::contentsChangedWithPosition,
this, &ClangModelManagerSupport::onCppDocumentContentsChangedOnUnsavedFile);
}
@@ -301,7 +301,7 @@ void ClangModelManagerSupport::onCppDocumentAboutToReloadOnUnsavedFile()
void ClangModelManagerSupport::onCppDocumentReloadFinishedOnUnsavedFile(bool success)
{
if (success) {
TextEditor::TextDocument *textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
auto textDocument = qobject_cast<TextEditor::TextDocument *>(sender());
connectToTextDocumentContentsChangedForUnsavedFile(textDocument);
m_communicator.unsavedFilesUpdated(textDocument);
}
@@ -309,7 +309,7 @@ void ClangModelManagerSupport::onCppDocumentReloadFinishedOnUnsavedFile(bool suc
void ClangModelManagerSupport::onCppDocumentContentsChangedOnUnsavedFile()
{
Core::IDocument *document = qobject_cast<Core::IDocument *>(sender());
auto document = qobject_cast<Core::IDocument *>(sender());
m_communicator.unsavedFilesUpdated(document);
}

6
src/plugins/clangcodemodel/clangoverviewmodel.cpp
View File

@@ -221,7 +221,7 @@ bool OverviewModel::isGenerated(const QModelIndex &) const
::Utils::Link OverviewModel::linkFromIndex(const QModelIndex &sourceIndex) const
{
TokenTreeItem *item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
auto item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
if (!item)
return {};
return ::Utils::Link(m_filePath, static_cast<int>(item->token.line),
@@ -230,7 +230,7 @@ bool OverviewModel::isGenerated(const QModelIndex &) const
::Utils::LineColumn OverviewModel::lineColumnFromIndex(const QModelIndex &sourceIndex) const
{
TokenTreeItem *item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
auto item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
if (!item)
return {};
return ::Utils::LineColumn(static_cast<int>(item->token.line),
@@ -239,7 +239,7 @@ bool OverviewModel::isGenerated(const QModelIndex &) const
OverviewModel::Range OverviewModel::rangeFromIndex(const QModelIndex &sourceIndex) const
{
TokenTreeItem *item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
auto item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
if (!item)
return {};
const ClangBackEnd::SourceRangeContainer &range = item->token.extraInfo.cursorRange;

4
src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h
View File

@@ -35,9 +35,9 @@ namespace ClangCodeModel {
class ClangPreprocessorAssistProposalItem final : public TextEditor::AssistProposalItemInterface
{
public:
~ClangPreprocessorAssistProposalItem() noexcept {}
~ClangPreprocessorAssistProposalItem() noexcept override = default;
bool prematurelyApplies(const QChar &typedChar) const final;
virtual bool implicitlyApplies() const final;
bool implicitlyApplies() const final;
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator,
int basePosition) const final;

2
src/plugins/clangcodemodel/test/clangautomationutils.cpp
View File

@@ -106,7 +106,7 @@ TextEditor::ProposalModelPtr completionResults(TextEditor::BaseTextEditor *textE
{
using namespace TextEditor;
TextEditorWidget *textEditorWidget = qobject_cast<TextEditorWidget *>(textEditor->widget());
auto textEditorWidget = qobject_cast<TextEditorWidget *>(textEditor->widget());
QTC_ASSERT(textEditorWidget, return TextEditor::ProposalModelPtr());
AssistInterface *assistInterface = textEditorWidget->createAssistInterface(
TextEditor::Completion, TextEditor::ExplicitlyInvoked);

6
src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp
View File

@@ -130,7 +130,7 @@ const QChar *BatchFileLineTokenizer::advanceToTokenBegin()
forever {
if (atEnd())
return 0;
return nullptr;
if (atQuotationMark()) {
m_isWithinQuotation = true;
@@ -151,7 +151,7 @@ const QChar *BatchFileLineTokenizer::advanceToTokenEnd()
if (m_isWithinQuotation) {
if (atEnd()) {
qWarning("ClangBatchFileProcessor: error: unfinished quotation.");
return 0;
return nullptr;
}
if (atQuotationMark())
@@ -194,7 +194,7 @@ public:
public:
Command(const CommandContext &context) : m_commandContext(context) {}
virtual ~Command() {}
virtual ~Command() = default;
const CommandContext &context() const { return m_commandContext; }
virtual bool run() { return true; }

11
src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
View File

@@ -114,8 +114,7 @@ private:
class TestDocument
{
public:
TestDocument(const QByteArray &fileName, CppTools::Tests::TemporaryDir *temporaryDir = 0)
: cursorPosition(-1)
TestDocument(const QByteArray &fileName, CppTools::Tests::TemporaryDir *temporaryDir = nullptr)
{
QTC_ASSERT(!fileName.isEmpty(), return);
const QResource resource(qrcPath(fileName));
@@ -153,10 +152,10 @@ public:
{ return isCreated() && hasValidCursorPosition(); }
QString filePath;
int cursorPosition;
int cursorPosition = -1;
private:
TestDocument() : cursorPosition(-1) {}
TestDocument() = default;
QSharedPointer<CppTools::Tests::TemporaryDir> m_temporaryDir;
};
@@ -278,10 +277,10 @@ public:
ProjectLoader(const QStringList &projectFiles,
const ProjectExplorer::Macros &projectMacros,
bool testOnlyForCleanedProjects = false)
: m_project(0)
: m_project(nullptr)
, m_projectFiles(projectFiles)
, m_projectMacros(projectMacros)
, m_helper(0, testOnlyForCleanedProjects)
, m_helper(nullptr, testOnlyForCleanedProjects)
{
}