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

15
src/plugins/cpptools/builtineditordocumentprocessor.cpp
View File

@@ -131,7 +131,7 @@ BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(
TextEditor::BaseTextDocument *document,
bool enableSemanticHighlighter)
: BaseEditorDocumentProcessor(document)
, m_parser(new BuiltinEditorDocumentParser(document->filePath()))
, m_parser(document->filePath())
, m_semanticHighlighter(enableSemanticHighlighter
? new CppTools::SemanticHighlighter(document)
: 0)
@@ -139,7 +139,7 @@ BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(
using namespace Internal;
QSharedPointer<CppCodeModelSettings> cms = CppToolsPlugin::instance()->codeModelSettings();
m_parser->setUsePrecompiledHeaders(cms->pchUsage() != CppCodeModelSettings::PchUse_None);
m_parser.setUsePrecompiledHeaders(cms->pchUsage() != CppCodeModelSettings::PchUse_None);
if (m_semanticHighlighter) {
m_semanticHighlighter->setHighlightingRunner(
@@ -150,7 +150,7 @@ BuiltinEditorDocumentProcessor::BuiltinEditorDocumentProcessor(
});
}
connect(m_parser.data(), &BuiltinEditorDocumentParser::finished,
connect(&m_parser, &BuiltinEditorDocumentParser::finished,
this, &BuiltinEditorDocumentProcessor::onParserFinished);
connect(&m_semanticInfoUpdater, &SemanticInfoUpdater::updated,
this, &BuiltinEditorDocumentProcessor::onSemanticInfoUpdated);
@@ -169,7 +169,7 @@ void BuiltinEditorDocumentProcessor::run()
BaseEditorDocumentParser *BuiltinEditorDocumentProcessor::parser()
{
return m_parser.data();
return &m_parser;
}
void BuiltinEditorDocumentProcessor::semanticRehighlight(bool force)
@@ -189,13 +189,6 @@ bool BuiltinEditorDocumentProcessor::isParserRunning() const
return m_parserFuture.isRunning();
}
BuiltinEditorDocumentProcessor *BuiltinEditorDocumentProcessor::get(const QString &filePath)
{
if (BaseEditorDocumentProcessor *b = BaseEditorDocumentProcessor::get(filePath))
return qobject_cast<BuiltinEditorDocumentProcessor *>(b);
return 0;
}
void BuiltinEditorDocumentProcessor::onParserFinished(CPlusPlus::Document::Ptr document,
CPlusPlus::Snapshot snapshot)
{