App: remove unused g_app global, make dtor default

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

diff --git a/src/app.cpp b/src/app.cpp
index 3ee4379..ac70489 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -39,7 +39,6 @@
 namespace wm {
 
 namespace {
-App *g_app;
 
 using nlohmann::json;
 
@@ -84,9 +83,6 @@ App::App(wl::display *d)
      id_alloc{},
      pending_events(false),
      policy{} {
-   assert(g_app == nullptr);
-   g_app = this;
-
    try {
       {
          auto l = load_layer_map(
@@ -102,8 +98,6 @@ App::App(wl::display *d)
    }
 }
 
-App::~App() { g_app = nullptr; }
-
 int App::init() {
    if (!this->display->ok()) {
       return -1;

diff --git a/src/app.hpp b/src/app.hpp
index aac28cd..9424d9f 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -126,7 +126,7 @@ struct App {
    Policy policy;
 
    explicit App(wl::display *d);
-   ~App();
+   ~App() = default;
 
    App(App const &) = delete;
    App &operator=(App const &) = delete;