From 11a5368ea480bbef5d9121eead2881cf099008c1 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 27 May 2021 14:33:00 +0200
Subject: [PATCH] Renamed instances in get() functions to instance

---
 src/config.hpp      | 4 ++--
 src/debug_lldb.hpp  | 4 ++--
 src/directories.hpp | 4 ++--
 src/entrybox.hpp    | 4 ++--
 src/menu.hpp        | 4 ++--
 src/notebook.hpp    | 4 ++--
 src/snippets.hpp    | 4 ++--
 src/terminal.hpp    | 4 ++--
 src/window.hpp      | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/config.hpp b/src/config.hpp
index ec44076..36999d7 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -119,8 +119,8 @@ private:
 
 public:
   static Config &get() {
-    static Config singleton;
-    return singleton;
+    static Config instance;
+    return instance;
   }
 
   void load();
diff --git a/src/debug_lldb.hpp b/src/debug_lldb.hpp
index 5609b15..3c11938 100644
--- a/src/debug_lldb.hpp
+++ b/src/debug_lldb.hpp
@@ -38,8 +38,8 @@ namespace Debug {
 
   public:
     static LLDB &get() {
-      static LLDB singleton;
-      return singleton;
+      static LLDB instance;
+      return instance;
     }
 
     /// Must be called before application terminates (cannot be placed in destructor sadly)
diff --git a/src/directories.hpp b/src/directories.hpp
index bfbe0ce..f38497c 100644
--- a/src/directories.hpp
+++ b/src/directories.hpp
@@ -55,8 +55,8 @@ class Directories : public Gtk::ListViewText {
 
 public:
   static Directories &get() {
-    static Directories singleton;
-    return singleton;
+    static Directories instance;
+    return instance;
   }
   ~Directories() override;
 
diff --git a/src/entrybox.hpp b/src/entrybox.hpp
index 893e077..a118e85 100644
--- a/src/entrybox.hpp
+++ b/src/entrybox.hpp
@@ -39,8 +39,8 @@ private:
 
 public:
   static EntryBox &get() {
-    static EntryBox singleton;
-    return singleton;
+    static EntryBox instance;
+    return instance;
   }
 
   Gtk::Box upper_box;
diff --git a/src/menu.hpp b/src/menu.hpp
index a6f56f8..be2336c 100644
--- a/src/menu.hpp
+++ b/src/menu.hpp
@@ -9,8 +9,8 @@ class Menu {
 
 public:
   static Menu &get() {
-    static Menu singleton;
-    return singleton;
+    static Menu instance;
+    return instance;
   }
 
   void add_action(const std::string &name, const std::function<void()> &action);
diff --git a/src/notebook.hpp b/src/notebook.hpp
index c51d363..6b30171 100644
--- a/src/notebook.hpp
+++ b/src/notebook.hpp
@@ -27,8 +27,8 @@ class Notebook : public Gtk::Paned {
 
 public:
   static Notebook &get() {
-    static Notebook singleton;
-    return singleton;
+    static Notebook instance;
+    return instance;
   }
 
   std::vector<Gtk::Notebook> notebooks;
diff --git a/src/snippets.hpp b/src/snippets.hpp
index 5f3c924..c32f625 100644
--- a/src/snippets.hpp
+++ b/src/snippets.hpp
@@ -17,8 +17,8 @@ public:
   };
 
   static Snippets &get() {
-    static Snippets singleton;
-    return singleton;
+    static Snippets instance;
+    return instance;
   }
 
   std::vector<std::pair<std::regex, std::vector<Snippet>>> snippets;
diff --git a/src/terminal.hpp b/src/terminal.hpp
index 409cb5f..726ca05 100644
--- a/src/terminal.hpp
+++ b/src/terminal.hpp
@@ -15,8 +15,8 @@ class Terminal : public Source::SearchView {
 
 public:
   static Terminal &get() {
-    static Terminal singleton;
-    return singleton;
+    static Terminal instance;
+    return instance;
   }
 
   int process(const std::string &command, const boost::filesystem::path &path = "", bool use_pipes = true);
diff --git a/src/window.hpp b/src/window.hpp
index 20b37a0..dea21bd 100644
--- a/src/window.hpp
+++ b/src/window.hpp
@@ -9,8 +9,8 @@ class Window : public Gtk::ApplicationWindow {
 
 public:
   static Window &get() {
-    static Window singleton;
-    return singleton;
+    static Window instance;
+    return instance;
   }
   void add_widgets();
   void save_session();