Merge branch 'licensing' into dev

src/client/abtract_in_game_renderer.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _ABTRACT_IN_GAME_RENDERER_HPP_
 #define _ABTRACT_IN_GAME_RENDERER_HPP_
 
@@ -55,4 +58,4 @@ class AbtractInGameRenderer :
 
 };
 
-#endif // _ABTRACT_IN_GAME_RENDERER_HPP_
+#endif // _ABTRACT_IN_GAME_RENDERER_HPP_

src/client/command_factory_interface.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _COMMAND_FACTORY_INTERFACE_HPP_
 #define _COMMAND_FACTORY_INTERFACE_HPP_
 
@@ -24,4 +27,4 @@ class CommandFactoryInterface {
 
 };
 
-#endif // _COMMAND_FACTORY_INTERFACE_HPP_
+#endif // _COMMAND_FACTORY_INTERFACE_HPP_

src/client/game_event.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _GAME_EVENT_HPP_
 #define _GAME_EVENT_HPP_
 
@@ -18,4 +21,4 @@ class GameEvent {
   static const int PUZZLE_FINISHED = 5;
 };
 
-#endif // _GAME_EVENT_HPP_
+#endif // _GAME_EVENT_HPP_

src/client/game_loop.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "game_loop.hpp"
 
 #include "common/logging.hpp"
@@ -78,4 +81,4 @@ GameLoop::handle_event(int iEventCode)
   if (iEventCode == GameEvent::QUIT) {
     running_ = false;
   }
-}
+}

src/client/game_loop.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _GAME_LOOP_HPP_
 #define _GAME_LOOP_HPP_
 
@@ -72,4 +75,4 @@ class GameLoop : public ObserverInterface {
 
 };
 
-#endif // _GAME_LOOP_HPP_
+#endif // _GAME_LOOP_HPP_

src/client/game_mode.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "game_mode.hpp"
 
 #include "mvc/controller_interface.hpp"
@@ -26,4 +29,4 @@ GameMode::add_observer(ObserverInterface *o)
 {
   Observable::add_observer(o);
   pController_->add_observer(o);
-}
+}

src/client/game_mode.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _GAME_MODE_HPP_
 #define _GAME_MODE_HPP_
 
@@ -35,4 +38,4 @@ class GameMode :
 
 };
 
-#endif // _GAME_MODE_HPP_
+#endif // _GAME_MODE_HPP_

src/client/game_mode_interface.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _GAME_MODE_INTERFACE_HPP_
 #define _GAME_MODE_INTERFACE_HPP_
 
@@ -31,4 +34,4 @@ class GameModeInterface : public Observable {
 
 };
 
-#endif // _GAME_MODE_INTERFACE_HPP_
+#endif // _GAME_MODE_INTERFACE_HPP_

src/client/in_game_command_factory.cpp

@@ -1,9 +1,11 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_command_factory.hpp"
 
 #include "move_command.hpp"
 
 CommandInterface * 
 InGameCommandFactory::createMoveCommand(InGameModel & i_model, int i_index, int i_i, int i_j) {
   return new MoveCommand(i_model, i_index, i_i, i_j);
-}
-
+}

src/client/in_game_command_factory.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_COMMAND_FACTORY_HPP_
 #define _IN_GAME_COMMAND_FACTORY_HPP_
 
@@ -25,4 +28,4 @@ class InGameCommandFactory :
 
 };
 
-#endif // _IN_GAME_COMMAND_FACTORY_HPP_
+#endif // _IN_GAME_COMMAND_FACTORY_HPP_

src/client/in_game_command_stack.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_command_stack.hpp"
 
 #include "command_factory_interface.hpp"
@@ -9,4 +12,4 @@ InGameCommandStack::doMove(InGameModel & i_model, int i_index, int i_i, int i_j)
   CommandInterface * p_command = dep_command_factory_.createMoveCommand(i_model, i_index, i_i, i_j);
   assert(p_command != NULL);
   doCommand(p_command);
-}
+}

src/client/in_game_command_stack.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_COMMAND_STACK_HPP_
 #define _IN_GAME_COMMAND_STACK_HPP_
 
@@ -36,4 +39,4 @@ class InGameCommandStack :
 
 };
 
-#endif // _IN_GAME_COMMAND_STACK_HPP_
+#endif // _IN_GAME_COMMAND_STACK_HPP_

src/client/in_game_mode.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_mode.hpp"
 
 void
@@ -8,4 +11,4 @@ InGameMode::update_game(int iDelta)
 
   // ask the model to update its content
   dep_model_.update_path();
-}
+}

src/client/in_game_mode.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_MODE_HPP_
 #define _IN_GAME_MODE_HPP_
 
@@ -30,4 +33,4 @@ class InGameMode :
 
 };
 
-#endif // _IN_GAME_MODE_HPP_
+#endif // _IN_GAME_MODE_HPP_

src/client/in_game_mode_factory.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_mode_factory.hpp"
 
 #include "engine/cell_factory.hpp"
@@ -82,4 +85,4 @@ InGameModeFactory::create_mode() {
 boost::shared_ptr<GameMode> &
 InGameModeFactory::get_mode() {
   return mode_;
-}
+}

src/client/in_game_mode_factory.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_MODE_FACTORY_HPP_
 #define _IN_GAME_MODE_FACTORY_HPP_
 
@@ -71,4 +74,4 @@ class InGameModeFactory {
 
 };
 
-#endif // _IN_GAME_MODE_FACTORY_HPP_
+#endif // _IN_GAME_MODE_FACTORY_HPP_

src/client/in_game_model.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_model.hpp"
 
 #include "engine/move.hpp"
@@ -103,4 +106,4 @@ bool
 InGameModel::is_puzzle_finished()
 {
   return dep_puzzle_->is_finished();
-}
+}

src/client/in_game_model.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_MODEL_HPP_
 #define _IN_GAME_MODEL_HPP_
 
@@ -128,4 +131,4 @@ class InGameModel {
 
 };
 
-#endif // _IN_GAME_MODEL_HPP_
+#endif // _IN_GAME_MODEL_HPP_

src/client/in_game_renderer_geometry.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_renderer_geometry.hpp"
 
 int
@@ -50,4 +53,4 @@ InGameRendererGeometry::is_on_redo_button(int i_x, int i_y)
 {
   return (i_x > REDO_X && i_x < REDO_X + REDO_W) &&
     (i_y > REDO_Y && i_y < REDO_Y + REDO_H);
-}
+}

src/client/in_game_renderer_geometry.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_RENDERER_GEOMETRY_HPP_
 #define _IN_GAME_RENDERER_GEOMETRY_HPP_
 
@@ -49,4 +52,4 @@ class InGameRendererGeometry
 
 };
 
-#endif // _IN_GAME_RENDERER_GEOMETRY_HPP_
+#endif // _IN_GAME_RENDERER_GEOMETRY_HPP_

src/client/in_game_renderer_interface.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_RENDERER_INTERFACE_HPP_
 #define _IN_GAME_RENDERER_INTERFACE_HPP_
 
@@ -77,4 +80,4 @@ class InGameRendererInterface :
 
 };
 
-#endif // _IN_GAME_RENDERER_INTERFACE_HPP_
+#endif // _IN_GAME_RENDERER_INTERFACE_HPP_

src/client/in_game_view.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "in_game_view.hpp"
 
 #include "common/logging.hpp"
@@ -159,4 +162,4 @@ InGameView::render_player(const Puzzle & i_puzzle) {
       i_puzzle.get_player_j() != -1) {
     dep_renderer_.render_player(i_puzzle.get_player_i(), i_puzzle.get_player_j());
   }
-}
+}

src/client/in_game_view.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _IN_GAME_VIEW_HPP_
 #define _IN_GAME_VIEW_HPP_
 
@@ -65,4 +68,4 @@ class InGameView :
 
 };
 
-#endif // _IN_GAME_VIEW_HPP_
+#endif // _IN_GAME_VIEW_HPP_

src/client/move_command.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "move_command.hpp"
 
 #include "client/in_game_model.hpp"
@@ -34,5 +37,4 @@ MoveCommand::undo()
 
   // Change the current move to be the one just cancelled
   dep_model_.set_current_move_index(move_index_);
-}
-
+}

src/client/move_command.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _MOVE_COMMAND_HPP_
 #define _MOVE_COMMAND_HPP_
 
@@ -43,4 +46,4 @@ class MoveCommand :
 
 };
 
-#endif // _MOVE_COMMAND_HPP_
+#endif // _MOVE_COMMAND_HPP_

src/client/option_parser.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "option_parser.hpp"
 
 #include "common/logging.hpp"
@@ -56,4 +59,4 @@ std::string
 OptionParser::get_puzzle_file_name() const {
   assert(has_puzzle_file_name());
   return std::string(s_puzzle_file_name_);
-}
+}

src/client/option_parser.hpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #ifndef _OPTION_PARSER_HPP_
 #define _OPTION_PARSER_HPP_
 
@@ -40,4 +43,4 @@ class OptionParser {
 
 };
 
-#endif // _OPTION_PARSER_HPP_
+#endif // _OPTION_PARSER_HPP_

src/client/puzzle_selection_geometry.cpp

@@ -1,3 +1,6 @@
+/**
+ * This is Free Software. See COPYING for information.
+ */
 #include "puzzle_selection_geometry.hpp"
 
 int
@@ -27,4 +30,4 @@ int
 PuzzleSelectionGeometry::get_puzzle_name_y(int i_index)
 {
   return NAMES_Y0 + (NAMES_H *i_index + NAMES_DELTA);
-}
+}