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

C++: Fix "reference" file in symbol finder

Browse Source 
Througout the initial review the singleton was transformed into an
ordinary class, but a error was introduced: The "reference" file was
incorrectly assumed to be the editors file, which is wrong, since
it should be the declaration file.

Change-Id: Iad3e25a690fa8bd07a18184b24b10f8dea965332
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Leandro Melo
2012-01-23 16:08:01 +01:00
parent 17425c50f3
commit b97b45a341
8 changed files with 66 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cpptools/symbolfinder.h
View File

@@ -8,7 +8,6 @@
#include <QtCore/QHash>
#include <QtCore/QStringList>
#include <QtCore/QQueue>
#include <QtCore/QMultiMap>
#include <QtCore/QSet>
@@ -17,8 +16,7 @@ namespace CppTools {
class CPPTOOLS_EXPORT SymbolFinder
{
public:
SymbolFinder(const QString &referenceFileName);
SymbolFinder(const char *referenceFileName, unsigned referenceFileLength);
SymbolFinder();
CPlusPlus::Symbol *findMatchingDefinition(CPlusPlus::Symbol *symbol,
const CPlusPlus::Snapshot &snapshot,
@@ -37,17 +35,20 @@ public:
CPlusPlus::Function *functionType);
private:
QStringList fileIterationOrder(const CPlusPlus::Snapshot &snapshot);
QStringList fileIterationOrder(const QString &referenceFile,
const CPlusPlus::Snapshot &snapshot);
void checkCacheConsistency(const CPlusPlus::Snapshot &snapshot);
void clear(const QString &comparingFile);
void insert(const QString &comparingFile);
void checkCacheConsistency(const QString &referenceFile, const CPlusPlus::Snapshot &snapshot);
void clearCache(const QString &referenceFile, const QString &comparingFile);
void insertCache(const QString &referenceFile, const QString &comparingFile);
void trackCacheUse(const QString &referenceFile);
static int computeKey(const QString &referenceFile, const QString &comparingFile);
QMultiMap<int, QString> m_filePriorityCache;
QSet<QString> m_fileMetaCache;
QString m_referenceFile;
QHash<QString, QMultiMap<int, QString> > m_filePriorityCache;
QHash<QString, QSet<QString> > m_fileMetaCache;
QStringList m_recent;
};
} // namespace CppTools