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/makefileparse.cpp
View File

@@ -39,7 +39,7 @@
using namespace QmakeProjectManager;
using namespace Internal;
using Utils::FileName;
using Utils::FilePath;
using Utils::QtcProcess;
using QtSupport::QtVersionManager;
using QtSupport::BaseQtVersion;
@@ -242,7 +242,7 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
}
}
static FileName findQMakeBinaryFromMakefile(const QString &makefile)
static FilePath findQMakeBinaryFromMakefile(const QString &makefile)
{
QFile fi(makefile);
if (fi.exists() && fi.open(QFile::ReadOnly)) {
@@ -260,11 +260,11 @@ static FileName findQMakeBinaryFromMakefile(const QString &makefile)
// Is qmake still installed?
QFileInfo fi(qmakePath);
if (fi.exists())
return FileName::fromFileInfo(fi);
return FilePath::fromFileInfo(fi);
}
}
}
return FileName();
return FilePath();
}
MakeFileParse::MakeFileParse(const QString &makefile)
@@ -312,7 +312,7 @@ MakeFileParse::MakefileState MakeFileParse::makeFileState() const
return m_state;
}
Utils::FileName MakeFileParse::qmakePath() const
Utils::FilePath MakeFileParse::qmakePath() const
{
return m_qmakePath;
}