Fix build error for gcc 12.2.0

- Add destructors
- Adjust coding style

Change-Id: I15c0f306edde409d6c2a4449c041d29503a3efef
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/watchface-common/db-manager.cc b/watchface-common/db-manager.cc
index fb0af2ba0d9881130bc35862f043e5631e60d387..87502dede6d2d31def6c95f7ac4808f1eabaef88 100644 (file)
--- a/watchface-common/db-manager.cc
+++ b/watchface-common/db-manager.cc
@@ -585,7 +585,6 @@ DBManager::GetProviderList(std::string& app_id) {
   }
 
   return provider_list;
-
 }
 
 }  // namespace watchface_complication

diff --git a/watchface-common/watchface-util.hh b/watchface-common/watchface-util.hh
index ebd2f20478c01defce6edb6f35dbcae8f73e57f5..be5603ee3a16371baafbbf863b94f1b850570bb5 100644 (file)
--- a/watchface-common/watchface-util.hh
+++ b/watchface-common/watchface-util.hh
@@ -37,81 +37,103 @@ enum cynara_result {
 
 namespace watchface_complication {
 namespace util {
-  enum CmdType {
-    CompUpdateRequest,
-    CompUpdated,
-    CompNotifyDataUpdate,
-    CompNotifyListeningStatus,
-    EditableEditRequest,
-    EditableEditComplete,
-    EditableEditPreview,
-    EditableEditCancel,
-    EditableEditReady,
-    SetupReply,
-    EditResult,
-    ProviderReady
-  };
-
-  enum EncodeType {
-    Name,
-    CompPath,
-    EditablePath
-  };
-
-  EXPORT_API bool CheckWatchFeatureEnabled();
-  EXPORT_API int CheckPrivilege(const char* privilege);
-  EXPORT_API int CheckPrivilege(std::string privilege, cynara_result *pcr);
-  EXPORT_API int CheckPrivilege(std::string& privilege,
-                                     GDBusConnection *connection,
-                                     std::string& sender_name,
-                                     std::string& sender_appid);
-  EXPORT_API int GetSenderPid(GDBusConnection *conn, const std::string& sender_name);
-  EXPORT_API std::string GetSenderAppid(GDBusConnection *conn,
-                          const std::string& sender_name);
-  EXPORT_API bool CheckSender(const char* sender_app_id,
-                                const std::string& sender_name,
-                                GDBusConnection* conn);
-  EXPORT_API bool CheckComplicationType(int type);
-  EXPORT_API std::string EncodeStr(EncodeType type, std::string appid);
-  EXPORT_API std::string EncodeStr(EncodeType type, std::string appid, int compid);
-  EXPORT_API std::string GetAppId();
-  EXPORT_API std::string GetCmdStr(CmdType type);
-  EXPORT_API bool CheckCertificate(const std::string& provider_app_id);
-  EXPORT_API std::string GetAppPath(const char* appid, char* path);
-  EXPORT_API int ConvertPathToAppPath(const char* appid, bundle* data);
-  EXPORT_API bool IsValidData(tizen_base::Bundle shared_data);
-  EXPORT_API int GetDataType(tizen_base::Bundle shared_data);
-  EXPORT_API int ConvertAulError(int ret);
-  EXPORT_API void DestroyTimeInfo(struct complication_time_info_s* info);
-
-  class EXPORT_API DBHelper {
-    public:
-      using Cursor = std::unique_ptr<sqlite3_stmt, decltype(sqlite3_finalize)*>;
-      DBHelper()
-          : db_(nullptr, sqlite3_close_v2), stmt_(nullptr, sqlite3_finalize) {}
-
-      bool Open();
-      bool Open(int mode);
-      void Close();
-      bool Prepare(const std::string& query);
-      bool Exec(const std::string& query);
-      const Cursor& GetCursor() const;
-      int Step() const;
-      int Reset() const;
-
-      bool Bind(int pos, std::string text);
-      bool Bind(int pos, int val);
-
-      const char* GetText(int pos) const;
-      int GetInt(int pos) const;
-
-    private:
-      const char* GetParserDataPath() const;
-
-    private:
-      std::unique_ptr<sqlite3, decltype(sqlite3_close_v2)*> db_;
-      Cursor stmt_;
-  };
+
+enum CmdType {
+  CompUpdateRequest,
+  CompUpdated,
+  CompNotifyDataUpdate,
+  CompNotifyListeningStatus,
+  EditableEditRequest,
+  EditableEditComplete,
+  EditableEditPreview,
+  EditableEditCancel,
+  EditableEditReady,
+  SetupReply,
+  EditResult,
+  ProviderReady
+};
+
+enum EncodeType {
+  Name,
+  CompPath,
+  EditablePath
+};
+
+EXPORT_API bool CheckWatchFeatureEnabled();
+
+EXPORT_API int CheckPrivilege(const char* privilege);
+
+EXPORT_API int CheckPrivilege(std::string privilege, cynara_result *pcr);
+
+EXPORT_API int CheckPrivilege(std::string& privilege,
+    GDBusConnection *connection, std::string& sender_name,
+    std::string& sender_appid);
+
+EXPORT_API int GetSenderPid(GDBusConnection *conn,
+    const std::string& sender_name);
+
+EXPORT_API std::string GetSenderAppid(GDBusConnection *conn,
+    const std::string& sender_name);
+
+EXPORT_API bool CheckSender(const char* sender_app_id,
+    const std::string& sender_name, GDBusConnection* conn);
+
+EXPORT_API bool CheckComplicationType(int type);
+
+EXPORT_API std::string EncodeStr(EncodeType type, std::string appid);
+
+EXPORT_API std::string EncodeStr(EncodeType type, std::string appid,
+    int compid);
+
+EXPORT_API std::string GetAppId();
+
+EXPORT_API std::string GetCmdStr(CmdType type);
+
+EXPORT_API bool CheckCertificate(const std::string& provider_app_id);
+
+EXPORT_API std::string GetAppPath(const char* appid, char* path);
+
+EXPORT_API int ConvertPathToAppPath(const char* appid, bundle* data);
+
+EXPORT_API bool IsValidData(tizen_base::Bundle shared_data);
+
+EXPORT_API int GetDataType(tizen_base::Bundle shared_data);
+
+EXPORT_API int ConvertAulError(int ret);
+
+EXPORT_API void DestroyTimeInfo(struct complication_time_info_s* info);
+
+class EXPORT_API DBHelper {
+ public:
+  using Cursor = std::unique_ptr<sqlite3_stmt, decltype(sqlite3_finalize)*>;
+
+  DBHelper()
+      : db_(nullptr, sqlite3_close_v2), stmt_(nullptr, sqlite3_finalize) {}
+  ~DBHelper() {}
+
+  bool Open();
+  bool Open(int mode);
+  void Close();
+  bool Prepare(const std::string& query);
+  bool Exec(const std::string& query);
+  const Cursor& GetCursor() const;
+  int Step() const;
+  int Reset() const;
+
+  bool Bind(int pos, std::string text);
+  bool Bind(int pos, int val);
+
+  const char* GetText(int pos) const;
+  int GetInt(int pos) const;
+
+ private:
+  const char* GetParserDataPath() const;
+
+ private:
+  std::unique_ptr<sqlite3, decltype(sqlite3_close_v2)*> db_;
+  Cursor stmt_;
+};
+
 }  // namespace util
 }  // namespace watchface_complication
 

diff --git a/watchface-complication/editable-interface.hh b/watchface-complication/editable-interface.hh
index 5931a2f3b8c3a112384b208e36c138a46e256123..b9f9828051e679be516e8684ac41bd9dc8d761e8 100644 (file)
--- a/watchface-complication/editable-interface.hh
+++ b/watchface-complication/editable-interface.hh
@@ -220,6 +220,8 @@ class IEditable {
       shape_type_ = hi.shape_type_;
     }
 
+    ~Highlight() {}
+
     const Geometry* GetGeometry() const {
       return geo_.get();
     }
@@ -301,6 +303,7 @@ class IEditable {
     std::unique_ptr<NormalizedGeometry> norm_geo_;
     EditableShapeType shape_type_ = Circle;
   };
+
   virtual ~IEditable() = default;
   virtual int GetEditableId() const = 0;
   virtual int SetEditableId(int id) = 0;