From 03c19b83fa09e5c0c12bc5369b7b062f8d0ae911 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 15 Feb 2019 19:30:07 +0100
Subject: Code simplification using InkscapeApplication singleton.

---
 src/inkscape-window.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/inkscape-window.cpp')

diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index 600b602d1..8c0525a87 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -35,23 +35,15 @@
 
 InkscapeWindow::InkscapeWindow(SPDocument* document)
     : _document(document)
+    , _app(nullptr)
 {
     if (!_document) {
         std::cerr << "InkscapeWindow::InkscapeWindow: null document!" << std::endl;
         return;
     }
 
-    ConcreteInkscapeApplication<Gtk::Application>& my_app =
-    ConcreteInkscapeApplication<Gtk::Application>::get_instance();
-
-    Glib::RefPtr<Gio::Application> gio_app = Gio::Application::get_default();
-    Glib::RefPtr<Gtk::Application> gtk_app = Glib::RefPtr<Gtk::Application>::cast_dynamic(gio_app);
-    _app = Glib::RefPtr<InkscapeApplication>::cast_dynamic(gtk_app);
-    if (gtk_app) {
-        set_application(gtk_app);  // Same as Gtk::Application::add_window()
-    } else {
-        std::cerr << "InkscapeWindow::InkscapeWindow:: Didn't get app!" << std::endl;
-    }
+    _app = &(ConcreteInkscapeApplication<Gtk::Application>::get_instance());
+    _app->add_window(*this);
 
     set_resizable(true);
 
-- 
cgit v1.2.3