Use Event::Info struct instead of typedef.

billyquith · Jun 23, 2016 · 4cad484 · 4cad484
1 parent baa1e15
commit 4cad484
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 20 deletions.
diff --git a/source/gwork/include/Gwork/ControlList.h b/source/gwork/include/Gwork/ControlList.h
@@ -24,8 +24,7 @@ namespace Gwk
         class Handler;
         struct Information;
         struct Packet;
-
-        typedef const Gwk::Event::Information& Info;
+        struct Info;
     }
 
     template <typename TYPE>

diff --git a/source/gwork/include/Gwork/Controls/Button.h b/source/gwork/include/Gwork/Controls/Button.h
@@ -76,7 +76,7 @@ namespace Gwk
 
             virtual void DoAction() override
             {
-                Event::Information info(this);
+                Event::Info info(this);
                 OnPress(info);
             }
 

diff --git a/source/gwork/include/Gwork/Controls/Property/BaseProperty.h b/source/gwork/include/Gwork/Controls/Property/BaseProperty.h
@@ -39,7 +39,7 @@ namespace Gwk
 
                 virtual void DoChanged()
                 {
-                    Event::Information info(this);
+                    Event::Info info(this);
                     info.String = GetPropertyValue();
                     onChange.Call(this, info);
                 }

diff --git a/source/gwork/include/Gwork/Events.h b/source/gwork/include/Gwork/Events.h
@@ -35,6 +35,7 @@ namespace Gwk
             :   Control(control)
             {}
 
+            // TODO - union? variant?
             Gwk::Controls::Base *Control;
             Gwk::String String;
             int Integer;
@@ -44,11 +45,11 @@ namespace Gwk
 
 
         /**
-         *  Passed to an event hook
+         *  Passed to an event listener.
          */
-        struct Information
+        struct Info
         {
-            Information(Gwk::Controls::Base* ctrl)
+            Info(Gwk::Controls::Base* ctrl)
             :   ControlCaller(nullptr)
             ,   Packet(nullptr)
             ,   Control(ctrl)
@@ -73,9 +74,6 @@ namespace Gwk
             int Integer;
         };
 
-
-        typedef const Gwk::Event::Information& Info;
-
         /**
          *  A class wanting to receive events must be derived from this.
          */

diff --git a/source/gwork/source/Controls/Button.cpp b/source/gwork/source/Controls/Button.cpp
@@ -59,7 +59,7 @@ void Button::OnMouseClickLeft(int /*x*/, int /*y*/, bool bDown)
     {
         if (IsHovered() && m_bDepressed)
         {
-            OnPress(Event::Information(this));
+            OnPress(Event::Info(this));
         }
 
         SetDepressed(false);
@@ -83,7 +83,7 @@ void Button::OnMouseClickRight(int /*x*/, int /*y*/, bool bDown)
     {
         if (IsHovered() && m_bDepressed)
         {
-            OnRightPress(Event::Information(this));
+            OnRightPress(Event::Info(this));
         }
 
         SetDepressed(false);
@@ -173,15 +173,15 @@ bool Button::OnKeySpace(bool bDown)
 {
     if (bDown)
     {
-        OnPress(Event::Information(this));
+        OnPress(Event::Info(this));
     }
 
     return true;
 }
 
 void Button::AcceleratePressed()
 {
-    OnPress(Event::Information(this));
+    OnPress(Event::Info(this));
 }
 
 void Button::UpdateColours()

diff --git a/source/gwork/source/Controls/Dragger.cpp b/source/gwork/source/Controls/Dragger.cpp
@@ -55,7 +55,7 @@ void Dragger::OnMouseMoved(int x, int y, int deltaX, int deltaY)
         m_target->MoveTo(p.x, p.y);
     }
 
-    Gwk::Event::Information info(this);
+    Gwk::Event::Info info(this);
     info.Point = Gwk::Point(deltaX, deltaY);
     onDragged.Call(this, info);
 }

diff --git a/source/gwork/source/Controls/PageControl.cpp b/source/gwork/source/Controls/PageControl.cpp
@@ -111,7 +111,7 @@ void PageControl::ShowPage(unsigned int i)
     }
 
     {
-        Event::Information info(this);
+        Event::Info info(this);
         info.Integer = i;
         info.Control = m_pages[i];
         onPageChanged.Call(this, info);

diff --git a/source/gwork/source/Controls/Properties.cpp b/source/gwork/source/Controls/Properties.cpp
@@ -176,7 +176,7 @@ void PropertyRow::SetProperty(Property::Base* prop)
 
 void PropertyRow::OnPropertyValueChanged(Event::Info info)
 {
-    Event::Information sinfo(info);
+    Event::Info sinfo(info);
     sinfo.String = GetProperty()->GetPropertyValue();
     onChange.Call(this, sinfo);
 }

diff --git a/source/gwork/source/Controls/TabControl.cpp b/source/gwork/source/Controls/TabControl.cpp
@@ -115,7 +115,7 @@ void TabControl::AddPage(TabButton* button)
     button->onPress.Add(this, &TabControl::OnTabPressed);
 
     if (!m_currentButton)
-        button->OnPress(Event::Information(this));
+        button->OnPress(Event::Info(this));
 
     onAddTab.Call(this);
     Invalidate();

diff --git a/source/gwork/source/Events.cpp b/source/gwork/source/Events.cpp
@@ -67,14 +67,14 @@ void Listener::CleanLinks()
 
 void Listener::Call(Controls::Base* pThis)
 {
-    Event::Information info(pThis);
+    Event::Info info(pThis);
     info.Control = pThis;
     Call(pThis, info);
 }
 
 void Listener::Call(Controls::Base* pThis, Event::Info information)
 {
-    Event::Information info(nullptr);
+    Event::Info info(nullptr);
     info = information;
     info.ControlCaller = pThis;
     std::list<HandlerInstance>::iterator iter;