summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-11 21:51:04 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-11 21:51:04 +0300
commita7f5022c415badc940d0f4ff3025f6b19107a878 (patch)
treecf8b5b92a6624a0093d938e62f5e407ba3c4dc27
parent268e72f74c0cc7f52289b8d97091bb4ecf3f0561 (diff)
downloadmv-a7f5022c415badc940d0f4ff3025f6b19107a878.tar.gz
mv-a7f5022c415badc940d0f4ff3025f6b19107a878.tar.bz2
mv-a7f5022c415badc940d0f4ff3025f6b19107a878.tar.xz
mv-a7f5022c415badc940d0f4ff3025f6b19107a878.zip
Fix compilation in clang with libc++.
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/gui.h1
-rw-r--r--src/gui/sdlinput.cpp1
-rw-r--r--src/gui/sdlinput.h4
-rw-r--r--src/gui/widgets/textfield.cpp1
-rw-r--r--src/gui/windows/chatwindow.cpp1
6 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0c75dd4e4..4284c1af8 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "mouseinput.h"
+
#include "gui/gui.h"
#include "gui/focushandler.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 85ec33415..7ac546102 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -33,6 +33,7 @@ class Graphics;
class GuiConfigListener;
class ImageSet;
class MouseEvent;
+class MouseInput;
class SDLFont;
class SDLInput;
class Window;
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 3dcbd4caa..52d7a8fec 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -58,7 +58,6 @@
#include "gui/sdlinput.h"
-#include "mouseinput.h"
#include "sdlshared.h"
#include "input/inputmanager.h"
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 368367bd2..65e0a78ce 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -61,6 +61,8 @@
#include "input/keyinput.h"
+#include "mouseinput.h"
+
#include <SDL_events.h>
#include <guichan/input.hpp>
@@ -69,8 +71,6 @@
#include <queue>
-class MouseInput;
-
namespace Key
{
enum
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index a361e1a12..abf90019a 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -23,6 +23,7 @@
#include "gui/widgets/textfield.h"
#include "client.h"
+#include "mouseinput.h"
#ifdef ANDROID
#include "input/inputmanager.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 79cf0eff3..508166510 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -28,6 +28,7 @@
#include "configuration.h"
#include "game.h"
#include "guild.h"
+#include "mouseinput.h"
#include "party.h"
#include "spellshortcut.h"