summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-10-15 14:45:32 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-10-15 07:00:54 +0000
commit2fd5d33ca200d27c73e0fffc57987ddc751eb84a (patch)
treefdad8279a14bc57902060c39f463763c7597933c
parent5b1cf5616ef878e237d8fb7975b4839650c6d840 (diff)
Rename file names
Rename layers.* to wm_layers.* Change-Id: If472c2b8f978231816f5c21edb0c53a6ee96d629 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/window_manager.hpp2
-rw-r--r--src/wm_layer.cpp (renamed from src/layers.cpp)2
-rw-r--r--src/wm_layer.hpp (renamed from src/layers.hpp)6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91908e8..223dd33 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(${TARGETS_WM} MODULE
${IVI_CON_PROTO}
json_helper.cpp
window_manager.cpp
- layers.cpp
+ wm_layer.cpp
wm_client.cpp
wm_error.cpp
applist.cpp
diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index f23719f..b591149 100644
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -23,7 +23,7 @@
#include <experimental/optional>
#include "util.hpp"
#include "controller_hooks.hpp"
-#include "layers.hpp"
+#include "wm_layer.hpp"
#include "layout.hpp"
#include "wayland_ivi_wm.hpp"
#include "pm_wrapper.hpp"
diff --git a/src/layers.cpp b/src/wm_layer.cpp
index e1a232a..6a98884 100644
--- a/src/layers.cpp
+++ b/src/wm_layer.cpp
@@ -16,7 +16,7 @@
#include <regex>
-#include "layers.hpp"
+#include "wm_layer.hpp"
#include "json_helper.hpp"
#include "util.hpp"
diff --git a/src/layers.hpp b/src/wm_layer.hpp
index 3a16985..4dd4616 100644
--- a/src/layers.hpp
+++ b/src/wm_layer.hpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef TMCAGLWM_LAYERS_H
-#define TMCAGLWM_LAYERS_H
+#ifndef WM_LAYERS_H
+#define WM_LAYERS_H
#include <string>
@@ -155,4 +155,4 @@ static const nlohmann::json default_layers_json = {
};
} // namespace wm
-#endif // TMCAGLWM_LAYERS_H
+#endif // WM_LAYERS_H