Change interfaces to add key word 'const'

- To make immutable methods, keyword 'const' was added

Change-Id: I4bec8668c843eedfa4dbecac93f5e88c87720dda
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

diff --git a/watchface-complication/complication.cc b/watchface-complication/complication.cc
index 26156b43b3d8e2514a0f5395712f2f3be49ae184..10a3f799041510218a295b4b40adbb1aa7364335 100644 (file)
--- a/watchface-complication/complication.cc
+++ b/watchface-complication/complication.cc
@@ -286,11 +286,11 @@ int Complication::Impl::StoreSetting(int comp_id, std::string& provider_id,
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-int Complication::GetComplicationId() {
+int Complication::GetComplicationId() const {
   return impl_->complication_id_;
 }
 
-int Complication::GetEditableId() {
+int Complication::GetEditableId() const {
   return impl_->editable_id_;
 }
 
@@ -304,7 +304,7 @@ int Complication::SetHighlight(std::unique_ptr<IEditable::Highlight> highlight)
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-IEditable::Highlight* Complication::GetHighlight() {
+IEditable::Highlight* Complication::GetHighlight() const {
   return impl_->highlight_.get();
 }
 
@@ -320,7 +320,7 @@ std::list<std::shared_ptr<Bundle>> const& Complication::GetCandidates() const {
   return impl_->candidates_list_;
 }
 
-shared_ptr<Bundle> Complication::GetCurData() {
+shared_ptr<Bundle> Complication::GetCurData() const {
   if (static_cast<int>(impl_->candidates_list_.size()) < impl_->cur_data_idx_ + 1
       || impl_->cur_data_idx_ < 0) {
     LOGE("No candidates");
@@ -335,7 +335,7 @@ shared_ptr<Bundle> Complication::GetCurData() {
   return *std::next(it, impl_->cur_data_idx_);
 }
 
-shared_ptr<Bundle> Complication::GetNthData(int nth) {
+shared_ptr<Bundle> Complication::GetNthData(int nth) const {
   if (static_cast<int>(impl_->candidates_list_.size()) <= nth || nth < 0)
     return shared_ptr<Bundle>({});
 
@@ -346,11 +346,11 @@ shared_ptr<Bundle> Complication::GetNthData(int nth) {
   return *std::next(it, nth);
 }
 
-int Complication::GetCurDataIdx() {
+int Complication::GetCurDataIdx() const {
   return impl_->cur_data_idx_;
 }
 
-int Complication::GetLastDataIdx() {
+int Complication::GetLastDataIdx() const {
   return impl_->last_data_idx_;
 }
 
@@ -587,7 +587,7 @@ int Complication::GetCurType() const {
   return static_cast<int>(impl_->cur_type_);
 }
 
-const std::string& Complication::GetLabel() {
+const std::string& Complication::GetLabel() const {
   return impl_->name_;
 }
 
@@ -732,11 +732,11 @@ void Complication::SetState(IEditable::EditableState state) {
   impl_->ed_state_ = state;
 }
 
-IEditable::EditableState Complication::GetState() {
+IEditable::EditableState Complication::GetState() const {
   return impl_->ed_state_;
 }
 
-const std::string Complication::GetSetupAppId() {
+std::string Complication::GetSetupAppId() const {
   return DBManager::GetSetupAppId(impl_->cur_provider_id_.c_str());
 }
 

diff --git a/watchface-complication/complication.h b/watchface-complication/complication.h
index ce56a6950d9bb4ec07cd2517c87d871d68bbe048..570821789fcb2282c436759d969a1a2b8a0b3f19 100644 (file)
--- a/watchface-complication/complication.h
+++ b/watchface-complication/complication.h
@@ -63,16 +63,16 @@ class EXPORT_API Complication : public IEditable
   };
 
   int SetHighlight(std::unique_ptr<IEditable::Highlight> highlight) override;
-  IEditable::Highlight* GetHighlight() override;
+  IEditable::Highlight* GetHighlight() const override;
   std::list<std::shared_ptr<tizen_base::Bundle>> const& GetCandidates() const override;
   int SetCandidates(std::list<std::shared_ptr<tizen_base::Bundle>> candidates_list) override;
-  std::shared_ptr<tizen_base::Bundle> GetCurData() override;
-  std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) override;
-  int GetCurDataIdx() override;
+  std::shared_ptr<tizen_base::Bundle> GetCurData() const override;
+  std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) const override;
+  int GetCurDataIdx() const override;
   int SetCurDataIdx(int cur_data_idx) override;
-  int GetLastDataIdx() override;
+  int GetLastDataIdx() const override;
   int UpdateLastData() override;
-  const std::string& GetLabel() override;
+  const std::string& GetLabel() const override;
   void OnEditableUpdated(int selected_idx,
                     IEditable::EditableState state) override;
   void OnDataUpdated(const std::string& provider_id,
@@ -81,18 +81,18 @@ class EXPORT_API Complication : public IEditable
   void OnProviderError(const std::string& provider_id, ComplicationType type,
                     int error) override;
   void OnNotifyDataUpdate() override;
-  int GetComplicationId();
-  int GetEditableId() override;
+  int GetEditableId() const override;
   int SetEditableId(int id) override;
   void SetLabel(const std::string& name) override;
   void SetState(IEditable::EditableState state) override;
-  IEditable::EditableState GetState() override;
+  IEditable::EditableState GetState() const override;
   int SetContext(std::unique_ptr<tizen_base::Bundle> context) override;
   std::unique_ptr<tizen_base::Bundle>& GetContext() const override;
   int UpdateLastContext() override;
   std::unique_ptr<tizen_base::Bundle>& GetLastContext() const override;
-  const std::string GetSetupAppId() override;
+  std::string GetSetupAppId() const override;
 
+  int GetComplicationId() const;
   int SendDataUpdateRequest(bool launch_option = true);
   std::string GetCurProviderId() const;
   std::string GetProviderId(const tizen_base::Bundle& candidate_data) const;

diff --git a/watchface-complication/design-element.cc b/watchface-complication/design-element.cc
index 8a327e669ab2387c54e38567a05a767240824eaf..465f0aed241b34e3c8ac0a583f262183801b212b 100644 (file)
--- a/watchface-complication/design-element.cc
+++ b/watchface-complication/design-element.cc
@@ -49,7 +49,7 @@ DesignElement::Impl::Impl(DesignElement* parent, int id, int cur_data_idx)
   last_data_idx_ = cur_data_idx_;
 }
 
-int DesignElement::GetEditableId() {
+int DesignElement::GetEditableId() const {
   return impl_->id_;
 }
 
@@ -63,7 +63,7 @@ int DesignElement::SetHighlight(std::unique_ptr<IEditable::Highlight> highlight)
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-IEditable::Highlight* DesignElement::GetHighlight() {
+IEditable::Highlight* DesignElement::GetHighlight() const {
   return impl_->highlight_.get();
 }
 
@@ -77,7 +77,7 @@ std::list<std::shared_ptr<Bundle>> const& DesignElement::GetCandidates() const {
   return impl_->candidates_list_;
 }
 
-shared_ptr<Bundle> DesignElement::GetCurData() {
+shared_ptr<Bundle> DesignElement::GetCurData() const {
   if (static_cast<int>(impl_->candidates_list_.size()) < impl_->cur_data_idx_ + 1
       || impl_->cur_data_idx_ < 0)
     return shared_ptr<Bundle>({});
@@ -87,7 +87,7 @@ shared_ptr<Bundle> DesignElement::GetCurData() {
   return *std::next(it, impl_->cur_data_idx_);
 }
 
-shared_ptr<Bundle> DesignElement::GetNthData(int nth) {
+shared_ptr<Bundle> DesignElement::GetNthData(int nth) const {
   if (static_cast<int>(impl_->candidates_list_.size()) <= nth || nth < 0)
     return shared_ptr<Bundle>({});
 
@@ -97,11 +97,11 @@ shared_ptr<Bundle> DesignElement::GetNthData(int nth) {
   return *std::next(it, nth);
 }
 
-int DesignElement::GetCurDataIdx() {
+int DesignElement::GetCurDataIdx() const {
   return impl_->cur_data_idx_;
 }
 
-int DesignElement::GetLastDataIdx() {
+int DesignElement::GetLastDataIdx() const {
   LOGI("last data idx %d", impl_->last_data_idx_);
   return impl_->last_data_idx_;
 }
@@ -137,7 +137,7 @@ int DesignElement::SetCurDataIdx(int cur_data_idx) {
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-const std::string& DesignElement::GetLabel() {
+const std::string& DesignElement::GetLabel() const {
   return impl_->name_;
 }
 
@@ -156,11 +156,11 @@ void DesignElement::SetState(IEditable::EditableState state) {
   impl_->ed_state_ = state;
 }
 
-IEditable::EditableState DesignElement::GetState() {
+IEditable::EditableState DesignElement::GetState() const {
   return impl_->ed_state_;
 }
 
-const std::string DesignElement::GetSetupAppId() {
+std::string DesignElement::GetSetupAppId() const {
   std::string setup_appid = "";
   return setup_appid;
 }

diff --git a/watchface-complication/design-element.h b/watchface-complication/design-element.h
index 53d6963da10bdf3006abf8f19ac24c36077e8dc5..0a907edc58b201dc09460363d1521b070020b8e4 100644 (file)
--- a/watchface-complication/design-element.h
+++ b/watchface-complication/design-element.h
@@ -39,28 +39,28 @@ class EXPORT_API DesignElement : public IEditable {
 
  public:
   int SetHighlight(std::unique_ptr<IEditable::Highlight> highlight) override;
-  IEditable::Highlight* GetHighlight() override;
+  IEditable::Highlight* GetHighlight() const override;
   std::list<std::shared_ptr<tizen_base::Bundle>> const& GetCandidates() const override;
   int SetCandidates(std::list<std::shared_ptr<tizen_base::Bundle>> candidates_list) override;
-  std::shared_ptr<tizen_base::Bundle> GetCurData() override;
-  std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) override;
-  int GetCurDataIdx() override;
+  std::shared_ptr<tizen_base::Bundle> GetCurData() const override;
+  std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) const override;
+  int GetCurDataIdx() const override;
   int SetCurDataIdx(int cur_data_idx) override;
-  int GetLastDataIdx() override;
+  int GetLastDataIdx() const override;
   int UpdateLastData() override;
-  const std::string& GetLabel() override;
+  const std::string& GetLabel() const override;
   void OnEditableUpdated(int selected_idx,
                     IEditable::EditableState state) override;
-  int GetEditableId() override;
+  int GetEditableId() const override;
   int SetEditableId(int id) override;
   void SetLabel(const std::string& name) override;
   void SetState(IEditable::EditableState state) override;
-  IEditable::EditableState GetState() override;
+  IEditable::EditableState GetState() const override;
   int SetContext(std::unique_ptr<tizen_base::Bundle> context) override;
   std::unique_ptr<tizen_base::Bundle>& GetContext() const override;
   int UpdateLastContext() override;
   std::unique_ptr<tizen_base::Bundle>& GetLastContext() const override;
-  const std::string GetSetupAppId() override;
+  std::string GetSetupAppId() const override;
 
  private:
   class Impl;

diff --git a/watchface-complication/editable-interface.h b/watchface-complication/editable-interface.h
index 8641298898555d838e7ed869330231a9d6e432a3..2f9dfb389e9a278ebef2462f158de247007494d3 100644 (file)
--- a/watchface-complication/editable-interface.h
+++ b/watchface-complication/editable-interface.h
@@ -123,27 +123,27 @@ class IEditable {
     EditableShapeType shape_type_ = Circle;
   };
   virtual ~IEditable() = default;
-  virtual int GetEditableId() = 0;
+  virtual int GetEditableId() const = 0;
   virtual int SetEditableId(int id) = 0;
   virtual std::list<std::shared_ptr<tizen_base::Bundle>> const& GetCandidates() const = 0;
   virtual int SetCandidates(std::list<std::shared_ptr<tizen_base::Bundle>> candidates_list) = 0;
-  virtual std::shared_ptr<tizen_base::Bundle> GetCurData() = 0;
-  virtual std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) = 0;
-  virtual int GetCurDataIdx() = 0;
+  virtual std::shared_ptr<tizen_base::Bundle> GetCurData() const = 0;
+  virtual std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) const = 0;
+  virtual int GetCurDataIdx() const = 0;
   virtual int SetCurDataIdx(int cur_data_idx) = 0;
-  virtual int GetLastDataIdx() = 0;
+  virtual int GetLastDataIdx() const = 0;
   virtual int UpdateLastData() = 0;
-  virtual const std::string& GetLabel() = 0;
+  virtual const std::string& GetLabel() const = 0;
   virtual void SetLabel(const std::string& name) = 0;
   virtual void OnEditableUpdated(int selected_idx, EditableState state) = 0;
   virtual void SetState(EditableState state) = 0;
-  virtual EditableState GetState() = 0;
-  virtual const std::string GetSetupAppId() = 0;
+  virtual EditableState GetState() const = 0;
+  virtual std::string GetSetupAppId() const = 0;
   virtual int SetContext(std::unique_ptr<tizen_base::Bundle> context) = 0;
   virtual std::unique_ptr<tizen_base::Bundle>& GetContext() const = 0;
   virtual int UpdateLastContext() = 0;
   virtual std::unique_ptr<tizen_base::Bundle>& GetLastContext() const = 0;
-  virtual Highlight* GetHighlight() = 0;
+  virtual Highlight* GetHighlight() const = 0;
   virtual int SetHighlight(std::unique_ptr<Highlight> highlight) = 0;
 };
 

diff --git a/watchface-complication/received-editable.cc b/watchface-complication/received-editable.cc
index 6f600b1f67061fcb5ad26107e48938c37797cb14..902976a1f58e9c6c398ad734e4b3ceab15a2348a 100644 (file)
--- a/watchface-complication/received-editable.cc
+++ b/watchface-complication/received-editable.cc
@@ -105,7 +105,7 @@ ReceivedEditable::Impl::Impl(ReceivedEditable* parent, std::string raw)
   }
 }
 
-int ReceivedEditable::GetEditableId() {
+int ReceivedEditable::GetEditableId() const {
   return impl_->id_;
 }
 
@@ -119,7 +119,7 @@ int ReceivedEditable::SetHighlight(std::unique_ptr<IEditable::Highlight> highlig
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-IEditable::Highlight* ReceivedEditable::GetHighlight() {
+IEditable::Highlight* ReceivedEditable::GetHighlight() const {
   return impl_->highlight_.get();
 }
 
@@ -135,11 +135,11 @@ std::list<std::shared_ptr<Bundle>> const& ReceivedEditable::GetCandidates()
   return impl_->candidates_list_;
 }
 
-int ReceivedEditable::GetLastDataIdx() {
+int ReceivedEditable::GetLastDataIdx() const {
   return impl_->last_data_idx_;
 }
 
-int ReceivedEditable::GetCurDataIdx() {
+int ReceivedEditable::GetCurDataIdx() const {
   return impl_->cur_data_idx_;
 }
 
@@ -148,7 +148,7 @@ int ReceivedEditable::UpdateLastData() {
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-shared_ptr<Bundle> ReceivedEditable::GetCurData() {
+shared_ptr<Bundle> ReceivedEditable::GetCurData() const {
   if (impl_->candidates_list_.size() == 0 || impl_->cur_data_idx_ < 0)
     return shared_ptr<Bundle>({});
   std::list<std::shared_ptr<Bundle>>::iterator it
@@ -158,7 +158,7 @@ shared_ptr<Bundle> ReceivedEditable::GetCurData() {
   return *std::next(it, impl_->cur_data_idx_);
 }
 
-shared_ptr<Bundle> ReceivedEditable::GetNthData(int nth) {
+shared_ptr<Bundle> ReceivedEditable::GetNthData(int nth) const {
   if (static_cast<int>(impl_->candidates_list_.size()) <= nth || nth < 0)
     return shared_ptr<Bundle>({});
 
@@ -179,7 +179,7 @@ int ReceivedEditable::SetCurDataIdx(int cur_data_idx) {
   return WATCHFACE_COMPLICATION_ERROR_NONE;
 }
 
-const std::string& ReceivedEditable::GetLabel() {
+const std::string& ReceivedEditable::GetLabel() const {
   return impl_->name_;
 }
 
@@ -198,11 +198,11 @@ void ReceivedEditable::SetState(IEditable::EditableState state) {
   impl_->ed_state_ = state;
 }
 
-IEditable::EditableState ReceivedEditable::GetState() {
+IEditable::EditableState ReceivedEditable::GetState() const {
   return impl_->ed_state_;
 }
 
-const std::string ReceivedEditable::GetSetupAppId() {
+std::string ReceivedEditable::GetSetupAppId() const {
   return impl_->setup_appid_;
 }
 

diff --git a/watchface-complication/received-editable.h b/watchface-complication/received-editable.h
index f1c62c52b3fda31ed86380c4001a2167b2cdc724..a41486f300ff8ba2f241afb61b5baba2d8267fb4 100644 (file)
--- a/watchface-complication/received-editable.h
+++ b/watchface-complication/received-editable.h
@@ -39,28 +39,28 @@ class EXPORT_API ReceivedEditable : public IEditable {
 
  public:
   int SetHighlight(std::unique_ptr<IEditable::Highlight> highlight) override;
-  IEditable::Highlight* GetHighlight() override;
+  IEditable::Highlight* GetHighlight() const override;
   std::list<std::shared_ptr<tizen_base::Bundle>> const& GetCandidates() const override;
   int SetCandidates(std::list<std::shared_ptr<tizen_base::Bundle>> candidates_list) override;
-  std::shared_ptr<tizen_base::Bundle> GetCurData() override;
-  std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) override;
-  int GetCurDataIdx() override;
+  std::shared_ptr<tizen_base::Bundle> GetCurData() const override;
+  std::shared_ptr<tizen_base::Bundle> GetNthData(int nth) const override;
+  int GetCurDataIdx() const override;
   int SetCurDataIdx(int cur_data_idx) override;
-  int GetLastDataIdx() override;
+  int GetLastDataIdx() const override;
   int UpdateLastData() override;
-  const std::string& GetLabel() override;
+  const std::string& GetLabel() const override;
   void OnEditableUpdated(int selected_idx,
                     IEditable::EditableState state) override;
-  int GetEditableId() override;
+  int GetEditableId() const override;
   int SetEditableId(int id) override;
   void SetLabel(const std::string& name) override;
   void SetState(IEditable::EditableState state) override;
-  IEditable::EditableState GetState() override;
+  IEditable::EditableState GetState() const override;
   int SetContext(std::unique_ptr<tizen_base::Bundle> context) override;
   std::unique_ptr<tizen_base::Bundle>& GetContext() const override;
   int UpdateLastContext() override;
   std::unique_ptr<tizen_base::Bundle>& GetLastContext() const override;
-  const std::string GetSetupAppId() override;
+  std::string GetSetupAppId() const override;
 
  private:
   class Impl;