SVN commit 919108 by majewsky: Rename Kolf::Game to Kolf::NormalGame. M +1 -1 CMakeLists.txt AM engine/game-normal.cpp engine/game.cpp#917905 [License: GPL (v2+)] AM engine/game-normal.h engine/game.h#917905 [License: GPL (v2+)] D engine/game.cpp D engine/game.h M +2 -2 interface/mainwindow.cpp M +2 -2 interface/scorecard.cpp --- trunk/playground/games/kolf-ng/CMakeLists.txt #919107:919108 @@ -32,7 +32,7 @@ elements/overlay-wall.cpp elements/putter.cpp engine/course.cpp - engine/game.cpp + engine/game-normal.cpp engine/player.cpp engine/player-dummy.cpp engine/player-local.cpp ** trunk/playground/games/kolf-ng/engine/game-normal.cpp #property svn:mergeinfo + ** trunk/playground/games/kolf-ng/engine/game-normal.h #property svn:mergeinfo + --- trunk/playground/games/kolf-ng/interface/mainwindow.cpp #919107:919108 @@ -19,7 +19,7 @@ #include "mainwindow.h" #include "mainwindow_p.h" #include "../engine/course.h" -#include "../engine/game.h" +#include "../engine/game-normal.h" #include "../engine/player.h" #include @@ -101,7 +101,7 @@ setupGUI(); setCentralWidget(p->m_view); //DEBUG - I'm aware of the awful memory leaks I'm introducing here. - Kolf::Game* game = new Kolf::Game(new Kolf::Course("test1"), p->m_view); + Kolf::NormalGame* game = new Kolf::NormalGame(new Kolf::Course("test1"), p->m_view); Kolf::Player* player1 = game->addPlayer(); player1->setColor(Qt::blue); Kolf::Player* player2 = game->addPlayer(); --- trunk/playground/games/kolf-ng/interface/scorecard.cpp #919107:919108 @@ -17,7 +17,7 @@ ***************************************************************************/ #include "scorecard.h" -#include "../engine/game.h" +#include "../engine/game-normal.h" #include #include @@ -76,7 +76,7 @@ void Kolf::ScoreCard::slotDockLocationChanged(Qt::DockWidgetArea area) { - Kolf::Game* game = qobject_cast(m_view->model()); + Kolf::NormalGame* game = qobject_cast(m_view->model()); if (!game) return; //set model orientation