diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-25 01:24:42 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-25 01:24:42 -0500 |
| commit | 560054e99ecd692b89fd8fbedcf69d08e45f41bd (patch) | |
| tree | 7c5130e86e99a7dfc03ffc639b7f1751fd2dfff0 | |
| parent | 8dddfc1ef55773cdf878e413d82142781a6e444b (diff) | |
| download | sigen-560054e99ecd692b89fd8fbedcf69d08e45f41bd.tar.gz sigen-560054e99ecd692b89fd8fbedcf69d08e45f41bd.tar.xz sigen-560054e99ecd692b89fd8fbedcf69d08e45f41bd.zip | |
Moved SigmodModel files to GameModel
| -rw-r--r-- | sigmodr/tree/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sigmodr/tree/GameModel.cpp (renamed from sigmodr/tree/SigmodModel.cpp) | 0 | ||||
| -rw-r--r-- | sigmodr/tree/GameModel.h (renamed from sigmodr/tree/SigmodModel.h) | 0 | ||||
| -rw-r--r-- | sigmodr/tree/RootModel.cpp | 2 | ||||
| -rw-r--r-- | sigmodr/tree/RootModel.h | 3 |
5 files changed, 4 insertions, 5 deletions
diff --git a/sigmodr/tree/CMakeLists.txt b/sigmodr/tree/CMakeLists.txt index 81e767ed..6d6a4164 100644 --- a/sigmodr/tree/CMakeLists.txt +++ b/sigmodr/tree/CMakeLists.txt @@ -14,6 +14,7 @@ set(sigmodrtree_HEADERS CoinListItemModel.h EggGroupGroupModel.h EggGroupModel.h + GameModel.h Global.h GlobalScriptGroupModel.h GlobalScriptModel.h @@ -43,7 +44,6 @@ set(sigmodrtree_HEADERS ObjectModel.h RootModel.h RulesModel.h - SigmodModel.h SigmodrTree.h SigmodrTreeModel.h SkinGroupModel.h @@ -84,6 +84,7 @@ set(sigmodrtree_SRCS CoinListItemModel.cpp EggGroupGroupModel.cpp EggGroupModel.cpp + GameModel.cpp GlobalScriptGroupModel.cpp GlobalScriptModel.cpp Grouping.cpp @@ -112,7 +113,6 @@ set(sigmodrtree_SRCS ObjectModel.cpp RootModel.cpp RulesModel.cpp - SigmodModel.cpp SigmodrTree.cpp SigmodrTreeModel.cpp SkinGroupModel.cpp diff --git a/sigmodr/tree/SigmodModel.cpp b/sigmodr/tree/GameModel.cpp index 5d9b75ac..5d9b75ac 100644 --- a/sigmodr/tree/SigmodModel.cpp +++ b/sigmodr/tree/GameModel.cpp diff --git a/sigmodr/tree/SigmodModel.h b/sigmodr/tree/GameModel.h index 72af2787..72af2787 100644 --- a/sigmodr/tree/SigmodModel.h +++ b/sigmodr/tree/GameModel.h diff --git a/sigmodr/tree/RootModel.cpp b/sigmodr/tree/RootModel.cpp index c5549267..76202045 100644 --- a/sigmodr/tree/RootModel.cpp +++ b/sigmodr/tree/RootModel.cpp @@ -19,7 +19,7 @@ #include "RootModel.h" // Sigmodr tree includes -#include "SigmodModel.h" +#include "GameModel.h" // Sigmod includes #include <sigmod/Game.h> diff --git a/sigmodr/tree/RootModel.h b/sigmodr/tree/RootModel.h index 2e454d6d..87597042 100644 --- a/sigmodr/tree/RootModel.h +++ b/sigmodr/tree/RootModel.h @@ -20,14 +20,13 @@ // Sigmodr tree includes #include "GroupModel.h" -#include "SigmodModel.h" namespace Sigmodr { namespace Tree { // Forward declarations -class SigmodModel; +class GameModel; class SIGMODRTREE_IMPORT RootModel : public GroupModel { |