From abb0497a5db19c6fb4b91826417ed281eb267c53 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Thu, 15 Dec 2016 09:20:36 +0100 Subject: [PATCH] Cleanup formatting --- src/anbox/bridge/android_api_stub.cpp | 3 ++- src/anbox/bridge/android_api_stub.h | 3 ++- src/anbox/daemon.cpp | 3 +-- src/anbox/ubuntu/platform_policy.cpp | 10 ++++++---- src/anbox/ubuntu/platform_policy.h | 6 ++++-- src/anbox/ubuntu/window.cpp | 3 +-- src/anbox/ubuntu/window.h | 6 ++++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/anbox/bridge/android_api_stub.cpp b/src/anbox/bridge/android_api_stub.cpp index 9b1f11b..2b7892d 100644 --- a/src/anbox/bridge/android_api_stub.cpp +++ b/src/anbox/bridge/android_api_stub.cpp @@ -143,7 +143,8 @@ void AndroidApiStub::task_removed(Request *request) { remove_task_handle_.result_received(); } -void AndroidApiStub::resize_task(const std::int32_t &id, const anbox::graphics::Rect &rect, +void AndroidApiStub::resize_task(const std::int32_t &id, + const anbox::graphics::Rect &rect, const std::int32_t &resize_mode) { ensure_rpc_channel(); diff --git a/src/anbox/bridge/android_api_stub.h b/src/anbox/bridge/android_api_stub.h index 1dbde4e..81d154f 100644 --- a/src/anbox/bridge/android_api_stub.h +++ b/src/anbox/bridge/android_api_stub.h @@ -47,7 +47,8 @@ class AndroidApiStub : public anbox::ApplicationManager { void set_focused_task(const std::int32_t &id); void remove_task(const std::int32_t &id); - void resize_task(const std::int32_t &id, const anbox::graphics::Rect &rect, const std::int32_t &resize_mode); + void resize_task(const std::int32_t &id, const anbox::graphics::Rect &rect, + const std::int32_t &resize_mode); private: void ensure_rpc_channel(); diff --git a/src/anbox/daemon.cpp b/src/anbox/daemon.cpp index 80e77de..c6766c9 100644 --- a/src/anbox/daemon.cpp +++ b/src/anbox/daemon.cpp @@ -43,8 +43,7 @@ Daemon::Daemon() int Daemon::Run(const std::vector &arguments) try { auto argv = arguments; - if (arguments.size() == 0) - argv = {"run"}; + if (arguments.size() == 0) argv = {"run"}; return cmd.run({std::cin, std::cout, argv}); } catch (std::exception &err) { ERROR("%s", err.what()); diff --git a/src/anbox/ubuntu/platform_policy.cpp b/src/anbox/ubuntu/platform_policy.cpp index 680e8e3..2414eda 100644 --- a/src/anbox/ubuntu/platform_policy.cpp +++ b/src/anbox/ubuntu/platform_policy.cpp @@ -194,8 +194,7 @@ void PlatformPolicy::window_deleted(const Window::Id &id) { WARNING("Got window removed event for unknown window (id %d)", id); return; } - if (auto window = w->second.lock()) - android_api_->remove_task(window->task()); + if (auto window = w->second.lock()) android_api_->remove_task(window->task()); windows_.erase(w); } @@ -207,7 +206,8 @@ void PlatformPolicy::window_wants_focus(const Window::Id &id) { android_api_->set_focused_task(window->task()); } -void PlatformPolicy::window_moved(const Window::Id &id, const std::int32_t &x, const std::int32_t &y) { +void PlatformPolicy::window_moved(const Window::Id &id, const std::int32_t &x, + const std::int32_t &y) { auto w = windows_.find(id); if (w == windows_.end()) return; @@ -218,7 +218,9 @@ void PlatformPolicy::window_moved(const Window::Id &id, const std::int32_t &x, c } } -void PlatformPolicy::window_resized(const Window::Id &id, const std::int32_t &width, const std::int32_t &height) { +void PlatformPolicy::window_resized(const Window::Id &id, + const std::int32_t &width, + const std::int32_t &height) { auto w = windows_.find(id); if (w == windows_.end()) return; diff --git a/src/anbox/ubuntu/platform_policy.h b/src/anbox/ubuntu/platform_policy.h index 567093b..c1bbea3 100644 --- a/src/anbox/ubuntu/platform_policy.h +++ b/src/anbox/ubuntu/platform_policy.h @@ -52,8 +52,10 @@ class PlatformPolicy : public std::enable_shared_from_this, void window_deleted(const Window::Id &id) override; void window_wants_focus(const Window::Id &id) override; - void window_moved(const Window::Id &id, const std::int32_t &x, const std::int32_t &y) override; - void window_resized(const Window::Id &id, const std::int32_t &width, const std::int32_t &height) override; + void window_moved(const Window::Id &id, const std::int32_t &x, + const std::int32_t &y) override; + void window_resized(const Window::Id &id, const std::int32_t &width, + const std::int32_t &height) override; DisplayInfo display_info() const override; diff --git a/src/anbox/ubuntu/window.cpp b/src/anbox/ubuntu/window.cpp index 470046a..9a5a4de 100644 --- a/src/anbox/ubuntu/window.cpp +++ b/src/anbox/ubuntu/window.cpp @@ -100,8 +100,7 @@ void Window::process_event(const SDL_Event &event) { case SDL_WINDOWEVENT_HIDDEN: break; case SDL_WINDOWEVENT_CLOSE: - if (observer_) - observer_->window_deleted(id_); + if (observer_) observer_->window_deleted(id_); break; } } diff --git a/src/anbox/ubuntu/window.h b/src/anbox/ubuntu/window.h index 22e0c34..271a16c 100644 --- a/src/anbox/ubuntu/window.h +++ b/src/anbox/ubuntu/window.h @@ -39,8 +39,10 @@ class Window : public std::enable_shared_from_this, public wm::Window { virtual ~Observer(); virtual void window_deleted(const Id &id) = 0; virtual void window_wants_focus(const Id &id) = 0; - virtual void window_moved(const Id &id, const std::int32_t &x, const std::int32_t &y) = 0; - virtual void window_resized(const Id &id, const std::int32_t &x, const std::int32_t &y) = 0; + virtual void window_moved(const Id &id, const std::int32_t &x, + const std::int32_t &y) = 0; + virtual void window_resized(const Id &id, const std::int32_t &x, + const std::int32_t &y) = 0; }; Window(const Id &id, const wm::Task::Id &task,