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

@@ -117,9 +117,9 @@ QString CodeStylePool::settingsDir() const
return customCodeStylesPath().append(suffix);
}
Utils::FileName CodeStylePool::settingsPath(const QByteArray &id) const
Utils::FilePath CodeStylePool::settingsPath(const QByteArray &id) const
{
return Utils::FileName::fromString(settingsDir()).pathAppended(QString::fromUtf8(id + ".xml"));
return Utils::FilePath::fromString(settingsDir()).pathAppended(QString::fromUtf8(id + ".xml"));
}
QList<ICodeStylePreferences *> CodeStylePool::codeStyles() const
@@ -218,11 +218,11 @@ void CodeStylePool::loadCustomCodeStyles()
const QString codeStyleFile = codeStyleFiles.at(i);
// filter out styles which id is the same as one of built-in styles
if (!d->m_idToCodeStyle.contains(QFileInfo(codeStyleFile).completeBaseName().toUtf8()))
loadCodeStyle(Utils::FileName::fromString(dir.absoluteFilePath(codeStyleFile)));
loadCodeStyle(Utils::FilePath::fromString(dir.absoluteFilePath(codeStyleFile)));
}
}
ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fileName)
ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FilePath &fileName)
{
ICodeStylePreferences *codeStyle = loadCodeStyle(fileName);
if (codeStyle)
@@ -230,7 +230,7 @@ ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fil
return codeStyle;
}
ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FileName &fileName)
ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FilePath &fileName)
{
ICodeStylePreferences *codeStyle = nullptr;
Utils::PersistentSettingsReader reader;
@@ -280,7 +280,7 @@ void CodeStylePool::saveCodeStyle(ICodeStylePreferences *codeStyle) const
exportCodeStyle(settingsPath(codeStyle->id()), codeStyle);
}
void CodeStylePool::exportCodeStyle(const Utils::FileName &fileName, ICodeStylePreferences *codeStyle) const
void CodeStylePool::exportCodeStyle(const Utils::FilePath &fileName, ICodeStylePreferences *codeStyle) const
{
QVariantMap map;
codeStyle->toMap(QString(), &map);