From de0cf4e92c0ce81c6158990131bf635d9e9043c5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 5 Dec 2016 14:04:54 +0100
Subject: [PATCH] Android: Simplify code and make sure all members are
 initialized

Change-Id: I873737d39865f9a920a5893c9630430e6803a6ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 src/plugins/android/androidconfigurations.cpp |  8 --------
 src/plugins/android/androidconfigurations.h   | 12 +++++-------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index 33286ccd3d0..4212a961516 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -300,14 +300,6 @@ void AndroidConfig::load(const QSettings &settings)
     m_NdkInformationUpToDate = false;
 }
 
-AndroidConfig::AndroidConfig()
-    : m_useGradle(false),
-      m_availableSdkPlatformsUpToDate(false),
-      m_NdkInformationUpToDate(false)
-{
-
-}
-
 void AndroidConfig::save(QSettings &settings) const
 {
     QFileInfo fileInfo(sdkSettingsFileName());
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 277cbeb2590..9316bb3fec1 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -85,8 +85,6 @@ public:
 class ANDROID_EXPORT AndroidConfig
 {
 public:
-    AndroidConfig();
-
     void load(const QSettings &settings);
     void save(QSettings &settings) const;
 
@@ -197,16 +195,16 @@ private:
     Utils::FileName m_openJDKLocation;
     Utils::FileName m_keystoreLocation;
     QStringList m_makeExtraSearchDirectories;
-    unsigned m_partitionSize;
-    bool m_automaticKitCreation;
-    bool m_useGradle;
+    unsigned m_partitionSize = 1024;
+    bool m_automaticKitCreation = true;
+    bool m_useGradle = false;
 
     //caches
-    mutable bool m_availableSdkPlatformsUpToDate;
+    mutable bool m_availableSdkPlatformsUpToDate = false;
     mutable QVector<SdkPlatform> m_availableSdkPlatforms;
     static bool sortSdkPlatformByApiLevel(const SdkPlatform &a, const SdkPlatform &b);
 
-    mutable bool m_NdkInformationUpToDate;
+    mutable bool m_NdkInformationUpToDate = false;
     mutable QString m_toolchainHost;
     mutable QVector<int> m_availableNdkPlatforms;