From e49ccd0747b9fa9699ac44da9b26e0a8f349b5f5 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sun, 9 Jul 2017 10:29:15 +0300
Subject: [PATCH] Beautifier: Minor cleanup
* Use initializer list and Utils::transform
* Remove unneeded override
Change-Id: I36ff9b9900fa6169ed1529bbbbdba13075353332
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
src/plugins/beautifier/beautifierplugin.cpp | 13 +++++--------
src/plugins/beautifier/beautifierplugin.h | 1 -
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 41206438821..702f33a0abd 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 b75f34bab0e..14d6674ab8a 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 f92d1205037..a3018950d17 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)
--
GitLab