From 70b8ee71b559e968ad1b5c740703910f79351c5f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Feb 2014 17:07:21 +0300 Subject: move actorspritelistener into listeners directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/being/actorsprite.cpp | 3 ++- src/being/actorspritelistener.h | 44 ------------------------------------- src/being/localplayer.h | 2 +- src/listeners/actorspritelistener.h | 44 +++++++++++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 48 deletions(-) delete mode 100644 src/being/actorspritelistener.h create mode 100644 src/listeners/actorspritelistener.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dd27b230..4060c28b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -576,7 +576,7 @@ SET(SRCS being/actor.h being/actorsprite.cpp being/actorsprite.h - being/actorspritelistener.h + listeners/actorspritelistener.h actormanager.cpp actormanager.h animatedsprite.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 90f09b6f7..aa8edd335 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -693,7 +693,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being/actor.h \ being/actorsprite.cpp \ being/actorsprite.h \ - being/actorspritelistener.h \ + listeners/actorspritelistener.h \ actormanager.cpp \ actormanager.h \ animatedsprite.cpp \ diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 1426e481e..a74f4f477 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -25,11 +25,12 @@ #include "imagesprite.h" #include "statuseffect.h" -#include "being/actorspritelistener.h" #include "being/localplayer.h" #include "gui/theme.h" +#include "listeners/actorspritelistener.h" + #include "resources/resourcemanager.h" #include "utils/checkutils.h" diff --git a/src/being/actorspritelistener.h b/src/being/actorspritelistener.h deleted file mode 100644 index c89495c85..000000000 --- a/src/being/actorspritelistener.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef BEING_ACTORSPRITELISTENER_H -#define BEING_ACTORSPRITELISTENER_H - -class ActorSprite; - -class ActorSpriteListener -{ - public: - /** - * Destructor. - */ - virtual ~ActorSpriteListener() - { } - - /** - * Called when the ActorSprite has been destroyed. The listener will - * have to be registered first. - * @param actorSprite the ActorSprite being destroyed. - */ - virtual void actorSpriteDestroyed(const ActorSprite &actorSprite) = 0; -}; - -#endif // BEING_ACTORSPRITELISTENER_H diff --git a/src/being/localplayer.h b/src/being/localplayer.h index ce501bcec..5664b03b6 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -25,12 +25,12 @@ #include "listeners/depricatedlistener.h" -#include "being/actorspritelistener.h" #include "being/being.h" #include "gui/userpalette.h" #include "listeners/actionlistener.h" +#include "listeners/actorspritelistener.h" #include diff --git a/src/listeners/actorspritelistener.h b/src/listeners/actorspritelistener.h new file mode 100644 index 000000000..7b4d89b44 --- /dev/null +++ b/src/listeners/actorspritelistener.h @@ -0,0 +1,44 @@ +/* + * The ManaPlus Client + * Copyright (C) 2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef LISTENERS_ACTORSPRITELISTENER_H +#define LISTENERS_ACTORSPRITELISTENER_H + +class ActorSprite; + +class ActorSpriteListener +{ + public: + /** + * Destructor. + */ + virtual ~ActorSpriteListener() + { } + + /** + * Called when the ActorSprite has been destroyed. The listener will + * have to be registered first. + * @param actorSprite the ActorSprite being destroyed. + */ + virtual void actorSpriteDestroyed(const ActorSprite &actorSprite) = 0; +}; + +#endif // LISTENERS_ACTORSPRITELISTENER_H -- cgit v1.2.3-60-g2f50