Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove and replace the comments
[apps/agl-service-windowmanager.git]
/
src
/
app.hpp
diff --git
a/src/app.hpp
b/src/app.hpp
index
9f8b7ce
..
413d1c9
100644
(file)
--- a/
src/app.hpp
+++ b/
src/app.hpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (
C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ * 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-33,12
+33,13
@@
#include "policy.hpp"
#include "result.hpp"
#include "wayland.hpp"
#include "policy.hpp"
#include "result.hpp"
#include "wayland.hpp"
+#include "hmi-debug.h"
namespace wl {
struct display;
}
namespace wl {
struct display;
}
-namespace
genivi
{
+namespace
compositor
{
struct controller;
}
struct controller;
}
@@
-76,7
+77,7
@@
struct id_allocator {
this->id2name[sid] = name;
// this->pending_surfaces.insert({sid});
this->name2id[name] = sid;
this->id2name[sid] = name;
// this->pending_surfaces.insert({sid});
this->name2id[name] = sid;
-
logdebug(
"allocated new id %u with name %s", sid, name.c_str());
+
HMI_DEBUG("wm",
"allocated new id %u with name %s", sid, name.c_str());
return sid;
}
return sid;
}
@@
-141,7
+142,7
@@
struct App {
// This is the one thing, we do not own.
struct wl::display *display;
// This is the one thing, we do not own.
struct wl::display *display;
- std::unique_ptr<struct
genivi
::controller> controller;
+ std::unique_ptr<struct
compositor
::controller> controller;
std::vector<std::unique_ptr<struct wl::output>> outputs;
struct config config;
std::vector<std::unique_ptr<struct wl::output>> outputs;
struct config config;