summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-29 01:29:49 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-29 01:29:49 +0300
commit3c5c3770c2769caa3b33ff7e683d02291ac56bfb (patch)
tree150ea4aeb6290a4329fdd83c8bdf961f8784b0e5
parentbf41f3154225eb49d9d6f83563f157d1f9ce3f6b (diff)
downloadplus-3c5c3770c2769caa3b33ff7e683d02291ac56bfb.tar.gz
plus-3c5c3770c2769caa3b33ff7e683d02291ac56bfb.tar.bz2
plus-3c5c3770c2769caa3b33ff7e683d02291ac56bfb.tar.xz
plus-3c5c3770c2769caa3b33ff7e683d02291ac56bfb.zip
Move simpleanimation into animation directory.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/widgets/progressindicator.cpp3
-rw-r--r--src/particle/animationparticle.cpp2
-rw-r--r--src/particle/rotationalparticle.cpp2
-rw-r--r--src/resources/animation/simpleanimation.cpp (renamed from src/simpleanimation.cpp)2
-rw-r--r--src/resources/animation/simpleanimation.h (renamed from src/simpleanimation.h)6
-rw-r--r--src/resources/map/tileanimation.cpp2
8 files changed, 12 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e94161b9..160b98426 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1121,8 +1121,8 @@ SET(SRCS
shopitem.h
gui/shortcut/shortcutbase.cpp
gui/shortcut/shortcutbase.h
- simpleanimation.cpp
- simpleanimation.h
+ resources/animation/simpleanimation.cpp
+ resources/animation/simpleanimation.h
const/sound.h
soundmanager.cpp
soundmanager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b365ed6f..55010ba10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -642,8 +642,8 @@ SRC += events/actionevent.h \
render/shaders/shadersmanager.h \
resources/animation/animation.cpp \
resources/animation/animation.h \
- simpleanimation.cpp \
- simpleanimation.h \
+ resources/animation/simpleanimation.cpp \
+ resources/animation/simpleanimation.h \
resources/sprite/sprite.h \
const/sound.h \
soundmanager.cpp \
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index efe65507f..7b1d4f723 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -21,13 +21,12 @@
#include "gui/widgets/progressindicator.h"
-#include "simpleanimation.h"
-
#include "gui/gui.h"
#include "resources/imageset.h"
#include "resources/animation/animation.h"
+#include "resources/animation/simpleanimation.h"
#include "utils/delete2.h"
diff --git a/src/particle/animationparticle.cpp b/src/particle/animationparticle.cpp
index 0d51976cb..58ec5a1ab 100644
--- a/src/particle/animationparticle.cpp
+++ b/src/particle/animationparticle.cpp
@@ -22,7 +22,7 @@
#include "particle/animationparticle.h"
-#include "simpleanimation.h"
+#include "resources/animation/simpleanimation.h"
#include "utils/delete2.h"
diff --git a/src/particle/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp
index cee5c3c56..2bd2960a1 100644
--- a/src/particle/rotationalparticle.cpp
+++ b/src/particle/rotationalparticle.cpp
@@ -22,7 +22,7 @@
#include "particle/rotationalparticle.h"
-#include "simpleanimation.h"
+#include "resources/animation/simpleanimation.h"
#include "utils/delete2.h"
diff --git a/src/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp
index e6c98dddd..632bd6c6f 100644
--- a/src/simpleanimation.cpp
+++ b/src/resources/animation/simpleanimation.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "simpleanimation.h"
+#include "resources/animation/simpleanimation.h"
#include "const/resources/map/map.h"
diff --git a/src/simpleanimation.h b/src/resources/animation/simpleanimation.h
index 4e588e78b..1f89e82b3 100644
--- a/src/simpleanimation.h
+++ b/src/resources/animation/simpleanimation.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SIMPLEANIMATION_H
-#define SIMPLEANIMATION_H
+#ifndef RESOURCES_ANIMATION_SIMPLEANIMATION_H
+#define RESOURCES_ANIMATION_SIMPLEANIMATION_H
#include "utils/xml.h"
@@ -96,4 +96,4 @@ class SimpleAnimation final
ImageSet *mImageSet;
};
-#endif // SIMPLEANIMATION_H
+#endif // RESOURCES_ANIMATION_SIMPLEANIMATION_H
diff --git a/src/resources/map/tileanimation.cpp b/src/resources/map/tileanimation.cpp
index 0f0aa9b70..9ea19c611 100644
--- a/src/resources/map/tileanimation.cpp
+++ b/src/resources/map/tileanimation.cpp
@@ -22,7 +22,7 @@
#include "resources/map/tileanimation.h"
-#include "simpleanimation.h"
+#include "resources/animation/simpleanimation.h"
#include "resources/map/maplayer.h"