summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-12 15:48:26 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-12 15:48:26 +0300
commit12400c7c747c8195ec88b0cacad8472097ceada9 (patch)
tree3af1f4eeae6a1da14fcbc16ac0b1936f6237aaf5
parentf8fa10233df6c27c70c4a4875b202068654e825a (diff)
downloadmv-12400c7c747c8195ec88b0cacad8472097ceada9.tar.gz
mv-12400c7c747c8195ec88b0cacad8472097ceada9.tar.bz2
mv-12400c7c747c8195ec88b0cacad8472097ceada9.tar.xz
mv-12400c7c747c8195ec88b0cacad8472097ceada9.zip
Move mousebutton.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/events/mousebutton.h (renamed from src/events/mousebutton.h)6
-rw-r--r--src/events/mouseevent.h2
-rw-r--r--src/gui/gui.h2
-rw-r--r--src/input/mouseinput.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7ca70954..8264ec773 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1121,7 +1121,7 @@ SET(SRCS
gui/models/listmodel.h
gui/models/magicschoolmodel.h
events/mouseevent.h
- events/mousebutton.h
+ enums/events/mousebutton.h
events/mouseeventtype.h
listeners/mouselistener.h
listeners/openurllistener.h
diff --git a/src/Makefile.am b/src/Makefile.am
index fe244fd56..0a957184e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,7 +200,7 @@ manaplus_SOURCES += events/actionevent.h \
gui/models/listmodel.h \
gui/models/magicschoolmodel.h \
events/mouseevent.h \
- events/mousebutton.h \
+ enums/events/mousebutton.h \
events/mouseeventtype.h \
listeners/mouselistener.h \
listeners/openurllistener.h \
diff --git a/src/events/mousebutton.h b/src/enums/events/mousebutton.h
index 2040c51ad..51fddef5b 100644
--- a/src/events/mousebutton.h
+++ b/src/enums/events/mousebutton.h
@@ -61,8 +61,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef EVENTS_MOUSEBUTTON_H
-#define EVENTS_MOUSEBUTTON_H
+#ifndef ENUMS_EVENTS_MOUSEBUTTON_H
+#define ENUMS_EVENTS_MOUSEBUTTON_H
namespace MouseButton
{
@@ -79,4 +79,4 @@ namespace MouseButton
};
} // namespace MouseButton
-#endif // EVENTS_MOUSEBUTTON_H
+#endif // ENUMS_EVENTS_MOUSEBUTTON_H
diff --git a/src/events/mouseevent.h b/src/events/mouseevent.h
index 3b1b5c2b6..8ab7334cf 100644
--- a/src/events/mouseevent.h
+++ b/src/events/mouseevent.h
@@ -66,7 +66,7 @@
#include "events/inputguievent.h"
-#include "events/mousebutton.h"
+#include "enums/events/mousebutton.h"
#include "events/mouseeventtype.h"
class Widget;
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 423d8adad..04680a857 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -68,7 +68,7 @@
#include "gui/color.h"
-#include "events/mousebutton.h"
+#include "enums/events/mousebutton.h"
#include "events/mouseeventtype.h"
#include "resources/cursor.h"
diff --git a/src/input/mouseinput.h b/src/input/mouseinput.h
index 1795b33fb..58b3b9faa 100644
--- a/src/input/mouseinput.h
+++ b/src/input/mouseinput.h
@@ -64,7 +64,7 @@
#ifndef INPUT_MOUSEINPUT_H
#define INPUT_MOUSEINPUT_H
-#include "events/mousebutton.h"
+#include "enums/events/mousebutton.h"
#include "events/mouseeventtype.h"
#include "localconsts.h"