diff options
Diffstat (limited to 'src/events')
| -rw-r--r-- | src/events/actionevent.h | 7 | ||||
| -rw-r--r-- | src/events/event.h | 11 | ||||
| -rw-r--r-- | src/events/inputguievent.h | 2 | ||||
| -rw-r--r-- | src/events/keyevent.h | 7 | ||||
| -rw-r--r-- | src/events/mouseevent.h | 5 | ||||
| -rw-r--r-- | src/events/selectionevent.h | 7 |
6 files changed, 14 insertions, 25 deletions
diff --git a/src/events/actionevent.h b/src/events/actionevent.h index 3164955e6..25f936cdd 100644 --- a/src/events/actionevent.h +++ b/src/events/actionevent.h @@ -70,10 +70,7 @@ #include "localconsts.h" -namespace GCN -{ - class Widget; -} +class Widget; /** * Represents an action event. An action event is an event @@ -106,7 +103,7 @@ class ActionEvent final : public Event * @param source The source widget of the event. * @param id An identifier of the event. */ - ActionEvent(gcn::Widget *const source, const std::string &id) : + ActionEvent(Widget *const source, const std::string &id) : Event(source), mId(id) { diff --git a/src/events/event.h b/src/events/event.h index b71d0edd4..63ccb207d 100644 --- a/src/events/event.h +++ b/src/events/event.h @@ -66,10 +66,7 @@ #include "localconsts.h" -namespace gcn -{ - class Widget; -} +class Widget; /** * Base class for all events. All events in Guichan should @@ -86,7 +83,7 @@ class Event * * @param source The source widget of the event. */ - explicit Event(gcn::Widget *const source) : + explicit Event(Widget *const source) : mSource(source) { } @@ -104,14 +101,14 @@ class Event * * @return The source widget of the event. */ - gcn::Widget* getSource() const A_WARN_UNUSED + Widget* getSource() const A_WARN_UNUSED { return mSource; } protected: /** * Holds the source widget of the event. */ - gcn::Widget* mSource; + Widget* mSource; }; #endif // EVENTS_EVENT_H diff --git a/src/events/inputguievent.h b/src/events/inputguievent.h index 8523959ed..2e5136ea2 100644 --- a/src/events/inputguievent.h +++ b/src/events/inputguievent.h @@ -84,7 +84,7 @@ class InputGuiEvent: public Event * @param isAltPressed True if alt is pressed, false otherwise. * @param isMetaPressed True if meta is pressed, false otherwise. */ - InputGuiEvent(gcn::Widget *const source, + InputGuiEvent(Widget *const source, const bool shiftPressed, const bool controlPressed, const bool altPressed, diff --git a/src/events/keyevent.h b/src/events/keyevent.h index 6ca3d87d8..360d229d7 100644 --- a/src/events/keyevent.h +++ b/src/events/keyevent.h @@ -69,10 +69,7 @@ #include <string> -namespace gcn -{ - class Widget; -} +class Widget; /** * Represents a key event. @@ -102,7 +99,7 @@ class KeyEvent: public InputGuiEvent * false otherwise. * @param key The key of the event. */ - KeyEvent(gcn::Widget *const source, + KeyEvent(Widget *const source, const bool shiftPressed, const bool controlPressed, const bool altPressed, diff --git a/src/events/mouseevent.h b/src/events/mouseevent.h index fc8088341..a717980f9 100644 --- a/src/events/mouseevent.h +++ b/src/events/mouseevent.h @@ -69,9 +69,10 @@ namespace gcn { class Gui; - class Widget; } +class Widget; + /** * Represents a mouse event. * @@ -96,7 +97,7 @@ class MouseEvent: public InputGuiEvent * @param clickCount The number of clicks generated with the same button. * It's set to zero if another button is used. */ - MouseEvent(gcn::Widget *const source, + MouseEvent(Widget *const source, const bool shiftPressed, const bool controlPressed, const bool altPressed, diff --git a/src/events/selectionevent.h b/src/events/selectionevent.h index b2e91e04f..927b66f77 100644 --- a/src/events/selectionevent.h +++ b/src/events/selectionevent.h @@ -68,10 +68,7 @@ #include "localconsts.h" -namespace gcn -{ - class Widget; -} +class Widget; /** * Represents a selection event. @@ -87,7 +84,7 @@ class SelectionEvent final: public Event * * @param source source The widget of the selection event. */ - explicit SelectionEvent(gcn::Widget *const source) : + explicit SelectionEvent(Widget *const source) : Event(source) { } |