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

Removed useless arguments

Browse Source
This commit is contained in:
Roberto Raggi
2009-12-03 11:59:37 +01:00
parent 04a6d4678b
commit 43df685c68
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/cplusplus/FindUsages.cpp
View File

@@ -35,6 +35,7 @@
#include <Names.h> #include <Names.h>
#include <Symbols.h> #include <Symbols.h>
#include <AST.h> #include <AST.h>
#include <TranslationUnit.h>
#include <QtCore/QDir> #include <QtCore/QDir>
@@ -63,16 +64,20 @@ QList<Usage> FindUsages::usages() const
QList<int> FindUsages::references() const QList<int> FindUsages::references() const
{ return _references; } { return _references; }
void FindUsages::operator()(Symbol *symbol, const Identifier *id, AST *ast) void FindUsages::operator()(Symbol *symbol)
{ {
_processed.clear(); _processed.clear();
_references.clear(); _references.clear();
_usages.clear(); _usages.clear();
_declSymbol = symbol; _declSymbol = symbol;
_id = id;
if (_declSymbol && _id) { _id = 0;
if (_declSymbol && 0 != & (_id = _declSymbol->identifier()))
_id = _doc->control()->findOrInsertIdentifier(_id->chars(), _id->size());
if (_id) {
_exprDoc = Document::create("<references>"); _exprDoc = Document::create("<references>");
accept(ast); accept(_doc->translationUnit()->ast());
} }
} }

2
src/libs/cplusplus/FindUsages.h
View File

@@ -64,7 +64,7 @@ public:
void setGlobalNamespaceBinding(NamespaceBindingPtr globalNamespaceBinding); void setGlobalNamespaceBinding(NamespaceBindingPtr globalNamespaceBinding);
void operator()(Symbol *symbol, const Identifier *id, AST *ast); void operator()(Symbol *symbol);
QList<Usage> usages() const; QList<Usage> usages() const;
QList<int> references() const; QList<int> references() const;

29
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -79,21 +79,11 @@ QList<int> CppFindReferences::references(Symbol *symbol,
Document::Ptr doc, Document::Ptr doc,
const Snapshot& snapshot) const const Snapshot& snapshot) const
{ {
const Identifier *id = 0;
if (const Identifier *symbolId = symbol->identifier())
id = doc->control()->findIdentifier(symbolId->chars(), symbolId->size());
QList<int> references; QList<int> references;
if (! id)
return references;
TranslationUnit *translationUnit = doc->translationUnit();
Q_ASSERT(translationUnit != 0);
FindUsages findUsages(doc, snapshot, /*future = */ 0); FindUsages findUsages(doc, snapshot, /*future = */ 0);
findUsages.setGlobalNamespaceBinding(bind(doc, snapshot)); findUsages.setGlobalNamespaceBinding(bind(doc, snapshot));
findUsages(symbol, id, translationUnit->ast()); findUsages(symbol);
references = findUsages.references(); references = findUsages.references();
return references; return references;
@@ -165,26 +155,13 @@ static void find_helper(QFutureInterface<Usage> &future,
doc->tokenize(); doc->tokenize();
Control *control = doc->control(); Control *control = doc->control();
if (const Identifier *id = control->findIdentifier(symbolId->chars(), symbolId->size())) { if (control->findIdentifier(symbolId->chars(), symbolId->size()) != 0) {
QTime tm;
tm.start();
doc->parse();
//qDebug() << "***" << unit->fileName() << "parsed in:" << tm.elapsed();
tm.start();
doc->check(); doc->check();
//qDebug() << "***" << unit->fileName() << "checked in:" << tm.elapsed();
tm.start();
FindUsages process(doc, snapshot, &future); FindUsages process(doc, snapshot, &future);
process.setGlobalNamespaceBinding(bind(doc, snapshot)); process.setGlobalNamespaceBinding(bind(doc, snapshot));
TranslationUnit *unit = doc->translationUnit(); process(symbol);
process(symbol, id, unit->ast());
//qDebug() << "***" << unit->fileName() << "processed in:" << tm.elapsed();
} }
} }