From 8e55ee63770fae98a64b3efc86ce649de81ec7a1 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 13 Nov 2015 12:53:09 +0100
Subject: [PATCH] Android: Clean up AndroidDeviceInfo

Turn it into a class, add a isValid method and initialize it properly

Change-Id: I413ca931b125c9bbfc58b855280e9e58402f3d0b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
---
 src/plugins/android/androidconfigurations.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 906632bd2d0..9cf8bb8ce6e 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -57,19 +57,22 @@ namespace Utils { class Environment; }
 namespace Android {
 class AndroidPlugin;
 
-struct AndroidDeviceInfo
+class AndroidDeviceInfo
 {
+public:
     QString serialNumber;
     QString avdname;
     QStringList cpuAbi;
-    int sdk;
+    int sdk = -1;
     enum State { OkState, UnAuthorizedState, OfflineState };
-    State state;
-    bool unauthorized;
+    State state = OfflineState;
+    bool unauthorized = false;
     enum AndroidDeviceType { Hardware, Emulator };
-    AndroidDeviceType type;
+    AndroidDeviceType type = Emulator;
 
     static QStringList adbSelector(const QString &serialNumber);
+
+    bool isValid() { return !serialNumber.isEmpty() && !avdname.isEmpty(); }
 };
 
 class SdkPlatform