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

12
src/plugins/projectexplorer/projectconfigurationaspects.cpp
View File

@@ -79,7 +79,7 @@ public:
QPointer<PathChooser> m_pathChooserDisplay;
QPointer<QTextEdit> m_textEditDisplay;
QPixmap m_labelPixmap;
Utils::FileName m_baseFileName;
Utils::FilePath m_baseFileName;
};
class BaseIntegerAspectPrivate
@@ -138,12 +138,12 @@ void BaseStringAspect::toMap(QVariantMap &map) const
d->m_checker->toMap(map);
}
FileName BaseStringAspect::fileName() const
FilePath BaseStringAspect::fileName() const
{
return FileName::fromString(d->m_value);
return FilePath::fromString(d->m_value);
}
void BaseStringAspect::setFileName(const FileName &val)
void BaseStringAspect::setFileName(const FilePath &val)
{
setValue(val.toString());
}
@@ -214,7 +214,7 @@ void BaseStringAspect::setEnvironment(const Environment &env)
d->m_pathChooserDisplay->setEnvironment(env);
}
void BaseStringAspect::setBaseFileName(const FileName &baseFileName)
void BaseStringAspect::setBaseFileName(const FilePath &baseFileName)
{
d->m_baseFileName = baseFileName;
if (d->m_pathChooserDisplay)
@@ -292,7 +292,7 @@ void BaseStringAspect::update()
const bool enabled = !d->m_checker || d->m_checker->value();
if (d->m_pathChooserDisplay) {
d->m_pathChooserDisplay->setFileName(FileName::fromString(displayedString));
d->m_pathChooserDisplay->setFileName(FilePath::fromString(displayedString));
d->m_pathChooserDisplay->setEnabled(enabled);
}