[gnote] Make ActionManager part of Gnote

[Aurimas Černius <aurimasc src gnome org>]

commit 872fc3061dd84885b9c2145637f3617aff04142c
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Oct 13 17:23:07 2019 +0300

    Make ActionManager part of Gnote

 src/actionmanager.cpp | 7 +------
 src/actionmanager.hpp | 2 +-
 src/gnote.cpp         | 3 +--
 src/gnote.hpp         | 1 +
 4 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 55057c1a..6c184e0d 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -54,19 +54,14 @@
 #endif
 
 #include <glibmm/i18n.h>
-#include <gtkmm/window.h>
-#include <gtkmm/imagemenuitem.h>
-#include <gtkmm/image.h>
-#include <gtkmm/stock.h>
 
 #include "sharp/string.hpp"
 #include "debug.hpp"
 #include "actionmanager.hpp"
-#include "iconmanager.hpp"
 
 namespace gnote {
 
-  ActionManager::ActionManager()
+  void ActionManager::init()
   {
     make_app_actions();
     make_app_menu_items();
diff --git a/src/actionmanager.hpp b/src/actionmanager.hpp
index 23ba6bcc..c90ba2aa 100644
--- a/src/actionmanager.hpp
+++ b/src/actionmanager.hpp
@@ -36,7 +36,7 @@ class ActionManager
   : public IActionManager
 {
 public:
-  ActionManager();
+  void init();
 
   virtual Glib::RefPtr<Gio::SimpleAction> get_app_action(const Glib::ustring & name) const override;
   const std::vector<Glib::RefPtr<Gio::SimpleAction> > & get_app_actions() const
diff --git a/src/gnote.cpp b/src/gnote.cpp
index 910024ea..0cb54c56 100644
--- a/src/gnote.cpp
+++ b/src/gnote.cpp
@@ -37,7 +37,6 @@
 #include <gtkmm/shortcutswindow.h>
 
 #include "gnote.hpp"
-#include "actionmanager.hpp"
 #include "addinmanager.hpp"
 #include "applicationaddin.hpp"
 #include "debug.hpp"
@@ -145,7 +144,7 @@ namespace gnote {
     m_manager = new NoteManager(m_preferences);
     m_manager->init(note_path);
     new notebooks::NotebookManager(default_note_manager());
-    new ActionManager;
+    m_action_manager.init();
     sync::SyncManager::init(default_note_manager());
 
     m_manager->get_addin_manager().initialize_application_addins();
diff --git a/src/gnote.hpp b/src/gnote.hpp
index 6ee869b2..b769f41d 100644
--- a/src/gnote.hpp
+++ b/src/gnote.hpp
@@ -171,6 +171,7 @@ private:
   NoteManager *m_manager;
   IconManager m_icon_manager;
   Preferences m_preferences;
+  ActionManager m_action_manager;
   Glib::RefPtr<Gtk::IconTheme> m_icon_theme;
   bool m_is_background;
   bool m_is_shell_search;