diff options
author | hjk <hjk@qt.io> | 2020-04-09 11:05:50 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-04-09 17:30:23 +0000 |
commit | 79b680e7f0b0ff5ecca9b17fabb11fd03947ec8f (patch) | |
tree | ec8f594ed02b1a55869ade473130efb806b20ca1 /src/plugins/beautifier | |
parent | 45ba9fcd535e4cfd5f057149b1ca4bb4dfed5bdb (diff) |
Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()
It's returning a FilePath, so it's a better fit.
Keep the old versions as inline function now to ease downstream migration.
Change-Id: I535887928018f42b92895c8b0c82527f0d55e5ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/beautifier')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 66292f91c0..63b4ed28d0 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -82,7 +82,7 @@ void ArtisticStyleOptionsPageWidget::apply() m_settings->setSupportedMimeTypes(ui.mime->text()); m_settings->setUseOtherFiles(ui.useOtherFiles->isChecked()); m_settings->setUseSpecificConfigFile(ui.useSpecificConfigFile->isChecked()); - m_settings->setSpecificConfigFile(ui.specificConfigFile->fileName()); + m_settings->setSpecificConfigFile(ui.specificConfigFile->filePath()); m_settings->setUseHomeFile(ui.useHomeFile->isChecked()); m_settings->setUseCustomStyle(ui.useCustomStyle->isChecked()); m_settings->setCustomStyle(ui.configurations->currentConfiguration()); diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index 0ac10b98bf..d6f85baa98 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -71,7 +71,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings * }); ui.configurations->setSettings(m_settings); - ui.command->setFileName(m_settings->command()); + ui.command->setFilePath(m_settings->command()); ui.mime->setText(m_settings->supportedMimeTypesAsString()); const int predefinedStyleIndex = ui.predefinedStyle->findText(m_settings->predefinedStyle()); if (predefinedStyleIndex != -1) diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index c9d98f802c..07b447d529 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -67,12 +67,12 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set connect(ui.command, &Utils::PathChooser::validChanged, ui.options, &QWidget::setEnabled); ui.configurations->setSettings(m_settings); - ui.command->setFileName(m_settings->command()); + ui.command->setFilePath(m_settings->command()); ui.mime->setText(m_settings->supportedMimeTypesAsString()); ui.useOtherFiles->setChecked(m_settings->useOtherFiles()); ui.useHomeFile->setChecked(m_settings->useHomeFile()); ui.useSpecificFile->setChecked(m_settings->useSpecificConfigFile()); - ui.uncrusifyFilePath->setFileName(m_settings->specificConfigFile()); + ui.uncrusifyFilePath->setFilePath(m_settings->specificConfigFile()); ui.useCustomStyle->setChecked(m_settings->useCustomStyle()); ui.configurations->setCurrentConfiguration(m_settings->customStyle()); ui.formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback()); @@ -85,7 +85,7 @@ void UncrustifyOptionsPageWidget::apply() m_settings->setUseOtherFiles(ui.useOtherFiles->isChecked()); m_settings->setUseHomeFile(ui.useHomeFile->isChecked()); m_settings->setUseSpecificConfigFile(ui.useSpecificFile->isChecked()); - m_settings->setSpecificConfigFile(ui.uncrusifyFilePath->fileName()); + m_settings->setSpecificConfigFile(ui.uncrusifyFilePath->filePath()); m_settings->setUseCustomStyle(ui.useCustomStyle->isChecked()); m_settings->setCustomStyle(ui.configurations->currentConfiguration()); m_settings->setFormatEntireFileFallback(ui.formatEntireFileFallback->isChecked()); |