From 3ae82048ca8636ce03e71bdd4c11f60594cfc698 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 16 Feb 2014 12:47:15 +0300
Subject: move event into events directory.

---
 src/gui/widgets/button.cpp                 | 4 ++--
 src/gui/widgets/button.h                   | 4 ++--
 src/gui/widgets/characterdisplay.cpp       | 2 +-
 src/gui/widgets/characterdisplay.h         | 2 +-
 src/gui/widgets/desktop.cpp                | 2 +-
 src/gui/widgets/desktop.h                  | 2 +-
 src/gui/widgets/dropshortcutcontainer.cpp  | 2 +-
 src/gui/widgets/dropshortcutcontainer.h    | 2 +-
 src/gui/widgets/emotepage.cpp              | 4 ++--
 src/gui/widgets/emotepage.h                | 4 ++--
 src/gui/widgets/emoteshortcutcontainer.cpp | 2 +-
 src/gui/widgets/emoteshortcutcontainer.h   | 2 +-
 src/gui/widgets/flowcontainer.cpp          | 4 ++--
 src/gui/widgets/flowcontainer.h            | 2 +-
 src/gui/widgets/horizontcontainer.cpp      | 2 +-
 src/gui/widgets/horizontcontainer.h        | 2 +-
 src/gui/widgets/itemcontainer.cpp          | 2 +-
 src/gui/widgets/itemcontainer.h            | 2 +-
 src/gui/widgets/itemshortcutcontainer.cpp  | 2 +-
 src/gui/widgets/itemshortcutcontainer.h    | 2 +-
 src/gui/widgets/layouthelper.cpp           | 2 +-
 src/gui/widgets/layouthelper.h             | 2 +-
 src/gui/widgets/popup.cpp                  | 4 ++--
 src/gui/widgets/popup.h                    | 4 ++--
 src/gui/widgets/popuplist.cpp              | 6 +++---
 src/gui/widgets/popuplist.h                | 6 +++---
 src/gui/widgets/progressbar.cpp            | 4 ++--
 src/gui/widgets/progressbar.h              | 4 ++--
 src/gui/widgets/scrollarea.cpp             | 4 ++--
 src/gui/widgets/scrollarea.h               | 4 ++--
 src/gui/widgets/shortcutcontainer.cpp      | 4 ++--
 src/gui/widgets/shortcutcontainer.h        | 4 ++--
 src/gui/widgets/spellshortcutcontainer.cpp | 2 +-
 src/gui/widgets/spellshortcutcontainer.h   | 2 +-
 src/gui/widgets/tabbedarea.cpp             | 8 ++++----
 src/gui/widgets/tabbedarea.h               | 4 ++--
 src/gui/widgets/tabs/setuptabscroll.cpp    | 2 +-
 src/gui/widgets/tabs/setuptabscroll.h      | 2 +-
 src/gui/widgets/tabs/tab.cpp               | 4 ++--
 src/gui/widgets/tabs/tab.h                 | 4 ++--
 src/gui/widgets/textfield.cpp              | 4 ++--
 src/gui/widgets/textfield.h                | 4 ++--
 src/gui/widgets/vertcontainer.cpp          | 2 +-
 src/gui/widgets/vertcontainer.h            | 2 +-
 src/gui/widgets/widgetgroup.cpp            | 2 +-
 src/gui/widgets/widgetgroup.h              | 2 +-
 src/gui/widgets/window.cpp                 | 8 ++++----
 src/gui/widgets/window.h                   | 6 +++---
 48 files changed, 78 insertions(+), 78 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index ee984a18a..5478d8164 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -546,12 +546,12 @@ void Button::mouseReleased(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void Button::widgetResized(const gcn::Event &event A_UNUSED)
+void Button::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Button::widgetMoved(const gcn::Event &event A_UNUSED)
+void Button::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 8f79755a8..7fd7e4a9a 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -132,9 +132,9 @@ class Button final : public gcn::Button,
         void setPressed(bool b)
         { mPressed = b; }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         void loadImage(const std::string &imageName);
 
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 21de10412..3f4a672f0 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -110,7 +110,7 @@ void CharacterDisplay::update()
     distributeResizedEvent();
 }
 
-void CharacterDisplay::widgetHidden(const gcn::Event &event A_UNUSED)
+void CharacterDisplay::widgetHidden(const Event &event A_UNUSED)
 {
     mPopup->setVisible(false);
 }
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index 940dbe5c6..84a288ab0 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -73,7 +73,7 @@ class CharacterDisplay final : public Container,
         void setSelect(bool b)
         { mPlayerBox->setSelected(b); }
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         void mouseExited(gcn::MouseEvent &event) override final;
 
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 5874ee441..8e0496fea 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -98,7 +98,7 @@ void Desktop::reloadWallpaper()
     setBestFittingWallpaper();
 }
 
-void Desktop::widgetResized(const gcn::Event &event A_UNUSED)
+void Desktop::widgetResized(const Event &event A_UNUSED)
 {
     setBestFittingWallpaper();
 }
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 9e49ceb59..ad07b0ff8 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -60,7 +60,7 @@ class Desktop final : public Container,
          */
         void reloadWallpaper();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void draw(Graphics *graphics) override final;
 
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 9b37682fe..4b991bc34 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -308,7 +308,7 @@ void DropShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
         mItemPopup->setVisible(false);
 }
 
-void DropShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void DropShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 6b7a9f151..26cbdffa7 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -67,7 +67,7 @@ class DropShortcutContainer final : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         void mouseExited(gcn::MouseEvent &event) override final;
 
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 091d699a7..e255afc30 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -139,12 +139,12 @@ void EmotePage::resetAction()
     mSelectedIndex = -1;
 }
 
-void EmotePage::widgetResized(const gcn::Event &event A_UNUSED)
+void EmotePage::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void EmotePage::widgetMoved(const gcn::Event &event A_UNUSED)
+void EmotePage::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index afc950f79..cb6fd8711 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -48,9 +48,9 @@ class EmotePage final : public gcn::Widget,
 
         int getIndexFromGrid(const int x, const int y) const;
 
-        void widgetResized(const gcn::Event &event A_UNUSED) override final;
+        void widgetResized(const Event &event A_UNUSED) override final;
 
-        void widgetMoved(const gcn::Event &event A_UNUSED) override final;
+        void widgetMoved(const Event &event A_UNUSED) override final;
 
         void resetAction();
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index dc25d9e5c..d00f01495 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -232,7 +232,7 @@ void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
         mEmotePopup->setVisible(false);
 }
 
-void EmoteShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void EmoteShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mEmotePopup)
         mEmotePopup->setVisible(false);
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 62999207e..37ebe0cf9 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -74,7 +74,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
 
         void mouseExited(gcn::MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         void setWidget2(const Widget2 *const widget) override final;
 
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index bfcd704d3..1c5961140 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -39,7 +39,7 @@ FlowContainer::FlowContainer(const Widget2 *const widget,
         mBoxHeight = 1;
 }
 
-void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void FlowContainer::widgetResized(const Event &event A_UNUSED)
 {
     if (getWidth() < mBoxWidth)
     {
@@ -92,5 +92,5 @@ void FlowContainer::add(gcn::Widget *widget)
 
     Container::add(widget);
     widget->setSize(mBoxWidth, mBoxHeight);
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index e2773d34c..a425e8465 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -55,7 +55,7 @@ class FlowContainer final : public Container,
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         int getBoxWidth() const A_WARN_UNUSED
         { return mBoxWidth; }
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index 77dff3232..b2fddfcae 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -58,6 +58,6 @@ void HorizontContainer::clear()
     mCount = 0;
 }
 
-void HorizontContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void HorizontContainer::widgetResized(const Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index eb1f8c5aa..4f652df64 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -48,7 +48,7 @@ class HorizontContainer final : public Container,
 
         void clear() override;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     protected:
         int mSpacing;
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 84934911c..2c9e9b731 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -618,7 +618,7 @@ void ItemContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
     mItemPopup->setVisible(false);
 }
 
-void ItemContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void ItemContainer::widgetResized(const Event &event A_UNUSED)
 {
     mGridColumns = std::max(1, mDimension.width / mBoxWidth);
     adjustHeight();
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 3d98d425b..ecb7b658e 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -96,7 +96,7 @@ class ItemContainer final : public gcn::Widget,
         void mouseExited(gcn::MouseEvent &event) override final;
 
         // WidgetListener
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         /**
          * Returns the selected item.
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 2438050d9..ef4d8ebfa 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -467,7 +467,7 @@ void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
         mSpellPopup->setVisible(false);
 }
 
-void ItemShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void ItemShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index c2dbe93a3..5efda0433 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -68,7 +68,7 @@ class ItemShortcutContainer final : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         void mouseExited(gcn::MouseEvent &event) override final;
 
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 460810adf..066cabaf8 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -61,7 +61,7 @@ void LayoutHelper::reflowLayout(int w, int h)
     mContainer->setSize(w, h);
 }
 
-void LayoutHelper::widgetResized(const gcn::Event &event A_UNUSED)
+void LayoutHelper::widgetResized(const Event &event A_UNUSED)
 {
     const gcn::Rectangle area = mContainer->getChildrenArea();
     int w = area.width;
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index bdd923560..d5a94e656 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -78,7 +78,7 @@ class LayoutHelper final : public WidgetListener
         /**
          * Called whenever the managed container changes size.
          */
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     private:
         Layout mLayout;              /**< Layout handler */
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 9d34beaa7..7036968ad 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -244,12 +244,12 @@ void Popup::hide()
     mRedraw = true;
 }
 
-void Popup::widgetResized(const gcn::Event &event A_UNUSED)
+void Popup::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Popup::widgetMoved(const gcn::Event &event A_UNUSED)
+void Popup::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 25998e21d..e467783ef 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -164,9 +164,9 @@ class Popup : public Container,
 
         void hide();
 
-        void widgetResized(const gcn::Event &event) override;
+        void widgetResized(const Event &event) override;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         bool isPopupVisible() const
         { return mVisible; }
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index b8e4dabb4..37dd6b1ec 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -90,7 +90,7 @@ void PopupList::show(int x, int y)
         requestModalFocus();
 }
 
-void PopupList::widgetResized(const gcn::Event &event)
+void PopupList::widgetResized(const Event &event)
 {
     Popup::widgetResized(event);
     adjustSize();
@@ -154,7 +154,7 @@ void PopupList::mouseReleased(gcn::MouseEvent& mouseEvent)
         releaseModalFocus();
 }
 
-void PopupList::focusGained(const gcn::Event& event)
+void PopupList::focusGained(const Event& event)
 {
     const gcn::Widget *const source = event.getSource();
     if (!mVisible || source == this || source == mListBox
@@ -170,7 +170,7 @@ void PopupList::focusGained(const gcn::Event& event)
         releaseModalFocus();
 }
 
-void PopupList::focusLost(const gcn::Event& event A_UNUSED)
+void PopupList::focusLost(const Event& event A_UNUSED)
 {
     if (mDropDown)
         mDropDown->updateSelection();
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index 454b5617c..31308fff8 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -49,7 +49,7 @@ class PopupList final : public Popup,
 
         void show(int x, int y);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void setSelected(int selected);
 
@@ -62,9 +62,9 @@ class PopupList final : public Popup,
 
         void adjustSize();
 
-        void focusGained(const gcn::Event& event A_UNUSED) override final;
+        void focusGained(const Event& event A_UNUSED) override final;
 
-        void focusLost(const gcn::Event& event A_UNUSED) override final;
+        void focusLost(const Event& event A_UNUSED) override final;
 
         void mousePressed(gcn::MouseEvent& mouseEvent) override final;
 
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 415962310..b120e4289 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -283,12 +283,12 @@ void ProgressBar::render(Graphics *graphics)
     }
 }
 
-void ProgressBar::widgetResized(const gcn::Event &event A_UNUSED)
+void ProgressBar::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void ProgressBar::widgetMoved(const gcn::Event &event A_UNUSED)
+void ProgressBar::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 2835a7ffc..86e314e16 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -132,9 +132,9 @@ class ProgressBar final : public gcn::Widget,
          */
         void render(Graphics *graphics);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         void setPadding(unsigned int padding)
         { mPadding = padding; }
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index e9e850b1c..73ff82be0 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -667,7 +667,7 @@ void ScrollArea::mouseExited(gcn::MouseEvent& event A_UNUSED)
     mHasMouse = false;
 }
 
-void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
+void ScrollArea::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
     const unsigned int frameSize = 2 * mFrameSize;
@@ -679,7 +679,7 @@ void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
     }
 }
 
-void ScrollArea::widgetMoved(const gcn::Event& event A_UNUSED)
+void ScrollArea::widgetMoved(const Event& event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 69f567b02..7bf7e811c 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -124,9 +124,9 @@ class ScrollArea final : public gcn::ScrollArea,
 
         void mouseDragged(gcn::MouseEvent &event) override final;
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         gcn::Rectangle getVerticalBarDimension() const;
 
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 8b3507b8e..767a32974 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -53,7 +53,7 @@ ShortcutContainer::~ShortcutContainer()
     mVertexes = nullptr;
 }
 
-void ShortcutContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void ShortcutContainer::widgetResized(const Event &event A_UNUSED)
 {
     mGridWidth = mDimension.width / mBoxWidth;
 
@@ -116,7 +116,7 @@ void ShortcutContainer::drawBackground(Graphics *g)
     }
 }
 
-void ShortcutContainer::widgetMoved(const gcn::Event& event A_UNUSED)
+void ShortcutContainer::widgetMoved(const Event& event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 1db3e0482..2c237f513 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -59,9 +59,9 @@ class ShortcutContainer : public gcn::Widget,
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
-        virtual void widgetResized(const gcn::Event &event) override final;
+        virtual void widgetResized(const Event &event) override final;
 
-        virtual void widgetMoved(const gcn::Event& event) override final;
+        virtual void widgetMoved(const Event& event) override final;
 
         /**
          * Handles mouse when dragged.
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 696b0fbb4..ee76ee5dd 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -314,7 +314,7 @@ void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
         mSpellPopup->setVisible(false);
 }
 
-void SpellShortcutContainer::widgetHidden(const gcn::Event &event A_UNUSED)
+void SpellShortcutContainer::widgetHidden(const Event &event A_UNUSED)
 {
     if (mSpellPopup)
         mSpellPopup->setVisible(false);
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 3115e47fe..b5968dfe5 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -67,7 +67,7 @@ class SpellShortcutContainer final : public ShortcutContainer
          */
         void mouseReleased(gcn::MouseEvent &event) override final;
 
-        void widgetHidden(const gcn::Event &event) override final;
+        void widgetHidden(const Event &event) override final;
 
         void mouseExited(gcn::MouseEvent &event) override final;
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 500e821f5..2fe4f1332 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -72,7 +72,7 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
 
 void TabbedArea::postInit()
 {
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
 
 TabbedArea::~TabbedArea()
@@ -365,7 +365,7 @@ void TabbedArea::setSelectedTab(Tab *const tab)
     if (newTab)
         newTab->setCurrent();
 
-    widgetResized(gcn::Event(nullptr));
+    widgetResized(Event(nullptr));
 }
 
 int TabbedArea::getSelectedTabIndex() const
@@ -392,7 +392,7 @@ void TabbedArea::setSelectedTabByName(const std::string &name)
     }
 }
 
-void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED)
+void TabbedArea::widgetResized(const Event &event A_UNUSED)
 {
     adjustSize();
 
@@ -716,7 +716,7 @@ void TabbedArea::keyPressed(gcn::KeyEvent& keyEvent)
     }
 }
 
-void TabbedArea::death(const gcn::Event &event)
+void TabbedArea::death(const Event &event)
 {
     Tab *const tab = dynamic_cast<Tab*>(event.getSource());
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index ec4c02ce5..d517c9a51 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -142,7 +142,7 @@ class TabbedArea final : public Widget2,
 
         void setSelectedTabByName(const std::string &name);
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
 /*
         void moveLeft(Tab *tab);
@@ -184,7 +184,7 @@ class TabbedArea final : public Widget2,
 
         void setDimension(const gcn::Rectangle &dimension);
 
-        void death(const gcn::Event &event);
+        void death(const Event &event);
 
         void setResizeHeight(bool b)
         { mResizeHeight = b; }
diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp
index 659ef5824..9a37ced42 100644
--- a/src/gui/widgets/tabs/setuptabscroll.cpp
+++ b/src/gui/widgets/tabs/setuptabscroll.cpp
@@ -146,7 +146,7 @@ void SetupTabScroll::externalUnloaded()
     }
 }
 
-void SetupTabScroll::widgetResized(const gcn::Event &event A_UNUSED)
+void SetupTabScroll::widgetResized(const Event &event A_UNUSED)
 {
     mScroll->setWidth(getWidth() - 12);
     mScroll->setHeight(getHeight() - 12 - 12);
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 779826e5a..f7aa628c9 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -63,7 +63,7 @@ class SetupTabScroll : public SetupTab
         int getPreferredFirstItemSize() const A_WARN_UNUSED
         { return mPreferredFirstItemSize; }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         void reread(const std::string &name);
 
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 398802eb0..db5ddf6b4 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -254,12 +254,12 @@ void Tab::draw(Graphics *graphics)
     BLOCK_END("Tab::draw")
 }
 
-void Tab::widgetResized(const gcn::Event &event A_UNUSED)
+void Tab::widgetResized(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Tab::widgetMoved(const gcn::Event &event A_UNUSED)
+void Tab::widgetMoved(const Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index ac10b7dc7..e979c71b8 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -130,9 +130,9 @@ class Tab : public gcn::BasicContainer,
         int getFlash() const A_WARN_UNUSED
         { return mFlash; }
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
-        void widgetMoved(const gcn::Event &event) override final;
+        void widgetMoved(const Event &event) override final;
 
         void setLabelFont(gcn::Font *const font);
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 22e9d42dd..58facecb8 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -760,7 +760,7 @@ void TextField::mousePressed(gcn::MouseEvent &mouseEvent)
     }
 }
 
-void TextField::focusGained(const gcn::Event &event A_UNUSED)
+void TextField::focusGained(const Event &event A_UNUSED)
 {
 #ifdef ANDROID
     if (!client->isKeyboardVisible())
@@ -768,6 +768,6 @@ void TextField::focusGained(const gcn::Event &event A_UNUSED)
 #endif
 }
 
-void TextField::focusLost(const gcn::Event &event A_UNUSED)
+void TextField::focusLost(const Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 4545e9ff9..42f76985c 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -124,9 +124,9 @@ class TextField : public gcn::TextField,
 
         void handleCopy() const;
 
-        void focusGained(const gcn::Event &event) override final;
+        void focusGained(const Event &event) override final;
 
-        void focusLost(const gcn::Event &event) override;
+        void focusLost(const Event &event) override;
 
         void moveCaretBack();
 
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index ed3d00219..e38ebb9af 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -79,7 +79,7 @@ void VertContainer::clear()
     mResizableWidgets.clear();
 }
 
-void VertContainer::widgetResized(const gcn::Event &event A_UNUSED)
+void VertContainer::widgetResized(const Event &event A_UNUSED)
 {
     FOR_EACH (std::vector<gcn::Widget*>::const_iterator, it, mResizableWidgets)
         (*it)->setWidth(getWidth());
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 34fcf3d45..1d396efc9 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -52,7 +52,7 @@ class VertContainer final : public Container,
 
         void clear();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
     private:
         std::vector<gcn::Widget*> mResizableWidgets;
diff --git a/src/gui/widgets/widgetgroup.cpp b/src/gui/widgets/widgetgroup.cpp
index 56da2d492..3957fab30 100644
--- a/src/gui/widgets/widgetgroup.cpp
+++ b/src/gui/widgets/widgetgroup.cpp
@@ -84,6 +84,6 @@ void WidgetGroup::clear()
     mCount = 0;
 }
 
-void WidgetGroup::widgetResized(const gcn::Event &event A_UNUSED)
+void WidgetGroup::widgetResized(const Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 835738a6f..b26d88d15 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -47,7 +47,7 @@ class WidgetGroup : public Container,
 
         virtual void clear();
 
-        void widgetResized(const gcn::Event &event) override final;
+        void widgetResized(const Event &event) override final;
 
         virtual Widget *createWidget(const std::string &name)
                                      const A_WARN_UNUSED = 0;
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 1fc439abf..54c18bd52 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -490,7 +490,7 @@ void Window::setResizable(const bool r)
     }
 }
 
-void Window::widgetResized(const gcn::Event &event A_UNUSED)
+void Window::widgetResized(const Event &event A_UNUSED)
 {
     const gcn::Rectangle area = getChildrenArea();
 
@@ -554,12 +554,12 @@ void Window::widgetResized(const gcn::Event &event A_UNUSED)
     mRedraw = true;
 }
 
-void Window::widgetMoved(const gcn::Event& event A_UNUSED)
+void Window::widgetMoved(const Event& event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Window::widgetHidden(const gcn::Event &event A_UNUSED)
+void Window::widgetHidden(const Event &event A_UNUSED)
 {
     if (gui)
         gui->setCursorType(Cursor::CURSOR_POINTER);
@@ -1085,7 +1085,7 @@ void Window::adjustSizeToScreen()
     if (mDimension.height > screenHeight)
         mDimension.height = screenHeight;
     if (oldWidth != mDimension.width || oldHeight != mDimension.height)
-        widgetResized(gcn::Event(this));
+        widgetResized(Event(this));
 }
 
 int Window::getResizeHandles(const gcn::MouseEvent &event)
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 5ff5abe2b..0c3b69880 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -114,14 +114,14 @@ class Window : public gcn::Window,
         /**
          * Called whenever the widget changes size.
          */
-        virtual void widgetResized(const gcn::Event &event) override;
+        virtual void widgetResized(const Event &event) override;
 
-        virtual void widgetMoved(const gcn::Event& event) override;
+        virtual void widgetMoved(const Event& event) override;
 
         /**
          * Called whenever the widget is hidden.
          */
-        virtual void widgetHidden(const gcn::Event &event) override;
+        virtual void widgetHidden(const Event &event) override;
 
         /**
          * Sets whether or not the window has a close button.
-- 
cgit v1.2.3-70-g09d2