From 45ff324610e21ffd0292bdd1e39726c808a41725 Mon Sep 17 00:00:00 2001
From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Tue, 29 May 2018 15:47:21 +0900
Subject: pull out request from applist

Change-Id: Iea9270d9e8c0d358a0f964048167bba5d8000829
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---
 src/applist.hpp | 34 +------------------------------
 src/request.cpp |  2 +-
 src/request.hpp | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 34 deletions(-)
 create mode 100644 src/request.hpp

(limited to 'src')

diff --git a/src/applist.hpp b/src/applist.hpp
index f91e7c8..e0d67fc 100644
--- a/src/applist.hpp
+++ b/src/applist.hpp
@@ -22,45 +22,13 @@
 #include <memory>
 //#include <experimental/optional>
 #include "windowmanager-client.hpp"
+#include "request.hpp"
 
 namespace wm {
 
 /* using std::experimental::nullopt;
 using std::experimental::optional; */
 
-typedef enum Task{
-    TASK_ALLOCATE,
-    TASK_RELEASE
-}ResourceTask;
-
-struct WMTrigger {
-    std::string appid;
-    std::string role;
-    std::string area;
-    Task task;
-};
-
-struct WMAction
-{
-    std::string appid;
-    std::string role;
-    std::string area;
-    bool end_draw_finished;
-};
-
-struct WMRequest
-{
-    WMRequest();
-    explicit WMRequest(std::string appid, std::string role,
-        std::string area, ResourceTask task);
-    virtual ~WMRequest();
-    WMRequest(const WMRequest &obj);
-
-    unsigned seq_num;
-    struct WMTrigger trigger;
-    std::vector<struct WMAction> sync_draw_req;
-};
-
 class  AppList {
 public:
     AppList();
diff --git a/src/request.cpp b/src/request.cpp
index 2e674d8..9c69058 100644
--- a/src/request.cpp
+++ b/src/request.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "applist.hpp"
+#include "request.hpp"
 
 namespace wm {
 
diff --git a/src/request.hpp b/src/request.hpp
new file mode 100644
index 0000000..cad340e
--- /dev/null
+++ b/src/request.hpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef WMREQUEST_HPP
+#define WMREQUEST_HPP
+
+#include <string>
+#include <vector>
+
+namespace wm{
+
+enum Task
+{
+    TASK_ALLOCATE,
+    TASK_RELEASE
+};
+
+struct WMTrigger
+{
+    std::string appid;
+    std::string role;
+    std::string area;
+    Task task;
+};
+
+struct WMAction
+{
+    std::string appid;
+    std::string role;
+    std::string area;
+    bool end_draw_finished;
+};
+
+struct WMRequest
+{
+    WMRequest();
+    explicit WMRequest(std::string appid, std::string role,
+                       std::string area, Task task);
+    virtual ~WMRequest();
+    WMRequest(const WMRequest &obj);
+
+    unsigned seq_num;
+    struct WMTrigger trigger;
+    std::vector<struct WMAction> sync_draw_req;
+};
+
+}
+
+#endif //WMREQUEST_HPP
\ No newline at end of file
-- 
cgit 1.2.3-korg