summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-20 18:33:36 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-20 18:33:36 +0300
commit982d842ce7006888cb943249efaa59db9607346d (patch)
tree2f82f029ef180ecb78dab4cb0be010de1880fd4d /src/gui
parenta6d1f7f9abdedce7c03056408ed2172792abce53 (diff)
downloadmv-982d842ce7006888cb943249efaa59db9607346d.tar.gz
mv-982d842ce7006888cb943249efaa59db9607346d.tar.bz2
mv-982d842ce7006888cb943249efaa59db9607346d.tar.xz
mv-982d842ce7006888cb943249efaa59db9607346d.zip
Move animatedsprite into sprite directory.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp3
-rw-r--r--src/gui/windowmanager_unittest.cc4
-rw-r--r--src/gui/windows/ministatuswindow.cpp3
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 7cba5872e..e83e91bb8 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -21,7 +21,6 @@
#include "gui/widgets/emoteshortcutcontainer.h"
-#include "animatedsprite.h"
#include "emoteshortcut.h"
#include "settings.h"
@@ -40,6 +39,8 @@
#include "resources/db/emotedb.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 9b686568c..9f0c30d34 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -18,8 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "animatedsprite.h"
-
#include "catch.hpp"
#include "client.h"
#include "settings.h"
@@ -51,6 +49,8 @@
#include "resources/resourcemanager.h"
#include "resources/sdlimagehelper.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/delete2.h"
#include "utils/env.h"
#include "utils/gettext.h"
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index aa544e128..a58693262 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -22,7 +22,6 @@
#include "gui/windows/ministatuswindow.h"
-#include "animatedsprite.h"
#include "configuration.h"
#include "inventory.h"
@@ -43,6 +42,8 @@
#include "net/playerhandler.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/gettext.h"