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

C++: handle case-insensitive file names in the CPlusPlus::Snapshot

Browse Source 
... by keying on Utils::FileName

Task-number: QTCREATORBUG-12390
Change-Id: Ia98afb5a9160a7fd9225a2f9e02539ff3c35ae86
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Erik Verbruggen
2014-11-27 12:11:46 +01:00
committed by Erik Verbruggen
parent a8ece5e9b0
commit a48adcf9be
16 changed files with 141 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/cplusplus/DependencyTable.cpp
View File

@@ -34,13 +34,14 @@
using namespace CPlusPlus;
QStringList DependencyTable::filesDependingOn(const QString &fileName) const
Utils::FileNameList DependencyTable::filesDependingOn(const Utils::FileName &fileName) const
{
Utils::FileNameList deps;
int index = fileIndex.value(fileName, -1);
if (index == -1)
return QStringList();
return deps;
QStringList deps;
for (int i = 0; i < files.size(); ++i) {
const QBitArray &bits = includeMap.at(i);
@@ -53,7 +54,6 @@ QStringList DependencyTable::filesDependingOn(const QString &fileName) const
void DependencyTable::build(const Snapshot &snapshot)
{
includesPerFile.clear();
files.clear();
fileIndex.clear();
includes.clear();
@@ -71,15 +71,14 @@ void DependencyTable::build(const Snapshot &snapshot)
}
for (int i = 0; i < files.size(); ++i) {
const QString fileName = files.at(i);
if (Document::Ptr doc = snapshot.document(files.at(i))) {
const Utils::FileName &fileName = files.at(i);
if (Document::Ptr doc = snapshot.document(fileName)) {
QBitArray bitmap(files.size());
QList<int> directIncludes;
const QStringList documentIncludes = doc->includedFiles();
includesPerFile.insert(fileName, documentIncludes);
foreach (const QString &includedFile, documentIncludes) {
int index = fileIndex.value(includedFile);
int index = fileIndex.value(Utils::FileName::fromString(includedFile));
if (index == -1)
continue;