From 437cb039e15a04adf2fa7354c942a7aefd73bd64 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Thu, 18 Aug 2016 12:00:57 +0200
Subject: [PATCH] Snippets: Code cosmetics

Change-Id: I1586c8167b8c9797d2594255e4ba14329accec44
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/texteditor/snippets/snippet.cpp | 17 +++++++++--------
 src/plugins/texteditor/snippets/snippet.h   |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp
index 4a743006a90..b76a1aef42b 100644
--- a/src/plugins/texteditor/snippets/snippet.cpp
+++ b/src/plugins/texteditor/snippets/snippet.cpp
@@ -43,25 +43,27 @@ const char TCMANGLER_ID[] = "TextEditor::TitlecaseMangler";
 // Manglers:
 // --------------------------------------------------------------------
 
+NameMangler::~NameMangler() = default;
+
 class UppercaseMangler : public NameMangler
 {
 public:
-    Core::Id id() const { return UCMANGLER_ID; }
-    QString mangle(const QString &unmangled) const { return unmangled.toUpper(); }
+    Core::Id id() const final { return UCMANGLER_ID; }
+    QString mangle(const QString &unmangled) const final { return unmangled.toUpper(); }
 };
 
 class LowercaseMangler : public NameMangler
 {
 public:
-    Core::Id id() const { return LCMANGLER_ID; }
-    QString mangle(const QString &unmangled) const { return unmangled.toLower(); }
+    Core::Id id() const final { return LCMANGLER_ID; }
+    QString mangle(const QString &unmangled) const final { return unmangled.toLower(); }
 };
 
 class TitlecaseMangler : public NameMangler
 {
 public:
-    Core::Id id() const { return TCMANGLER_ID; }
-    QString mangle(const QString &unmangled) const
+    Core::Id id() const final { return TCMANGLER_ID; }
+    QString mangle(const QString &unmangled) const final
     {
         QString result = unmangled;
         if (!result.isEmpty())
@@ -77,8 +79,7 @@ public:
 const QChar Snippet::kVariableDelimiter(QLatin1Char('$'));
 const QChar Snippet::kEscapeChar(QLatin1Char('\\'));
 
-Snippet::Snippet(const QString &groupId, const QString &id) :
-    m_isRemoved(false), m_isModified(false), m_groupId(groupId), m_id(id)
+Snippet::Snippet(const QString &groupId, const QString &id) : m_groupId(groupId), m_id(id)
 {}
 
 Snippet::~Snippet()
diff --git a/src/plugins/texteditor/snippets/snippet.h b/src/plugins/texteditor/snippets/snippet.h
index 7b95169a1f1..3191000b543 100644
--- a/src/plugins/texteditor/snippets/snippet.h
+++ b/src/plugins/texteditor/snippets/snippet.h
@@ -38,7 +38,7 @@ namespace TextEditor {
 class TEXTEDITOR_EXPORT NameMangler
 {
 public:
-    virtual ~NameMangler() { }
+    virtual ~NameMangler();
 
     virtual Core::Id id() const = 0;
     virtual QString mangle(const QString &unmangled) const = 0;
@@ -92,8 +92,8 @@ public:
     static ParsedSnippet parse(const QString &snippet);
 
 private:
-    bool m_isRemoved;
-    bool m_isModified;
+    bool m_isRemoved = false;
+    bool m_isModified = false;
     QString m_groupId;
     QString m_id; // Only built-in snippets have an id.
     QString m_trigger;