From 98794df0833755e97115c2e3dfb92ab7fd3be00c Mon Sep 17 00:00:00 2001
From: "SukHyung, Kang" <shine.kang@samsung.com>
Date: Thu, 3 May 2018 17:42:37 +0900
Subject: [PATCH] Add default values

Change-Id: Ia397d8af85d34b90a93c2cf54482dcb7c96706e2
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>
---
 .../complication-connector-implementation.h                   |  2 +-
 watchface-complication/complication-implementation.h          |  6 +++---
 watchface-complication/design-element-implementation.h        |  4 ++--
 watchface-complication/editable-interface.h                   | 11 ++++++-----
 watchface-complication/editables-container-implementation.h   |  2 +-
 watchface-complication/received-editable-implementation.h     |  4 ++--
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/watchface-complication/complication-connector-implementation.h b/watchface-complication/complication-connector-implementation.h
index 25c501c..2f7f360 100644
--- a/watchface-complication/complication-connector-implementation.h
+++ b/watchface-complication/complication-connector-implementation.h
@@ -63,7 +63,7 @@ class ComplicationConnector::Impl {
 
  private:
   GDBusConnection* conn_ = nullptr;
-  IEventListener* listener_;
+  IEventListener* listener_ = nullptr;
   std::string appid_;
 };
 
diff --git a/watchface-complication/complication-implementation.h b/watchface-complication/complication-implementation.h
index a99dd4f..cda1409 100644
--- a/watchface-complication/complication-implementation.h
+++ b/watchface-complication/complication-implementation.h
@@ -78,7 +78,7 @@ class Complication::Impl : ComplicationConnector::IEventListener {
   std::string cur_provider_id_;
   ComplicationType cur_type_;
   std::string last_provider_id_;
-  ComplicationType last_type_;
+  ComplicationType last_type_ = NoData;
   std::list<std::unique_ptr<Bundle>> candidates_list_;
   std::list<std::unique_ptr<ProviderInfo>> allowed_list_;
   int cur_data_idx_ = -1;
@@ -86,12 +86,12 @@ class Complication::Impl : ComplicationConnector::IEventListener {
   std::unique_ptr<Bundle> last_context_data_ = nullptr;
   std::unique_ptr<Bundle> last_data_ = nullptr;
   int last_data_idx_ = -1;
-  EditableShapeType shape_type_;
+  EditableShapeType shape_type_ = Circle;
   std::string name_;
   int subscribe_id_ = -1;
   static const std::string provider_id_key_;
   static const std::string provider_type_key_;
-  IEditable::EditableState ed_state_;
+  IEditable::EditableState ed_state_ = Complete;
   guint periodic_timer_;
 };
 
diff --git a/watchface-complication/design-element-implementation.h b/watchface-complication/design-element-implementation.h
index 955031f..1e2d45d 100644
--- a/watchface-complication/design-element-implementation.h
+++ b/watchface-complication/design-element-implementation.h
@@ -48,9 +48,9 @@ class DesignElement::Impl {
   int last_data_idx_;
   std::list<std::unique_ptr<Bundle>> candidates_list_;
   std::shared_ptr<IEditable::Geometry> geo_;
-  EditableShapeType shape_type_;
+  EditableShapeType shape_type_ = Circle;
   std::string name_;
-  IEditable::EditableState ed_state_;
+  IEditable::EditableState ed_state_ = Complete;
   std::unique_ptr<Bundle> context_data_;
   std::unique_ptr<Bundle> last_context_data_ = nullptr;
 };
diff --git a/watchface-complication/editable-interface.h b/watchface-complication/editable-interface.h
index de9b1cc..87d2e36 100644
--- a/watchface-complication/editable-interface.h
+++ b/watchface-complication/editable-interface.h
@@ -22,20 +22,21 @@
 #include <memory>
 
 #include "watchface-complication/complication-bundle.h"
+#include "watchface-complication/include/watchface-editable.h"
 
 namespace watchface_complication {
 
 class IEditable {
  public:
   enum EditableShapeType {
-    Rectangle,
-    Circle
+    Circle = WATCHFACE_COMPLICATION_SHAPE_TYPE_CIRCLE,
+    Rectangle = WATCHFACE_COMPLICATION_SHAPE_TYPE_RECT
   };
 
   enum EditableState {
-    Complete,
-    OnGoing,
-    Cancel
+    Complete = WATCHFACE_EDITABLE_EDIT_STATE_COMPLETE,
+    OnGoing = WATCHFACE_EDITABLE_EDIT_STATE_ONGOING,
+    Cancel = WATCHFACE_EDITABLE_EDIT_STATE_CANCEL
   };
 
   class Geometry {
diff --git a/watchface-complication/editables-container-implementation.h b/watchface-complication/editables-container-implementation.h
index f1c5b4d..0471180 100644
--- a/watchface-complication/editables-container-implementation.h
+++ b/watchface-complication/editables-container-implementation.h
@@ -53,7 +53,7 @@ class EditablesContainer::Impl : ComplicationConnector::IEventListener {
  private:
   EditablesContainer* parent_;
   int subscribe_id_;
-  int watcher_id_;
+  int watcher_id_ = -1;
   std::list<std::shared_ptr<IEditable>> ed_list_;
 };
 
diff --git a/watchface-complication/received-editable-implementation.h b/watchface-complication/received-editable-implementation.h
index b4576ff..239acf5 100644
--- a/watchface-complication/received-editable-implementation.h
+++ b/watchface-complication/received-editable-implementation.h
@@ -45,9 +45,9 @@ class ReceivedEditable::Impl {
   Bundle* cur_data_ = nullptr;
   std::list<std::unique_ptr<Bundle>> candidates_list_;
   std::shared_ptr<IEditable::Geometry> geo_;
-  EditableShapeType shape_type_;
+  EditableShapeType shape_type_ = Circle;
   std::string name_;
-  int cur_data_idx_;
+  int cur_data_idx_ = -1;
   int last_data_idx_;
   IEditable::EditableState ed_state_;
   std::unique_ptr<Bundle> context_data_;
-- 
2.7.4