diff options
Diffstat (limited to 'src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp')
| -rw-r--r-- | src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index c9d98f802c..2a93458108 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -35,7 +35,6 @@ namespace Beautifier { namespace Internal { -namespace Uncrustify { class UncrustifyOptionsPageWidget : public Core::IOptionsPageWidget { @@ -63,16 +62,16 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set ui.command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui.command->setCommandVersionArguments({"--version"}); ui.command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( - Uncrustify::tr(Constants::Uncrustify::DISPLAY_NAME))); + Uncrustify::tr(Constants::UNCRUSTIFY_DISPLAY_NAME))); 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()); @@ -80,12 +79,12 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set void UncrustifyOptionsPageWidget::apply() { - m_settings->setCommand(ui.command->path()); + m_settings->setCommand(ui.command->filePath().toString()); m_settings->setSupportedMimeTypes(ui.mime->text()); 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()); @@ -97,12 +96,11 @@ void UncrustifyOptionsPageWidget::apply() UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings) { - setId(Constants::Uncrustify::OPTION_ID); + setId("Uncrustify"); setDisplayName(UncrustifyOptionsPageWidget::tr("Uncrustify")); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([settings] { return new UncrustifyOptionsPageWidget(settings); }); } -} // namespace Uncrustify } // namespace Internal } // namespace Beautifier |