Remove namespace stmsandbox/yuta-d/dev_pm

Change-Id: Id2342c88b532f4d299c011d5ab41450ba670c0ec
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

1 files changed, 9 insertions, 12 deletions

diff --git a/src/policy_manager/policy_manager.hpp b/src/policy_manager/policy_manager.hpp
index 47f7d26..6f87e00 100644
--- a/src/policy_manager/policy_manager.hpp
+++ b/src/policy_manager/policy_manager.hpp
@@ -25,10 +25,8 @@
 struct json_object;
 struct sd_event;
 struct sd_event_source;
-
-namespace stm {
 struct StmState;
-}
+
 
 class PolicyManager {
 
@@ -99,14 +97,13 @@ private:
     std::unordered_map<std::string, std::string> category2role;
     std::unordered_map<std::string, std::string> role2defaultarea;
 
-    std::queue<EventInfo> event_info_queue;
-
     struct sd_event* event_loop;
-    CallbackTable callback;
-
+    std::queue<EventInfo> event_info_queue;
     std::map<int, struct sd_event_source*> event_source_list;
     std::map<int, std::string> req_role_list;
 
+    CallbackTable callback;
+
     std::unordered_map<std::string, CarElement> prv_car_elements;
     std::unordered_map<std::string, CarElement> crr_car_elements;
 
@@ -121,11 +118,11 @@ private:
     void initializeCarElementState();
     void initializeLayerState();
     int initializeSdEventLoop();
-    void updateState(int event_data, stm::StmState crr_state);
-    void updateCarElementState(stm::StmState crr_state);
-    void updateLayerState(int event_data, stm::StmState crr_state);
-    void createOutputInformation(stm::StmState crr_state, json_object **json_out);
-    void controlTimerEvent(stm::StmState crr_state);
+    void updateState(int event_data, StmState crr_state);
+    void updateCarElementState(StmState crr_state);
+    void updateLayerState(int event_data, StmState crr_state);
+    void createOutputInformation(StmState crr_state, json_object **json_out);
+    void controlTimerEvent(StmState crr_state);
     int setStateTransitionProcessToSystemd(int event, uint64_t delay_ms, std::string role);
 
     // Load role.db