Utils: Rename FileName to FilePath

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

View File

@@ -54,7 +54,7 @@ class CandidateTreeItem : public TreeItem
{
Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::Internal::AddRunConfigDialog)
public:
CandidateTreeItem(const RunConfigurationCreationInfo &rci, const FileName &projectRoot)
CandidateTreeItem(const RunConfigurationCreationInfo &rci, const FilePath &projectRoot)
: m_creationInfo(rci), m_projectRoot(projectRoot)
{ }
@@ -69,7 +69,7 @@ private:
if (column == 0 && role == Qt::DisplayRole)
return m_creationInfo.displayName;
if (column == 1 && role == Qt::DisplayRole) {
FileName displayPath = m_creationInfo.projectFilePath.relativeChildPath(m_projectRoot);
FilePath displayPath = m_creationInfo.projectFilePath.relativeChildPath(m_projectRoot);
if (displayPath.isEmpty()) {
displayPath = m_creationInfo.projectFilePath;
QTC_CHECK(displayPath.isEmpty());
@@ -80,7 +80,7 @@ private:
}
const RunConfigurationCreationInfo m_creationInfo;
const FileName m_projectRoot;
const FilePath m_projectRoot;
};
class CandidatesModel : public TreeModel<TreeItem, CandidateTreeItem>