diff options
Diffstat (limited to 'src/plugins/beautifier')
18 files changed, 105 insertions, 126 deletions
diff --git a/src/plugins/beautifier/CMakeLists.txt b/src/plugins/beautifier/CMakeLists.txt new file mode 100644 index 0000000000..f9955105ad --- /dev/null +++ b/src/plugins/beautifier/CMakeLists.txt @@ -0,0 +1,27 @@ +add_qtc_plugin(Beautifier + DEPENDS Qt5::Xml + PLUGIN_DEPENDS Core CppEditor DiffEditor ProjectExplorer TextEditor + SOURCES + abstractsettings.cpp abstractsettings.h + artisticstyle/artisticstyle.cpp artisticstyle/artisticstyle.h + artisticstyle/artisticstyleconstants.h + artisticstyle/artisticstyleoptionspage.cpp artisticstyle/artisticstyleoptionspage.h artisticstyle/artisticstyleoptionspage.ui + artisticstyle/artisticstylesettings.cpp artisticstyle/artisticstylesettings.h + beautifier.qrc + beautifierabstracttool.h + beautifierconstants.h + beautifierplugin.cpp beautifierplugin.h + clangformat/clangformat.cpp clangformat/clangformat.h + clangformat/clangformatconstants.h + clangformat/clangformatoptionspage.cpp clangformat/clangformatoptionspage.h clangformat/clangformatoptionspage.ui + clangformat/clangformatsettings.cpp clangformat/clangformatsettings.h + configurationdialog.cpp configurationdialog.h configurationdialog.ui + configurationeditor.cpp configurationeditor.h + configurationpanel.cpp configurationpanel.h configurationpanel.ui + generaloptionspage.cpp generaloptionspage.h generaloptionspage.ui + generalsettings.cpp generalsettings.h + uncrustify/uncrustify.cpp uncrustify/uncrustify.h + uncrustify/uncrustifyconstants.h + uncrustify/uncrustifyoptionspage.cpp uncrustify/uncrustifyoptionspage.h uncrustify/uncrustifyoptionspage.ui + uncrustify/uncrustifysettings.cpp uncrustify/uncrustifysettings.h +) diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp index 4d47a756d5..c7c091df90 100644 --- a/src/plugins/beautifier/abstractsettings.cpp +++ b/src/plugins/beautifier/abstractsettings.cpp @@ -32,6 +32,7 @@ #include <coreplugin/idocument.h> #include <utils/algorithm.h> #include <utils/fileutils.h> +#include <utils/genericconstants.h> #include <utils/mimetypes/mimedatabase.h> #include <QFile> @@ -204,7 +205,7 @@ void AbstractSettings::save() { // Save settings, except styles QSettings *s = Core::ICore::settings(); - s->beginGroup(Constants::SETTINGS_GROUP); + s->beginGroup(Utils::Constants::BEAUTIFIER_SETTINGS_GROUP); s->beginGroup(m_name); QMap<QString, QVariant>::const_iterator iSettings = m_settings.constBegin(); while (iSettings != m_settings.constEnd()) { @@ -276,7 +277,7 @@ void AbstractSettings::read() // Read settings, except styles QSettings *s = Core::ICore::settings(); - s->beginGroup(Constants::SETTINGS_GROUP); + s->beginGroup(Utils::Constants::BEAUTIFIER_SETTINGS_GROUP); s->beginGroup(m_name); const QStringList keys = s->allKeys(); for (const QString &key : keys) { diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index 4a7ee4ec54..2788214fee 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -29,7 +29,6 @@ #include "artisticstyleconstants.h" #include "artisticstyleoptionspage.h" -#include "artisticstylesettings.h" #include "../beautifierconstants.h" #include "../beautifierplugin.h" @@ -58,16 +57,6 @@ namespace Internal { namespace ArtisticStyle { ArtisticStyle::ArtisticStyle() - : m_settings(new ArtisticStyleSettings) -{ -} - -ArtisticStyle::~ArtisticStyle() -{ - delete m_settings; -} - -bool ArtisticStyle::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ArtisticStyle::MENU_ID); menu->menu()->setTitle(tr("&Artistic Style")); @@ -79,12 +68,10 @@ bool ArtisticStyle::initialize() Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); - connect(m_settings, &ArtisticStyleSettings::supportedMimeTypesChanged, + connect(&m_settings, &ArtisticStyleSettings::supportedMimeTypesChanged, [this] { updateActions(Core::EditorManager::currentEditor()); }); - new ArtisticStyleOptionsPage(m_settings, this); - - return true; + new ArtisticStyleOptionsPage(&m_settings, this); } QString ArtisticStyle::id() const @@ -94,7 +81,7 @@ QString ArtisticStyle::id() const void ArtisticStyle::updateActions(Core::IEditor *editor) { - m_formatFile->setEnabled(editor && m_settings->isApplicable(editor->document())); + m_formatFile->setEnabled(editor && m_settings.isApplicable(editor->document())); } void ArtisticStyle::formatFile() @@ -110,14 +97,14 @@ void ArtisticStyle::formatFile() QString ArtisticStyle::configurationFile() const { - if (m_settings->useCustomStyle()) - return m_settings->styleFileName(m_settings->customStyle()); + if (m_settings.useCustomStyle()) + return m_settings.styleFileName(m_settings.customStyle()); - if (m_settings->useOtherFiles()) { + if (m_settings.useOtherFiles()) { if (const ProjectExplorer::Project *project = ProjectExplorer::ProjectTree::currentProject()) { - const Utils::FileNameList files = project->files(ProjectExplorer::Project::AllFiles); - for (const Utils::FileName &file : files) { + const Utils::FilePathList files = project->files(ProjectExplorer::Project::AllFiles); + for (const Utils::FilePath &file : files) { if (!file.endsWith(".astylerc")) continue; const QFileInfo fi = file.toFileInfo(); @@ -127,13 +114,13 @@ QString ArtisticStyle::configurationFile() const } } - if (m_settings->useSpecificConfigFile()) { - const Utils::FileName file = m_settings->specificConfigFile(); + if (m_settings.useSpecificConfigFile()) { + const Utils::FilePath file = m_settings.specificConfigFile(); if (file.exists()) return file.toUserOutput(); } - if (m_settings->useHomeFile()) { + if (m_settings.useHomeFile()) { const QDir homeDirectory = QDir::home(); QString file = homeDirectory.filePath(".astylerc"); if (QFile::exists(file)) @@ -154,17 +141,17 @@ Command ArtisticStyle::command() const bool ArtisticStyle::isApplicable(const Core::IDocument *document) const { - return m_settings->isApplicable(document); + return m_settings.isApplicable(document); } Command ArtisticStyle::command(const QString &cfgFile) const { Command command; - command.setExecutable(m_settings->command()); + command.setExecutable(m_settings.command()); command.addOption("-q"); command.addOption("--options=" + cfgFile); - const int version = m_settings->version(); + const int version = m_settings.version(); if (version > ArtisticStyleSettings::Version_2_03) { command.setProcessing(Command::PipeProcessing); if (version == ArtisticStyleSettings::Version_2_04) diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.h b/src/plugins/beautifier/artisticstyle/artisticstyle.h index 5927814489..0e2b566da2 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.h @@ -27,23 +27,21 @@ #include "../beautifierabstracttool.h" +#include "artisticstylesettings.h" + QT_FORWARD_DECLARE_CLASS(QAction) namespace Beautifier { namespace Internal { namespace ArtisticStyle { -class ArtisticStyleSettings; - class ArtisticStyle : public BeautifierAbstractTool { Q_OBJECT public: ArtisticStyle(); - ~ArtisticStyle() override; - bool initialize() override; QString id() const override; void updateActions(Core::IEditor *editor) override; TextEditor::Command command() const override; @@ -52,7 +50,7 @@ public: private: void formatFile(); QAction *m_formatFile = nullptr; - ArtisticStyleSettings *m_settings; + ArtisticStyleSettings m_settings; QString configurationFile() const; TextEditor::Command command(const QString &cfgFile) const; }; diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index c6b9c60f07..41ba9270aa 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -131,12 +131,12 @@ void ArtisticStyleSettings::setUseSpecificConfigFile(bool useSpecificConfigFile) m_settings.insert(USE_SPECIFIC_CONFIG_FILE, QVariant(useSpecificConfigFile)); } -Utils::FileName ArtisticStyleSettings::specificConfigFile() const +Utils::FilePath ArtisticStyleSettings::specificConfigFile() const { - return Utils::FileName::fromString(m_settings.value(SPECIFIC_CONFIG_FILE).toString()); + return Utils::FilePath::fromString(m_settings.value(SPECIFIC_CONFIG_FILE).toString()); } -void ArtisticStyleSettings::setSpecificConfigFile(const Utils::FileName &specificConfigFile) +void ArtisticStyleSettings::setSpecificConfigFile(const Utils::FilePath &specificConfigFile) { m_settings.insert(SPECIFIC_CONFIG_FILE, QVariant(specificConfigFile.toString())); } diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h index 9e3c60e435..50deba87d6 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h @@ -56,8 +56,8 @@ public: bool useSpecificConfigFile() const; void setUseSpecificConfigFile(bool useSpecificConfigFile); - Utils::FileName specificConfigFile() const; - void setSpecificConfigFile(const Utils::FileName &specificConfigFile); + Utils::FilePath specificConfigFile() const; + void setSpecificConfigFile(const Utils::FilePath &specificConfigFile); bool useHomeFile() const; void setUseHomeFile(bool useHomeFile); diff --git a/src/plugins/beautifier/beautifierabstracttool.h b/src/plugins/beautifier/beautifierabstracttool.h index 813f37ac7f..d48ee0f576 100644 --- a/src/plugins/beautifier/beautifierabstracttool.h +++ b/src/plugins/beautifier/beautifierabstracttool.h @@ -45,7 +45,6 @@ public: BeautifierAbstractTool() = default; virtual QString id() const = 0; - virtual bool initialize() = 0; virtual void updateActions(Core::IEditor *editor) = 0; /** diff --git a/src/plugins/beautifier/beautifierconstants.h b/src/plugins/beautifier/beautifierconstants.h index 4430e62f6e..269f41bc84 100644 --- a/src/plugins/beautifier/beautifierconstants.h +++ b/src/plugins/beautifier/beautifierconstants.h @@ -34,7 +34,6 @@ const char ACTION_ID[] = "Beautifier.Action"; const char MENU_ID[] = "Beautifier.Menu"; const char OPTION_CATEGORY[] = "II.Beautifier"; const char OPTION_GENERAL_ID[] = "aaa.General"; -const char SETTINGS_GROUP[] = "Beautifier"; const char SETTINGS_DIRNAME[] = "beautifier"; const char DOCUMENTATION_DIRNAME[] = "documentation"; const char DOCUMENTATION_XMLROOT[] = "beautifier_documentation"; diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 90db34df1c..6e4cb079f2 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -129,10 +129,8 @@ BeautifierPluginPrivate::BeautifierPluginPrivate() { QStringList toolIds; toolIds.reserve(m_tools.count()); - for (BeautifierAbstractTool *tool : m_tools) { + for (BeautifierAbstractTool *tool : m_tools) toolIds << tool->id(); - tool->initialize(); - } m_generalSettings.reset(new GeneralSettings); new GeneralOptionsPage(m_generalSettings, toolIds, this); diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index ee2e9ad770..a6f7f8e198 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -29,7 +29,6 @@ #include "clangformatconstants.h" #include "clangformatoptionspage.h" -#include "clangformatsettings.h" #include "../beautifierconstants.h" #include "../beautifierplugin.h" @@ -58,21 +57,6 @@ namespace Internal { namespace ClangFormat { ClangFormat::ClangFormat() - : m_settings(new ClangFormatSettings) -{ -} - -ClangFormat::~ClangFormat() -{ - delete m_settings; -} - -QString ClangFormat::id() const -{ - return QLatin1String(Constants::ClangFormat::DISPLAY_NAME); -} - -bool ClangFormat::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::ClangFormat::MENU_ID); menu->menu()->setTitle(tr("&ClangFormat")); @@ -100,17 +84,20 @@ bool ClangFormat::initialize() Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); - connect(m_settings, &ClangFormatSettings::supportedMimeTypesChanged, + connect(&m_settings, &ClangFormatSettings::supportedMimeTypesChanged, [this] { updateActions(Core::EditorManager::currentEditor()); }); - new ClangFormatOptionsPage(m_settings, this); + new ClangFormatOptionsPage(&m_settings, this); +} - return true; +QString ClangFormat::id() const +{ + return QLatin1String(Constants::ClangFormat::DISPLAY_NAME); } void ClangFormat::updateActions(Core::IEditor *editor) { - const bool enabled = editor && m_settings->isApplicable(editor->document()); + const bool enabled = editor && m_settings.isApplicable(editor->document()); m_formatFile->setEnabled(enabled); m_formatRange->setEnabled(enabled); } @@ -180,14 +167,14 @@ void ClangFormat::disableFormattingSelectedText() Command ClangFormat::command() const { Command command; - command.setExecutable(m_settings->command()); + command.setExecutable(m_settings.command()); command.setProcessing(Command::PipeProcessing); - if (m_settings->usePredefinedStyle()) { - const QString predefinedStyle = m_settings->predefinedStyle(); + if (m_settings.usePredefinedStyle()) { + const QString predefinedStyle = m_settings.predefinedStyle(); command.addOption("-style=" + predefinedStyle); if (predefinedStyle == "File") { - const QString fallbackStyle = m_settings->fallbackStyle(); + const QString fallbackStyle = m_settings.fallbackStyle(); if (fallbackStyle != "Default") command.addOption("-fallback-style=" + fallbackStyle); } @@ -196,7 +183,7 @@ Command ClangFormat::command() const } else { command.addOption("-style=file"); const QString path = - QFileInfo(m_settings->styleFileName(m_settings->customStyle())).absolutePath(); + QFileInfo(m_settings.styleFileName(m_settings.customStyle())).absolutePath(); command.addOption("-assume-filename=" + path + QDir::separator() + "%filename"); } @@ -205,7 +192,7 @@ Command ClangFormat::command() const bool ClangFormat::isApplicable(const Core::IDocument *document) const { - return m_settings->isApplicable(document); + return m_settings.isApplicable(document); } Command ClangFormat::command(int offset, int length) const diff --git a/src/plugins/beautifier/clangformat/clangformat.h b/src/plugins/beautifier/clangformat/clangformat.h index 4d69d2e9e5..ecacd7d8cb 100644 --- a/src/plugins/beautifier/clangformat/clangformat.h +++ b/src/plugins/beautifier/clangformat/clangformat.h @@ -27,24 +27,22 @@ #include "../beautifierabstracttool.h" +#include "clangformatsettings.h" + QT_FORWARD_DECLARE_CLASS(QAction) namespace Beautifier { namespace Internal { namespace ClangFormat { -class ClangFormatSettings; - class ClangFormat : public BeautifierAbstractTool { Q_OBJECT public: ClangFormat(); - ~ClangFormat() override; QString id() const override; - bool initialize() override; void updateActions(Core::IEditor *editor) override; TextEditor::Command command() const override; bool isApplicable(const Core::IDocument *document) const override; @@ -53,11 +51,12 @@ private: void formatFile(); void formatAtCursor(); void disableFormattingSelectedText(); + TextEditor::Command command(int offset, int length) const; + QAction *m_formatFile = nullptr; QAction *m_formatRange = nullptr; QAction *m_disableFormattingSelectedText = nullptr; - ClangFormatSettings *m_settings; - TextEditor::Command command(int offset, int length) const; + ClangFormatSettings m_settings; }; } // namespace ClangFormat diff --git a/src/plugins/beautifier/configurationeditor.cpp b/src/plugins/beautifier/configurationeditor.cpp index 7c98602892..179864b0b9 100644 --- a/src/plugins/beautifier/configurationeditor.cpp +++ b/src/plugins/beautifier/configurationeditor.cpp @@ -98,7 +98,7 @@ ConfigurationEditor::ConfigurationEditor(QWidget *parent) : m_completer->setCaseSensitivity(Qt::CaseInsensitive); m_completer->popup()->installEventFilter(this); - connect(m_completer, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), + connect(m_completer, QOverload<const QString &>::of(&QCompleter::activated), this, &ConfigurationEditor::insertCompleterText); connect(this, &ConfigurationEditor::cursorPositionChanged, this, &ConfigurationEditor::updateDocumentation); diff --git a/src/plugins/beautifier/configurationpanel.cpp b/src/plugins/beautifier/configurationpanel.cpp index 1e5a8dfaa9..a693d42b99 100644 --- a/src/plugins/beautifier/configurationpanel.cpp +++ b/src/plugins/beautifier/configurationpanel.cpp @@ -40,7 +40,7 @@ ConfigurationPanel::ConfigurationPanel(QWidget *parent) : connect(ui->add, &QPushButton::clicked, this, &ConfigurationPanel::add); connect(ui->edit, &QPushButton::clicked, this, &ConfigurationPanel::edit); connect(ui->remove, &QPushButton::clicked, this, &ConfigurationPanel::remove); - connect(ui->configurations, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(ui->configurations, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ConfigurationPanel::updateButtons); } diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp index a3018950d1..9546ec5d25 100644 --- a/src/plugins/beautifier/generalsettings.cpp +++ b/src/plugins/beautifier/generalsettings.cpp @@ -29,14 +29,13 @@ #include <coreplugin/icore.h> #include <utils/algorithm.h> +#include <utils/genericconstants.h> #include <utils/mimetypes/mimedatabase.h> namespace Beautifier { namespace Internal { namespace { -const char GROUP[] = "General"; -const char AUTO_FORMAT_ON_SAVE[] = "autoFormatOnSave"; const char AUTO_FORMAT_TOOL[] = "autoFormatTool"; const char AUTO_FORMAT_MIME[] = "autoFormatMime"; const char AUTO_FORMAT_ONLY_CURRENT_PROJECT[] = "autoFormatOnlyCurrentProject"; @@ -50,9 +49,9 @@ GeneralSettings::GeneralSettings() void GeneralSettings::read() { QSettings *s = Core::ICore::settings(); - s->beginGroup(Constants::SETTINGS_GROUP); - s->beginGroup(GROUP); - m_autoFormatOnSave = s->value(AUTO_FORMAT_ON_SAVE, false).toBool(); + s->beginGroup(Utils::Constants::BEAUTIFIER_SETTINGS_GROUP); + s->beginGroup(Utils::Constants::BEAUTIFIER_GENERAL_GROUP); + m_autoFormatOnSave = s->value(Utils::Constants::BEAUTIFIER_AUTO_FORMAT_ON_SAVE, false).toBool(); m_autoFormatTool = s->value(AUTO_FORMAT_TOOL, QString()).toString(); setAutoFormatMime(s->value(AUTO_FORMAT_MIME, "text/x-c++src;text/x-c++hdr").toString()); m_autoFormatOnlyCurrentProject = s->value(AUTO_FORMAT_ONLY_CURRENT_PROJECT, true).toBool(); @@ -63,9 +62,9 @@ void GeneralSettings::read() void GeneralSettings::save() { QSettings *s = Core::ICore::settings(); - s->beginGroup(Constants::SETTINGS_GROUP); - s->beginGroup(GROUP); - s->setValue(AUTO_FORMAT_ON_SAVE, m_autoFormatOnSave); + s->beginGroup(Utils::Constants::BEAUTIFIER_SETTINGS_GROUP); + s->beginGroup(Utils::Constants::BEAUTIFIER_GENERAL_GROUP); + s->setValue(Utils::Constants::BEAUTIFIER_AUTO_FORMAT_ON_SAVE, m_autoFormatOnSave); s->setValue(AUTO_FORMAT_TOOL, m_autoFormatTool); s->setValue(AUTO_FORMAT_MIME, autoFormatMimeAsString()); s->setValue(AUTO_FORMAT_ONLY_CURRENT_PROJECT, m_autoFormatOnlyCurrentProject); diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp index daeffdf2df..f6a36eadc0 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp @@ -29,7 +29,6 @@ #include "uncrustifyconstants.h" #include "uncrustifyoptionspage.h" -#include "uncrustifysettings.h" #include "../beautifierconstants.h" #include "../beautifierplugin.h" @@ -58,16 +57,6 @@ namespace Internal { namespace Uncrustify { Uncrustify::Uncrustify() - : m_settings(new UncrustifySettings) -{ -} - -Uncrustify::~Uncrustify() -{ - delete m_settings; -} - -bool Uncrustify::initialize() { Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::Uncrustify::MENU_ID); menu->menu()->setTitle(tr("&Uncrustify")); @@ -87,12 +76,10 @@ bool Uncrustify::initialize() Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); - connect(m_settings, &UncrustifySettings::supportedMimeTypesChanged, + connect(&m_settings, &UncrustifySettings::supportedMimeTypesChanged, [this] { updateActions(Core::EditorManager::currentEditor()); }); - new UncrustifyOptionsPage(m_settings, this); - - return true; + new UncrustifyOptionsPage(&m_settings, this); } QString Uncrustify::id() const @@ -102,7 +89,7 @@ QString Uncrustify::id() const void Uncrustify::updateActions(Core::IEditor *editor) { - const bool enabled = editor && m_settings->isApplicable(editor->document()); + const bool enabled = editor && m_settings.isApplicable(editor->document()); m_formatFile->setEnabled(enabled); m_formatRange->setEnabled(enabled); } @@ -144,21 +131,21 @@ void Uncrustify::formatSelectedText() tc.movePosition(QTextCursor::EndOfLine); const int endPos = tc.position(); formatCurrentFile(command(cfgFileName, true), startPos, endPos); - } else if (m_settings->formatEntireFileFallback()) { + } else if (m_settings.formatEntireFileFallback()) { formatFile(); } } QString Uncrustify::configurationFile() const { - if (m_settings->useCustomStyle()) - return m_settings->styleFileName(m_settings->customStyle()); + if (m_settings.useCustomStyle()) + return m_settings.styleFileName(m_settings.customStyle()); - if (m_settings->useOtherFiles()) { + if (m_settings.useOtherFiles()) { if (const ProjectExplorer::Project *project = ProjectExplorer::ProjectTree::currentProject()) { - const Utils::FileNameList files = project->files(ProjectExplorer::Project::AllFiles); - for (const Utils::FileName &file : files) { + const Utils::FilePathList files = project->files(ProjectExplorer::Project::AllFiles); + for (const Utils::FilePath &file : files) { if (!file.endsWith("cfg")) continue; const QFileInfo fi = file.toFileInfo(); @@ -168,13 +155,13 @@ QString Uncrustify::configurationFile() const } } - if (m_settings->useSpecificConfigFile()) { - const Utils::FileName file = m_settings->specificConfigFile(); + if (m_settings.useSpecificConfigFile()) { + const Utils::FilePath file = m_settings.specificConfigFile(); if (file.exists()) return file.toString(); } - if (m_settings->useHomeFile()) { + if (m_settings.useHomeFile()) { const QString file = QDir::home().filePath("uncrustify.cfg"); if (QFile::exists(file)) return file; @@ -191,15 +178,15 @@ Command Uncrustify::command() const bool Uncrustify::isApplicable(const Core::IDocument *document) const { - return m_settings->isApplicable(document); + return m_settings.isApplicable(document); } Command Uncrustify::command(const QString &cfgFile, bool fragment) const { Command command; - command.setExecutable(m_settings->command()); + command.setExecutable(m_settings.command()); command.setProcessing(Command::PipeProcessing); - if (m_settings->version() >= 62) { + if (m_settings.version() >= 62) { command.addOption("--assume"); command.addOption("%file"); } else { diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h index e35434fc81..ece235fb8b 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.h +++ b/src/plugins/beautifier/uncrustify/uncrustify.h @@ -27,22 +27,21 @@ #include "../beautifierabstracttool.h" +#include "uncrustifysettings.h" + QT_FORWARD_DECLARE_CLASS(QAction) namespace Beautifier { namespace Internal { namespace Uncrustify { -class UncrustifySettings; - class Uncrustify : public BeautifierAbstractTool { Q_OBJECT public: Uncrustify(); - ~Uncrustify() override; - bool initialize() override; + QString id() const override; void updateActions(Core::IEditor *editor) override; TextEditor::Command command() const override; @@ -53,7 +52,7 @@ private: void formatSelectedText(); QAction *m_formatFile = nullptr; QAction *m_formatRange = nullptr; - UncrustifySettings *m_settings; + UncrustifySettings m_settings; QString configurationFile() const; TextEditor::Command command(const QString &cfgFile, bool fragment = false) const; }; diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp index 20b134d122..7d7954ceb7 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp @@ -56,8 +56,7 @@ const char FORMAT_ENTIRE_FILE_FALLBACK[] = "formatEntireFileFallback"; UncrustifySettings::UncrustifySettings() : AbstractSettings(Constants::Uncrustify::SETTINGS_NAME, ".cfg") { - connect(&m_versionProcess, - static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(&m_versionProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &UncrustifySettings::parseVersionProcessResult); setCommand("uncrustify"); @@ -91,12 +90,12 @@ void UncrustifySettings::setUseHomeFile(bool useHomeFile) m_settings.insert(USE_HOME_FILE, QVariant(useHomeFile)); } -Utils::FileName UncrustifySettings::specificConfigFile() const +Utils::FilePath UncrustifySettings::specificConfigFile() const { - return Utils::FileName::fromString(m_settings.value(SPECIFIC_CONFIG_FILE_PATH).toString()); + return Utils::FilePath::fromString(m_settings.value(SPECIFIC_CONFIG_FILE_PATH).toString()); } -void UncrustifySettings::setSpecificConfigFile(const Utils::FileName &filePath) +void UncrustifySettings::setSpecificConfigFile(const Utils::FilePath &filePath) { m_settings.insert(SPECIFIC_CONFIG_FILE_PATH, QVariant(filePath.toString())); } diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h index 8b21db84f9..07798ef1e1 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h @@ -60,8 +60,8 @@ public: void updateVersion() override; - Utils::FileName specificConfigFile() const; - void setSpecificConfigFile(const Utils::FileName &filePath); + Utils::FilePath specificConfigFile() const; + void setSpecificConfigFile(const Utils::FilePath &filePath); bool useSpecificConfigFile() const; void setUseSpecificConfigFile(bool useConfigFile); |