diff options
| author | hjk <hjk@qt.io> | 2019-05-28 13:49:26 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-05-28 12:23:26 +0000 |
| commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
| tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/texteditor/codestylepool.cpp | |
| parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
| download | qt-creator-473a741c9fcf09febba312464fab8385e2351181.tar.gz | |
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>
Diffstat (limited to 'src/plugins/texteditor/codestylepool.cpp')
| -rw-r--r-- | src/plugins/texteditor/codestylepool.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp index 348b810070..7696fe0623 100644 --- a/src/plugins/texteditor/codestylepool.cpp +++ b/src/plugins/texteditor/codestylepool.cpp @@ -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); |