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

FileUtils: Replace FileNameList with an alias

Browse Source 
The functionality in that class is covered by initializers and
Utils::unique, so there is no need to keep a custom class.

This way FileNameList plays way nicer with utils/algorithm.h.

Change-Id: I8eeae6aca0558ecd998920c4fdfc5ea56bf75501
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-03 13:52:52 +01:00
parent 1bb16ad6b5
commit e1ed5e4804
7 changed files with 14 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <texteditor/basefilefind.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
#include <utils/textfileformat.h>
@@ -280,7 +281,7 @@ static void find_helper(QFutureInterface<Usage> &future,
const Utils::FileName sourceFile = Utils::FileName::fromUtf8(symbol->fileName(),
symbol->fileNameLength());
Utils::FileNameList files(sourceFile);
Utils::FileNameList files {sourceFile};
if (symbol->isClass()
|| symbol->isForwardClassDeclaration()
@@ -300,7 +301,7 @@ static void find_helper(QFutureInterface<Usage> &future,
} else {
files += snapshot.filesDependingOn(sourceFile);
}
files.removeDuplicates();
files = Utils::filteredUnique(files);
future.setProgressRange(0, files.size());
@@ -617,9 +618,8 @@ static void findMacroUses_helper(QFutureInterface<Usage> &future,
const Macro macro)
{
const Utils::FileName sourceFile = Utils::FileName::fromString(macro.fileName());
Utils::FileNameList files(sourceFile);
files += snapshot.filesDependingOn(sourceFile);
files.removeDuplicates();
Utils::FileNameList files {sourceFile};
files = Utils::filteredUnique(files + snapshot.filesDependingOn(sourceFile));
future.setProgressRange(0, files.size());
FindMacroUsesInFile process(workingCopy, snapshot, macro, &future);