Modify member variable name

[apps/agl-service-windowmanager.git] / src / policy_manager / policy_manager.hpp

diff --git a/src/policy_manager/policy_manager.hpp b/src/policy_manager/policy_manager.hpp
index aa5f206..6233a77 100644 (file)
--- a/src/policy_manager/policy_manager.hpp
+++ b/src/policy_manager/policy_manager.hpp
@@ -41,8 +41,9 @@ public:
 
     int initialize();
     void registerCallback(CallbackTable callback_table);
-    int inputEvent(json_object* json_in);
-    std::string roleToCategory(const char* role);
+    int setInputEventData(json_object* json_in);
+    int executeStateTransition();
+    void undoState();
 
 private:
     // Disable copy and move
@@ -52,19 +53,23 @@ private:
     PolicyManager &operator=(PolicyManager &&) = delete;
 
     // Convert map
-    std::unordered_map<std::string, int> eventname2no_;
-    std::unordered_map<std::string, int> categoryname2no_;
-    std::unordered_map<std::string, int> areaname2no_;
+    std::unordered_map<std::string, int> eventname2no;
+    std::unordered_map<std::string, int> categoryname2no;
+    std::unordered_map<std::string, int> areaname2no;
 
-    std::unordered_map<std::string, std::string> role2category_;
-    std::unordered_map<std::string, std::string> category2role_;
-    std::unordered_map<std::string, std::string> role2defaultarea_;
+    std::unordered_map<std::string, std::string> role2category;
+    std::unordered_map<std::string, std::string> category2role;
+    std::unordered_map<std::string, std::string> role2defaultarea;
 
+    void initializeLocalState();
     int initializeSdEventLoop();
 
     // Load role.db
     int loadRoleDb();
 
+    // Load layout.db
+    int loadLayoutDb();
+
     const char* getStringFromJson(json_object* obj, const char* key);
     int inputJsonFilie(const char* file, json_object** obj);
     std::vector<std::string> parseString(std::string str, char delimiter);
@@ -73,8 +78,4 @@ private:
 };
 
 
-extern const char* getStringFromJson(json_object* obj, const char* key);
-extern int getIntFromJson(json_object* obj, const char* key);
-
-
 #endif  // TMCAGLWM_POLICY_MANAGER_HPP