Fix mistakes

SuperTux · Nov 15, 2024 · 2cbed93 · 2cbed93
1 parent 09a39a1
commit 2cbed93
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/gui/color_clipboard.cpp b/src/gui/color_clipboard.cpp
@@ -16,11 +16,6 @@
 
 #include "color_clipboard.hpp"
 
-ColorClipboard::ColorClipboard()
-{
-  m_color = std::make_unique<Color>(Color::WHITE);
-}
-
 ColorClipboard&
 ColorClipboard::instance()
 {

diff --git a/src/gui/color_clipboard.hpp b/src/gui/color_clipboard.hpp
@@ -24,7 +24,7 @@
 class ColorClipboard 
 {
 public:
-  ColorClipboard();
+  ColorClipboard() : m_color(std::make_unique<Color>(Color::WHITE)) {}
   ~ColorClipboard() = default;
 
   static ColorClipboard& instance();

diff --git a/src/gui/menu_color.cpp b/src/gui/menu_color.cpp
@@ -16,7 +16,6 @@
 
 #include "gui/menu_color.hpp"
 #include "menu_item.hpp"
-#include "item_action.hpp"
 
 #include "util/gettext.hpp"
 
@@ -52,8 +51,7 @@ ColorMenu::menu_action(MenuItem& item)
   {
     clipboard.set_color(*color);
     MenuItem& menu_paste_item = get_item_by_id(2);
-    if (&menu_paste_item)
-      menu_paste_item.set_text_color(*color);
+    menu_paste_item.set_text_color(*color);
   }
   else if (item.get_id() == 2)
   {