summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-12 16:01:53 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-12 16:01:53 +0300
commitfb810c2d0a117dba032353b4e60391db2bff504c (patch)
tree2f340d0135d919d7bb35604859f83afe4758e7ba
parent12400c7c747c8195ec88b0cacad8472097ceada9 (diff)
downloadplus-fb810c2d0a117dba032353b4e60391db2bff504c.tar.gz
plus-fb810c2d0a117dba032353b4e60391db2bff504c.tar.bz2
plus-fb810c2d0a117dba032353b4e60391db2bff504c.tar.xz
plus-fb810c2d0a117dba032353b4e60391db2bff504c.zip
Move mouseeventtype.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/enums/events/mouseeventtype.h (renamed from src/events/mouseeventtype.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 8264ec773..a8ee377ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1122,7 +1122,7 @@ SET(SRCS
gui/models/magicschoolmodel.h
events/mouseevent.h
enums/events/mousebutton.h
- events/mouseeventtype.h
+ enums/events/mouseeventtype.h
listeners/mouselistener.h
listeners/openurllistener.h
listeners/pincodelistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0a957184e..d702914c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -201,7 +201,7 @@ manaplus_SOURCES += events/actionevent.h \
gui/models/magicschoolmodel.h \
events/mouseevent.h \
enums/events/mousebutton.h \
- events/mouseeventtype.h \
+ enums/events/mouseeventtype.h \
listeners/mouselistener.h \
listeners/openurllistener.h \
listeners/pincodelistener.cpp \
diff --git a/src/events/mouseeventtype.h b/src/enums/events/mouseeventtype.h
index df9210640..7fa568960 100644
--- a/src/events/mouseeventtype.h
+++ b/src/enums/events/mouseeventtype.h
@@ -61,8 +61,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef EVENTS_MOUSEEVENTTYPE_H
-#define EVENTS_MOUSEEVENTTYPE_H
+#ifndef ENUMS_EVENTS_MOUSEEVENTTYPE_H
+#define ENUMS_EVENTS_MOUSEEVENTTYPE_H
namespace MouseEventType
{
@@ -84,4 +84,4 @@ namespace MouseEventType
};
} // namespace MouseEventType
-#endif // EVENTS_MOUSEEVENTTYPE_H
+#endif // ENUMS_EVENTS_MOUSEEVENTTYPE_H
diff --git a/src/events/mouseevent.h b/src/events/mouseevent.h
index 8ab7334cf..c4e5e14e4 100644
--- a/src/events/mouseevent.h
+++ b/src/events/mouseevent.h
@@ -67,7 +67,7 @@
#include "events/inputguievent.h"
#include "enums/events/mousebutton.h"
-#include "events/mouseeventtype.h"
+#include "enums/events/mouseeventtype.h"
class Widget;
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 04680a857..21cf7e015 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -69,7 +69,7 @@
#include "gui/color.h"
#include "enums/events/mousebutton.h"
-#include "events/mouseeventtype.h"
+#include "enums/events/mouseeventtype.h"
#include "resources/cursor.h"
diff --git a/src/input/mouseinput.h b/src/input/mouseinput.h
index 58b3b9faa..c69bd72b7 100644
--- a/src/input/mouseinput.h
+++ b/src/input/mouseinput.h
@@ -65,7 +65,7 @@
#define INPUT_MOUSEINPUT_H
#include "enums/events/mousebutton.h"
-#include "events/mouseeventtype.h"
+#include "enums/events/mouseeventtype.h"
#include "localconsts.h"