summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-07-03 11:01:28 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-08-08 17:24:00 +0200
commitcb5568e11bbe2d499d4d43dc30a779a5869b12ea (patch)
treec19eba624790091bd425118f696f95ccafdf2ad0
parent1f3e4103df53cc0d0946cd712165877bae8a2c2d (diff)
util.h and its impl are now c++
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/main.cpp2
-rw-r--r--src/util.cpp (renamed from src/util.c)2
-rw-r--r--src/util.hpp (renamed from src/util.h)0
-rw-r--r--src/wayland.hpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fda32c1..2b81367 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,8 +4,8 @@ add_executable(winman
main.cpp
wayland.cpp
wayland.hpp
- util.c
- util.h
+ util.cpp
+ util.hpp
${IVI_CON_PROTO})
target_compile_definitions(winman
diff --git a/src/main.cpp b/src/main.cpp
index fbd4e46..3b01d95 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include "util.h"
+#include "util.hpp"
#include "wayland.hpp"
#include <unistd.h>
diff --git a/src/util.c b/src/util.cpp
index af32269..1d0601a 100644
--- a/src/util.c
+++ b/src/util.cpp
@@ -1,4 +1,4 @@
-#include "util.h"
+#include "util.hpp"
#include <errno.h>
#include <stdarg.h>
diff --git a/src/util.h b/src/util.hpp
index 2fe6e84..2fe6e84 100644
--- a/src/util.h
+++ b/src/util.hpp
diff --git a/src/wayland.hpp b/src/wayland.hpp
index 96b0199..b66bca7 100644
--- a/src/wayland.hpp
+++ b/src/wayland.hpp
@@ -3,7 +3,7 @@
#include "ivi-controller-client-protocol.h"
-#include "util.h"
+#include "util.hpp"
#include <functional>
#include <unordered_map>