diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-16 17:07:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-16 17:07:21 +0300 |
| commit | 70b8ee71b559e968ad1b5c740703910f79351c5f (patch) | |
| tree | 6f572f3c940267e03f90e77733d37a7a42b623f8 | |
| parent | b3a0b3dc161face77bfd13791655c79343aab3a8 (diff) | |
| download | manaplus-70b8ee71b559e968ad1b5c740703910f79351c5f.tar.gz manaplus-70b8ee71b559e968ad1b5c740703910f79351c5f.tar.bz2 manaplus-70b8ee71b559e968ad1b5c740703910f79351c5f.tar.xz manaplus-70b8ee71b559e968ad1b5c740703910f79351c5f.zip | |
move actorspritelistener into listeners directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/being/actorsprite.cpp | 3 | ||||
| -rw-r--r-- | src/being/localplayer.h | 2 | ||||
| -rw-r--r-- | src/listeners/actorspritelistener.h (renamed from src/being/actorspritelistener.h) | 6 |
5 files changed, 8 insertions, 7 deletions
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/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 <vector> diff --git a/src/being/actorspritelistener.h b/src/listeners/actorspritelistener.h index c89495c85..7b4d89b44 100644 --- a/src/being/actorspritelistener.h +++ b/src/listeners/actorspritelistener.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef BEING_ACTORSPRITELISTENER_H -#define BEING_ACTORSPRITELISTENER_H +#ifndef LISTENERS_ACTORSPRITELISTENER_H +#define LISTENERS_ACTORSPRITELISTENER_H class ActorSprite; @@ -41,4 +41,4 @@ class ActorSpriteListener virtual void actorSpriteDestroyed(const ActorSprite &actorSprite) = 0; }; -#endif // BEING_ACTORSPRITELISTENER_H +#endif // LISTENERS_ACTORSPRITELISTENER_H |