From fa345a9f7b3f81c5a104480c510ccb8840348ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= Date: Sat, 6 Oct 2012 01:50:58 +0200 Subject: [PATCH] Rename Turn into TurnData (step 1) --- game/Makefile.am | 2 +- game/freegame.cpp | 2 +- game/game.cpp | 2 +- game/game_move_cmd.cpp | 2 +- game/history.cpp | 2 +- game/player.cpp | 2 +- game/{turn.cpp => turn_data.cpp} | 2 +- game/{turn.h => turn_data.h} | 0 po/POTFILES.in | 4 ++-- qt/history_widget.cpp | 2 +- qt/main_window.cpp | 2 +- qt/stats_widget.cpp | 2 +- utils/game_io.cpp | 2 +- utils/ncurses.cpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename game/{turn.cpp => turn_data.cpp} (98%) rename game/{turn.h => turn_data.h} (100%) diff --git a/game/Makefile.am b/game/Makefile.am index 592fe1e..9125bd6 100644 --- a/game/Makefile.am +++ b/game/Makefile.am @@ -32,7 +32,7 @@ libgame_a_SOURCES= \ move.cpp move.h \ results.cpp results.h \ bag.cpp bag.h \ - turn.cpp turn.h \ + turn_data.cpp turn_data.h \ history.cpp history.h \ player.cpp player.h \ player_event_cmd.cpp player_event_cmd.h \ diff --git a/game/freegame.cpp b/game/freegame.cpp index 95978a9..2fbe265 100644 --- a/game/freegame.cpp +++ b/game/freegame.cpp @@ -40,7 +40,7 @@ #include "game_rack_cmd.h" #include "ai_player.h" #include "settings.h" -#include "turn.h" +#include "turn_data.h" #include "encoding.h" #include "debug.h" diff --git a/game/game.cpp b/game/game.cpp index beb7557..25ced86 100644 --- a/game/game.cpp +++ b/game/game.cpp @@ -39,7 +39,7 @@ #include "results.h" #include "player.h" #include "game.h" -#include "turn.h" +#include "turn_data.h" #include "encoding.h" #include "game_exception.h" #include "turn_cmd.h" diff --git a/game/game_move_cmd.cpp b/game/game_move_cmd.cpp index 373707e..97b80da 100644 --- a/game/game_move_cmd.cpp +++ b/game/game_move_cmd.cpp @@ -25,7 +25,7 @@ #include "game_params.h" #include "game.h" #include "rack.h" -#include "turn.h" +#include "turn_data.h" INIT_LOGGER(game, GameMoveCmd); diff --git a/game/history.cpp b/game/history.cpp index 73ceb7d..c36e09f 100644 --- a/game/history.cpp +++ b/game/history.cpp @@ -25,7 +25,7 @@ #include "rack.h" #include "pldrack.h" #include "move.h" -#include "turn.h" +#include "turn_data.h" #include "history.h" #include "encoding.h" #include "debug.h" diff --git a/game/player.cpp b/game/player.cpp index 130dc02..f05d3dc 100644 --- a/game/player.cpp +++ b/game/player.cpp @@ -26,7 +26,7 @@ #include "results.h" #include "board.h" #include "player.h" -#include "turn.h" +#include "turn_data.h" #include "history.h" #include "encoding.h" #include "settings.h" diff --git a/game/turn.cpp b/game/turn_data.cpp similarity index 98% rename from game/turn.cpp rename to game/turn_data.cpp index aaa5ae2..a95e278 100644 --- a/game/turn.cpp +++ b/game/turn_data.cpp @@ -21,7 +21,7 @@ #include -#include "turn.h" +#include "turn_data.h" INIT_LOGGER(game, Turn); diff --git a/game/turn.h b/game/turn_data.h similarity index 100% rename from game/turn.h rename to game/turn_data.h diff --git a/po/POTFILES.in b/po/POTFILES.in index 7612b2b..d7009d5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -96,8 +96,8 @@ game/settings.cpp game/settings.h game/training.cpp game/training.h -game/turn.cpp -game/turn.h +game/turn_data.cpp +game/turn_data.h game/turn_cmd.cpp game/turn_cmd.h game/xml_reader.cpp diff --git a/qt/history_widget.cpp b/qt/history_widget.cpp index f7bfbd7..426b6c0 100644 --- a/qt/history_widget.cpp +++ b/qt/history_widget.cpp @@ -35,7 +35,7 @@ #include "public_game.h" #include "player.h" #include "history.h" -#include "turn.h" +#include "turn_data.h" #include "move.h" #include "game_params.h" diff --git a/qt/main_window.cpp b/qt/main_window.cpp index 075a897..1caef40 100644 --- a/qt/main_window.cpp +++ b/qt/main_window.cpp @@ -43,7 +43,7 @@ #include "public_game.h" #include "player.h" #include "history.h" -#include "turn.h" +#include "turn_data.h" #include "move.h" #include "debug.h" #include "round.h" diff --git a/qt/stats_widget.cpp b/qt/stats_widget.cpp index 8e27437..18e1ed4 100644 --- a/qt/stats_widget.cpp +++ b/qt/stats_widget.cpp @@ -31,7 +31,7 @@ #include "public_game.h" #include "player.h" #include "history.h" -#include "turn.h" +#include "turn_data.h" #include "game_params.h" #include "settings.h" #include "debug.h" diff --git a/utils/game_io.cpp b/utils/game_io.cpp index c17e122..695e992 100644 --- a/utils/game_io.cpp +++ b/utils/game_io.cpp @@ -35,7 +35,7 @@ #include "player.h" #include "encoding.h" #include "history.h" -#include "turn.h" +#include "turn_data.h" #include "move.h" #include "round.h" diff --git a/utils/ncurses.cpp b/utils/ncurses.cpp index 8d6ab9e..2e84d08 100644 --- a/utils/ncurses.cpp +++ b/utils/ncurses.cpp @@ -46,7 +46,7 @@ #include "results.h" #include "player.h" #include "history.h" -#include "turn.h" +#include "turn_data.h" #include "game_exception.h" #include "encoding.h"