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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -64,8 +64,8 @@ namespace {
struct DirectoryData
{
QString makefile;
Utils::FileName buildDirectory;
Utils::FileName canonicalQmakeBinary;
Utils::FilePath buildDirectory;
Utils::FilePath canonicalQmakeBinary;
QtProjectImporter::QtVersionData qtVersionData;
QString parsedSpec;
BaseQtVersion::QmakeBuildConfigs buildConfig;
@@ -83,7 +83,7 @@ namespace Internal {
const Core::Id QT_IS_TEMPORARY("Qmake.TempQt");
const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // ugly
QmakeProjectImporter::QmakeProjectImporter(const FileName &path) :
QmakeProjectImporter::QmakeProjectImporter(const FilePath &path) :
QtProjectImporter(path)
{ }
@@ -109,7 +109,7 @@ QStringList QmakeProjectImporter::importCandidates()
return candidates;
}
QList<void *> QmakeProjectImporter::examineDirectory(const FileName &importPath) const
QList<void *> QmakeProjectImporter::examineDirectory(const FilePath &importPath) const
{
QList<void *> result;
const QLoggingCategory &logs = MakeFileParse::logging();
@@ -136,7 +136,7 @@ QList<void *> QmakeProjectImporter::examineDirectory(const FileName &importPath)
}
QFileInfo qmakeFi = parse.qmakePath().toFileInfo();
data->canonicalQmakeBinary = FileName::fromString(qmakeFi.canonicalFilePath());
data->canonicalQmakeBinary = FilePath::fromString(qmakeFi.canonicalFilePath());
if (data->canonicalQmakeBinary.isEmpty()) {
qCDebug(logs) << " " << parse.qmakePath() << "doesn't exist anymore";
continue;