From 2c98c04fc4675a5e02d502138e4c0ab9475d200f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 29 Nov 2016 15:09:19 +0100
Subject: [PATCH] Core: Initialize members in IMode, clean up code a bit

Change-Id: I2cef9e0eb9c68efae4ca84d487f5a08675874efd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/imode.cpp | 7 ++-----
 src/plugins/coreplugin/imode.h   | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/plugins/coreplugin/imode.cpp b/src/plugins/coreplugin/imode.cpp
index ed105233574..4dd1b94e663 100644
--- a/src/plugins/coreplugin/imode.cpp
+++ b/src/plugins/coreplugin/imode.cpp
@@ -26,16 +26,13 @@
 #include "imode.h"
 
 using namespace Core;
-IMode::IMode(QObject *parent)
-    : IContext(parent),
-    m_isEnabled(true)
+IMode::IMode(QObject *parent) : IContext(parent)
 {
 }
 
 IMode::~IMode()
 {
-    if (m_menu)
-        delete m_menu;
+    delete m_menu;
 }
 
 void IMode::setEnabled(bool enabled)
diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h
index 4db3e51f095..8d40050791f 100644
--- a/src/plugins/coreplugin/imode.h
+++ b/src/plugins/coreplugin/imode.h
@@ -63,9 +63,9 @@ private:
     QString m_displayName;
     QIcon m_icon;
     QMenu *m_menu = nullptr;
-    int m_priority;
+    int m_priority = -1;
     Id m_id;
-    bool m_isEnabled;
+    bool m_isEnabled = true;
 };
 
 } // namespace Core