Move mousebutton into separate file.

2 files changed, 86 insertions, 15 deletions

diff --git a/src/events/mousebutton.h b/src/events/mousebutton.h
new file mode 100644
index 000000000..29c4548e4
--- /dev/null
+++ b/src/events/mousebutton.h
@@ -0,0 +1,81 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef EVENTS_MOUSEBUTTON_H
+#define EVENTS_MOUSEBUTTON_H
+
+namespace MouseButton
+{
+    /**
+      * Mouse button types.
+      */
+    enum Type
+    {
+        EMPTY = 0,
+        LEFT,
+        RIGHT,
+        MIDDLE
+    };
+}
+
+#endif  // EVENTS_MOUSEBUTTON_H
diff --git a/src/events/mouseevent.h b/src/events/mouseevent.h
index 213582f47..80267e776 100644
--- a/src/events/mouseevent.h
+++ b/src/events/mouseevent.h
@@ -66,6 +66,7 @@
 
 #include "events/inputguievent.h"
 
+#include "events/mousebutton.h"
 #include "events/mouseeventtype.h"
 
 class Widget;
@@ -91,8 +92,8 @@ class MouseEvent: public InputGuiEvent
           *                   It's set to zero if another button is used.
           */
         MouseEvent(Widget *const source,
-                   MouseEventType::Type type,
-                   const unsigned int button,
+                   const MouseEventType::Type type,
+                   const MouseButton::Type button,
                    const int x,
                    const int y,
                    const int clickCount) :
@@ -110,7 +111,7 @@ class MouseEvent: public InputGuiEvent
           *
           * @return The button of the mouse event.
           */
-        unsigned int getButton() const A_WARN_UNUSED
+        MouseButton::Type getButton() const A_WARN_UNUSED
         { return mButton; }
 
         /**
@@ -158,17 +159,6 @@ class MouseEvent: public InputGuiEvent
         void setY(int n)
         { mY = n; }
 
-        /**
-          * Mouse button types.
-          */
-        enum
-        {
-            EMPTY = 0,
-            LEFT,
-            RIGHT,
-            MIDDLE
-        };
-
     protected:
         /**
           * Holds the type of the mouse event.
@@ -178,7 +168,7 @@ class MouseEvent: public InputGuiEvent
         /**
           * Holds the button of the mouse event.
           */
-        unsigned int mButton;
+        MouseButton::Type mButton;
 
         /**
           * Holds the x-coordinate of the mouse event.