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

Refactored CheckUndefinedSymbols to use RunFunctionTaskBase.

Browse Source 
This will eventually fix a few leaks we introduced in the semantic highlighter.
This commit is contained in:
Roberto Raggi
2010-07-07 09:42:56 +02:00
parent 54584044ca
commit 7d7288cf9d
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cppeditor/cppcheckundefinedsymbols.cpp
View File

@@ -258,11 +258,11 @@ protected:
CheckUndefinedSymbols::Future CheckUndefinedSymbols::go(Document::Ptr doc, const LookupContext &context)
{
Q_ASSERT(doc);
return QtConcurrent::run(&CheckUndefinedSymbols::runFunctor, new CheckUndefinedSymbols(doc, context));
return (new CheckUndefinedSymbols(doc, context))->start();
}
CheckUndefinedSymbols::CheckUndefinedSymbols(Document::Ptr doc, const LookupContext &context)
: ASTVisitor(doc->translationUnit()), _doc(doc), _context(context), _future(0)
: ASTVisitor(doc->translationUnit()), _doc(doc), _context(context)
{
_fileName = doc->fileName();
CollectTypes collectTypes(doc, context.snapshot());
@@ -273,9 +273,16 @@ CheckUndefinedSymbols::CheckUndefinedSymbols(Document::Ptr doc, const LookupCont
CheckUndefinedSymbols::~CheckUndefinedSymbols()
{ }
void CheckUndefinedSymbols::runFunctor(QFutureInterface<Use> &future)
void CheckUndefinedSymbols::run()
{
if (! isCanceled())
runFunctor();
reportFinished();
}
void CheckUndefinedSymbols::runFunctor()
{
_future = &future;
_diagnosticMessages.clear();
if (_doc->translationUnit()) {
@@ -306,7 +313,7 @@ bool CheckUndefinedSymbols::warning(AST *ast, const QString &text)
bool CheckUndefinedSymbols::preVisit(AST *)
{
if (_future->isCanceled())
if (isCanceled())
return false;
return true;
@@ -559,6 +566,6 @@ void CheckUndefinedSymbols::flush()
if (_typeUsages.isEmpty())
return;
_future->reportResults(_typeUsages);
reportResults(_typeUsages);
_typeUsages.clear();
}