From 55cbdbc94a323c9dea4479f79d4a46b08990f30b Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke <grumbel@gmail.com>
Date: Fri, 8 Aug 2014 23:53:42 +0200
Subject: [PATCH] Minor cleanup

---
 src/gui/menu_item.cpp  | 9 +++------
 src/supertux/world.hpp | 5 ++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/menu_item.cpp b/src/gui/menu_item.cpp
index e8554ef7e..679483430 100644
--- a/src/gui/menu_item.cpp
+++ b/src/gui/menu_item.cpp
@@ -28,18 +28,15 @@ static const float FLICK_CURSOR_TIME = 0.5f;
 MenuItem::MenuItem(MenuItemKind _kind, int _id) :
   kind(_kind),
   id(_id),
-  toggled(),
+  toggled(false),
   text(),
   input(),
   help(),
   list(),
-  selected(),
-  target_menu(),
+  selected(false),
+  target_menu(MenuStorage::NO_MENU),
   input_flickering()
 {
-  toggled = false;
-  selected = false;
-  target_menu = MenuStorage::NO_MENU;
 }
 
 void
diff --git a/src/supertux/world.hpp b/src/supertux/world.hpp
index d0dbc59e2..bab44e954 100644
--- a/src/supertux/world.hpp
+++ b/src/supertux/world.hpp
@@ -52,7 +52,6 @@ public:
   /** returns player status */
   PlayerStatus* get_player_status() const { return player_status.get(); }
 
-
   void run();
 
 private:
@@ -69,6 +68,10 @@ private:
 public:
   bool hide_from_contribs;
   bool is_levelset;
+
+private:
+  World(const World&) = delete;
+  World& operator=(const World&) = delete;
 };
 
 #endif
-- 
2.11.0