Renamed MenuManager to MenuStorage and MenuManager2 to MenuManager

[supertux.git] / src / control / codecontroller.hpp

diff --git a/src/control/codecontroller.hpp b/src/control/codecontroller.hpp
index 687ec5f..26e3d8d 100644 (file)
--- a/src/control/codecontroller.hpp
+++ b/src/control/codecontroller.hpp
@@ -1,33 +1,29 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __CODECONTROLLER_H__
-#define __CODECONTROLLER_H__
+#ifndef HEADER_SUPERTUX_CONTROL_CODECONTROLLER_HPP
+#define HEADER_SUPERTUX_CONTROL_CODECONTROLLER_HPP
 
-#include "controller.hpp"
+#include "control/controller.hpp"
 
 /**
- * This is a dummy controler that doesn't react to any user input but should
+ * This is a dummy controller that doesn't react to any user input but should
  * be controlled by code
  */
-class CodeController : public Controller 
+class CodeController : public Controller
 {
 public:
   CodeController();
@@ -38,3 +34,5 @@ public:
 };
 
 #endif
+
+/* EOF */