From cec9c34bb32e6584d3e31a873244840b9639244c Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 7 Apr 2008 13:49:05 +0200 Subject: [PATCH] refresh eb7a2e43e1ab43ae296089595e4a46dc143eee59 State and Behaviour are Components aleady --- src/variants/shogi/behaviour.h | 2 +- src/variants/shogi/state.cpp | 3 +-- src/variants/shogi/state.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/variants/shogi/behaviour.h b/src/variants/shogi/behaviour.h index 0806133..bb46b0e 100644 --- a/src/variants/shogi/behaviour.h +++ b/src/variants/shogi/behaviour.h @@ -15,7 +15,7 @@ namespace Shogi { -class TAGUA_EXPORT Behaviour : public Component, public Delegators::Behaviour { +class TAGUA_EXPORT Behaviour : public Delegators::Behaviour { Q_OBJECT PromotionManager* m_promotionmanager; public: diff --git a/src/variants/shogi/state.cpp b/src/variants/shogi/state.cpp index dfdd4da..2bdf367 100644 --- a/src/variants/shogi/state.cpp +++ b/src/variants/shogi/state.cpp @@ -32,8 +32,7 @@ State::State(const IBehaviour* behaviour, } State::State(const State& other) -: Component() -, DefaultState() +: DefaultState() , m_board(other.m_board) , m_flags(other.m_flags) , m_turn(other.m_turn) diff --git a/src/variants/shogi/state.h b/src/variants/shogi/state.h index 2b046e6..c7df5c5 100644 --- a/src/variants/shogi/state.h +++ b/src/variants/shogi/state.h @@ -22,7 +22,7 @@ */ namespace Shogi { -class State : public Component, public DefaultState { +class State : public DefaultState { Q_OBJECT Board m_board; TaguaObject m_flags; -- 2.11.4.GIT