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

CppTools/Clang: Remove QScopedPointers in *EditorDocumentParsers

Browse Source 
...since they are pointless.

Change-Id: I1c7925d3b1ad33ac0f1dc372797e3ab9a4bdc4b3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-08-26 15:24:58 +02:00
parent 45570d4068
commit c4ace44141
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -92,7 +92,7 @@ namespace ClangCodeModel {
ClangEditorDocumentProcessor::ClangEditorDocumentProcessor(TextEditor::BaseTextDocument *document)
: BaseEditorDocumentProcessor(document)
, m_parser(new ClangEditorDocumentParser(document->filePath()))
, m_parser(document->filePath())
, m_parserRevision(0)
, m_semanticHighlighter(document)
, m_builtinProcessor(document, /*enableSemanticHighlighter=*/ false)
@@ -109,7 +109,7 @@ ClangEditorDocumentProcessor::ClangEditorDocumentProcessor(TextEditor::BaseTextD
const int firstLine = 1;
const int lastLine = baseTextDocument()->document()->blockCount();
CreateMarkers *createMarkers = CreateMarkers::create(m_parser->semanticMarker(),
CreateMarkers *createMarkers = CreateMarkers::create(m_parser.semanticMarker(),
baseTextDocument()->filePath(),
firstLine, lastLine);
return createMarkers->start();
@@ -155,7 +155,7 @@ CppTools::SemanticInfo ClangEditorDocumentProcessor::recalculateSemanticInfo()
CppTools::BaseEditorDocumentParser *ClangEditorDocumentProcessor::parser()
{
return m_parser.data();
return &m_parser;
}
bool ClangEditorDocumentProcessor::isParserRunning() const
@@ -169,11 +169,11 @@ void ClangEditorDocumentProcessor::onParserFinished()
return;
// Emit ifdefed out blocks
const auto ifdefoutBlocks = toTextEditorBlocks(m_parser->ifdefedOutBlocks());
const auto ifdefoutBlocks = toTextEditorBlocks(m_parser.ifdefedOutBlocks());
emit ifdefedOutBlocksUpdated(revision(), ifdefoutBlocks);
// Emit code warnings
const auto diagnostics = toCppToolsDiagnostics(filePath(), m_parser->diagnostics());
const auto diagnostics = toCppToolsDiagnostics(filePath(), m_parser.diagnostics());
const auto codeWarnings = toTextEditorSelections(diagnostics, textDocument());
emit codeWarningsUpdated(revision(), codeWarnings);

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

@@ -61,7 +61,7 @@ private slots:
void onParserFinished();
private:
QScopedPointer<ClangEditorDocumentParser> m_parser;
ClangEditorDocumentParser m_parser;
QFutureWatcher<void> m_parserWatcher;
unsigned m_parserRevision;