diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 41206438821da05fb48b3c7846ae60341a1913ab..702f33a0abd4dd93e6b20b05d938dd58a61b3a66 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -201,9 +201,11 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt void BeautifierPlugin::extensionsInitialized() { - m_tools << new ArtisticStyle::ArtisticStyle(this); - m_tools << new ClangFormat::ClangFormat(this); - m_tools << new Uncrustify::Uncrustify(this); + m_tools = { + new ArtisticStyle::ArtisticStyle(this), + new ClangFormat::ClangFormat(this), + new Uncrustify::Uncrustify(this) + }; QStringList toolIds; toolIds.reserve(m_tools.count()); @@ -228,11 +230,6 @@ void BeautifierPlugin::extensionsInitialized() this, &BeautifierPlugin::autoFormatOnSave); } -ExtensionSystem::IPlugin::ShutdownFlag BeautifierPlugin::aboutToShutdown() -{ - return SynchronousShutdown; -} - void BeautifierPlugin::updateActions(Core::IEditor *editor) { for (BeautifierAbstractTool *tool : m_tools) diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h index b75f34bab0e010667a722879451ab7ae9a035ca9..14d6674ab8aef98c17895e1777aafb23ab86f7e1 100644 --- a/src/plugins/beautifier/beautifierplugin.h +++ b/src/plugins/beautifier/beautifierplugin.h @@ -74,7 +74,6 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin public: bool initialize(const QStringList &arguments, QString *errorString) override; void extensionsInitialized() override; - ShutdownFlag aboutToShutdown() override; void formatCurrentFile(const Command &command, int startPos = -1, int endPos = 0); diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp index f92d12050372bb482d790eca32a41a622dfb63fb..a3018950d1711514141e6a174b1996cbb3bb4e64 100644 --- a/src/plugins/beautifier/generalsettings.cpp +++ b/src/plugins/beautifier/generalsettings.cpp @@ -28,6 +28,7 @@ #include "beautifierconstants.h" #include <coreplugin/icore.h> +#include <utils/algorithm.h> #include <utils/mimetypes/mimedatabase.h> namespace Beautifier { @@ -99,11 +100,7 @@ QList<Utils::MimeType> GeneralSettings::autoFormatMime() const QString GeneralSettings::autoFormatMimeAsString() const { - QStringList types; - types.reserve(m_autoFormatMime.count()); - for (auto t : m_autoFormatMime) - types << t.name(); - return types.join("; "); + return Utils::transform(m_autoFormatMime, &Utils::MimeType::name).join("; "); } void GeneralSettings::setAutoFormatMime(const QList<Utils::MimeType> &autoFormatMime)