diff options
Diffstat (limited to 'src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp')
| -rw-r--r-- | src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 66292f91c0..729c44c15b 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -35,7 +35,6 @@ namespace Beautifier { namespace Internal { -namespace ArtisticStyle { class ArtisticStyleOptionsPageWidget : public Core::IOptionsPageWidget { @@ -62,15 +61,15 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett ui.command->setExpectedKind(Utils::PathChooser::ExistingCommand); ui.command->setCommandVersionArguments({"--version"}); ui.command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle( - ArtisticStyle::tr(Constants::ArtisticStyle::DISPLAY_NAME))); + ArtisticStyle::tr(Constants::ARTISTICSTYLE_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.useSpecificConfigFile->setChecked(m_settings->useSpecificConfigFile()); - ui.specificConfigFile->setFileName(m_settings->specificConfigFile()); + ui.specificConfigFile->setFilePath(m_settings->specificConfigFile()); ui.useHomeFile->setChecked(m_settings->useHomeFile()); ui.useCustomStyle->setChecked(m_settings->useCustomStyle()); ui.configurations->setCurrentConfiguration(m_settings->customStyle()); @@ -78,11 +77,11 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett void ArtisticStyleOptionsPageWidget::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->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()); @@ -94,12 +93,11 @@ void ArtisticStyleOptionsPageWidget::apply() ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settings) { - setId(Constants::ArtisticStyle::OPTION_ID); + setId("ArtisticStyle"); setDisplayName(ArtisticStyleOptionsPageWidget::tr("Artistic Style")); setCategory(Constants::OPTION_CATEGORY); setWidgetCreator([settings] { return new ArtisticStyleOptionsPageWidget(settings); }); } -} // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier |