diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-07-09 10:29:15 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-07-10 07:42:31 +0000 |
| commit | e49ccd0747b9fa9699ac44da9b26e0a8f349b5f5 (patch) | |
| tree | 33d8f38710ae95d0e5ce142255f85f9116d4b7dd /src/plugins/beautifier | |
| parent | 6b0d9f7047180a2dd52a2287421d2ea43c8e3342 (diff) | |
Beautifier: Minor cleanup
* Use initializer list and Utils::transform
* Remove unneeded override
Change-Id: I36ff9b9900fa6169ed1529bbbbdba13075353332
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/beautifier')
| -rw-r--r-- | src/plugins/beautifier/beautifierplugin.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/beautifier/beautifierplugin.h | 1 | ||||
| -rw-r--r-- | src/plugins/beautifier/generalsettings.cpp | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 4120643882..702f33a0ab 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 b75f34bab0..14d6674ab8 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 f92d120503..a3018950d1 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) |