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

CppTools: SwitchHeaderSource file name case sensitivity

Browse Source 
Make sure that on Windows the corresponding header /source
file is searched using case insensitive comparisons.

Change-Id: I66b06cd8a7c46b78e8ff24e11803287630f3914b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Cristian Adam
2015-07-13 15:12:02 +02:00
parent 1d9dd67fd3
commit 08b62bcfd9
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,7 +265,7 @@ static QStringList findFilesInProject(const QString &name,
const QStringList::const_iterator pcend = projectFiles.constEnd();
QStringList candidateList;
for (QStringList::const_iterator it = projectFiles.constBegin(); it != pcend; ++it) {
if (it->endsWith(pattern))
if (it->endsWith(pattern, Utils::HostOsInfo::fileNameCaseSensitivity()))
candidateList.append(*it);
}
return candidateList;
@@ -342,12 +342,17 @@ static QStringList baseDirWithAllDirectories(const QDir &baseDir, const QStringL
return result;
}
static int commonStringLength(const QString &s1, const QString &s2)
static int commonFilePathLength(const QString &s1, const QString &s2)
{
int length = qMin(s1.length(), s2.length());
for (int i = 0; i < length; ++i)
if (s1[i] != s2[i])
return i;
if (Utils::HostOsInfo::fileNameCaseSensitivity() == Qt::CaseSensitive) {
if (s1[i] != s2[i])
return i;
} else {
if (s1[i].toLower() != s2[i].toLower())
return i;
}
return length;
}
@@ -362,7 +367,7 @@ static QString correspondingHeaderOrSourceInProject(const QFileInfo &fileInfo,
const QStringList projectFiles = findFilesInProject(candidateFileName, project);
// Find the file having the most common path with fileName
foreach (const QString &projectFile, projectFiles) {
int value = commonStringLength(filePath, projectFile);
int value = commonFilePathLength(filePath, projectFile);
if (value > compareValue) {
compareValue = value;
bestFileName = projectFile;