main: use auto variables where appropriate and sensible

[staging/windowmanager.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 7ff9040..9b2f48a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,12 +4,6 @@
 #include <unistd.h>
 
 #include <stdlib.h>
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
 
 #include <sys/poll.h>
 
@@ -52,8 +46,8 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
          if (!c->c->surfaces.empty()) {
             puts("Surfaces:");
             for (auto const &i : c->c->surfaces) {
-               struct genivi::rect const &r = i.second->dst_rect;
-               struct genivi::size const &s = i.second->size;
+               auto const &r = i.second->dst_rect;
+               auto const &s = i.second->size;
                printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
                       r.x, r.y);
             }
@@ -63,8 +57,8 @@ int check_events(struct wl::display *d, struct conn *c, int fd) {
          if (!c->c->layers.empty()) {
             puts("Layers:");
             for (auto const &i : c->c->layers) {
-               struct genivi::rect const &r = i.second->dst_rect;
-               struct genivi::size const &s = i.second->size;
+               auto const &r = i.second->dst_rect;
+               auto const &s = i.second->size;
                printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
                       r.x, r.y);
             }
@@ -131,15 +125,15 @@ int main(int argc, char **argv) {
    if (!d->ok())
       fatal("Could not connect to compositor");
 
-   struct conn c = {};
+   struct conn c{};
 
    d->r->add_global_handler(
-      "ivi_controller", [&](wl_registry *r, uint32_t name, uint32_t v) {
+      "ivi_controller", [&c](wl_registry *r, uint32_t name, uint32_t v) {
          c.c = std::make_unique<genivi::controller>(r, name, v);
       });
 
    d->r->add_global_handler(
-      "wl_output", [&](wl_registry *r, uint32_t name, uint32_t v) {
+      "wl_output", [&c](wl_registry *r, uint32_t name, uint32_t v) {
          c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
       });