Refactor: Renamed castTo<> to as<> in Info and Event

If C# has taught me anything it is that "as" is quite an intuitive keyword for casting.
skyjake · May 31, 2013 · c2eb94f · c2eb94f
1 parent 51c74f5
commit c2eb94f
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 24 deletions.
diff --git a/doomsday/client/include/map/mapelement.h b/doomsday/client/include/map/mapelement.h
@@ -84,6 +84,7 @@ class MapElement
 
     void setIndexInMap(int newIndex = NoIndex);
 
+    /// @todo Rename to as().
     template <typename Type>
     inline Type *castTo()
     {
@@ -92,6 +93,7 @@ class MapElement
         return t;
     }
 
+    /// @todo Rename to as().
     template <typename Type>
     inline Type const *castTo() const
     {

diff --git a/doomsday/client/src/ui/dd_input.cpp b/doomsday/client/src/ui/dd_input.cpp
@@ -983,7 +983,7 @@ void DD_ConvertEvent(de::Event const &event, ddevent_t *ddEvent)
     case de::Event::KeyPress:
     case de::Event::KeyRelease:
     {
-        KeyEvent const &kev = static_cast<KeyEvent const &>(event);
+        KeyEvent const &kev = event.as<KeyEvent>();
 
         ddEvent->device       = IDEV_KEYBOARD;
         ddEvent->type         = E_TOGGLE;

diff --git a/doomsday/client/src/ui/widgets/consolecommandwidget.cpp b/doomsday/client/src/ui/widgets/consolecommandwidget.cpp
@@ -70,7 +70,7 @@ bool ConsoleCommandWidget::handleEvent(Event const &event)
 {
     if(!event.isKeyDown()) return false;
 
-    KeyEvent const &key = static_cast<KeyEvent const &>(event);
+    KeyEvent const &key = event.as<KeyEvent>();
 
     // Override the handling of the Enter key.
     if(key.qtKey() == Qt::Key_Return || key.qtKey() == Qt::Key_Enter)

diff --git a/doomsday/client/src/ui/widgets/consolewidget.cpp b/doomsday/client/src/ui/widgets/consolewidget.cpp
@@ -131,7 +131,7 @@ bool ConsoleWidget::handleEvent(Event const &event)
 {
     if(event.type() == Event::KeyPress)
     {
-        KeyEvent const &key = static_cast<KeyEvent const &>(event);
+        KeyEvent const &key = event.as<KeyEvent>();
 
         if(key.qtKey() == Qt::Key_PageUp ||
            key.qtKey() == Qt::Key_PageDown)

diff --git a/doomsday/client/src/ui/widgets/legacywidget.cpp b/doomsday/client/src/ui/widgets/legacywidget.cpp
@@ -201,7 +201,7 @@ bool LegacyWidget::handleEvent(Event const &event)
     if(event.type() == Event::KeyPress ||
        event.type() == Event::KeyRelease)
     {
-        KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+        KeyEvent const &ev = event.as<KeyEvent>();
         Keyboard_Submit(ev.state() == KeyEvent::Pressed? IKE_DOWN : IKE_UP,
                         ev.ddKey(), ev.nativeCode(), ev.text().toLatin1());
     }

diff --git a/doomsday/client/src/ui/widgets/lineeditwidget.cpp b/doomsday/client/src/ui/widgets/lineeditwidget.cpp
@@ -260,7 +260,7 @@ bool LineEditWidget::handleEvent(Event const &event)
 {
     if(event.isKeyDown())
     {
-        KeyEvent const &key = static_cast<KeyEvent const &>(event);
+        KeyEvent const &key = event.as<KeyEvent>();
 
         // Control character.
         if(handleControlKey(key.qtKey(), key.modifiers().testFlag(KeyEvent::Control)))

diff --git a/doomsday/client/src/ui/widgets/logwidget.cpp b/doomsday/client/src/ui/widgets/logwidget.cpp
@@ -867,7 +867,7 @@ bool LogWidget::handleEvent(Event const &event)
 {
     if(!event.isKeyDown()) return false;
 
-    KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+    KeyEvent const &ev = event.as<KeyEvent>();
 
     int pageSize = scrollPageSize();
 

diff --git a/doomsday/libdeng2/include/de/core/event.h b/doomsday/libdeng2/include/de/core/event.h
@@ -50,6 +50,18 @@ class DENG2_PUBLIC Event
 
     bool isKeyDown() const { return _type == KeyPress || _type == KeyRepeat; }
 
+    template <typename Type>
+    Type &as() {
+        DENG2_ASSERT(dynamic_cast<Type *>(this) != 0);
+        return *static_cast<Type *>(this);
+    }
+
+    template <typename Type>
+    Type const &as() const {
+        DENG2_ASSERT(dynamic_cast<Type const *>(this) != 0);
+        return *static_cast<Type const *>(this);
+    }
+
 private:
     int _type;
 };

diff --git a/doomsday/libdeng2/include/de/data/info.h b/doomsday/libdeng2/include/de/data/info.h
@@ -95,14 +95,14 @@ class Info
         String const &name() const { return _name; }
 
         template <typename T>
-        T &castTo() {
+        T &as() {
             T *t = dynamic_cast<T *>(this);
             DENG2_ASSERT(t != 0);
             return *t;
         }
 
         template <typename T>
-        T const &castTo() const {
+        T const &as() const {
             T const *t = dynamic_cast<T const *>(this);
             DENG2_ASSERT(t != 0);
             return *t;

diff --git a/doomsday/libdeng2/src/data/info.cpp b/doomsday/libdeng2/src/data/info.cpp
@@ -586,7 +586,7 @@ void Info::BlockElement::add(Info::Element *elem)
     if(elem->name() && _contents.contains(elem->name()))
     {
         if(!elem->isBlock() || !info().d->allowDuplicateBlocksOfType.contains(
-                    elem->castTo<BlockElement>().blockType()))
+                    elem->as<BlockElement>().blockType()))
         {
             LOG_AS("Info::BlockElement");
             LOG_WARNING("Block '%s' already has an element named '%s'")
@@ -614,7 +614,7 @@ Info::Element::Value Info::BlockElement::keyValue(String const &name) const
 {
     Element *e = find(name);
     if(!e || !e->isKey()) return Value();
-    return e->castTo<KeyElement>().value();
+    return e->as<KeyElement>().value();
 }
 
 Info::Element *Info::BlockElement::findByPath(String const &path) const
@@ -640,7 +640,7 @@ Info::Element *Info::BlockElement::findByPath(String const &path) const
     if(e->isBlock())
     {
         // Descend into sub-blocks.
-        return e->castTo<BlockElement>().findByPath(remainder);
+        return e->as<BlockElement>().findByPath(remainder);
     }
     return e;
 }
@@ -700,7 +700,7 @@ bool Info::findValueForKey(String const &key, String &value) const
     Element const *element = findByPath(key);
     if(element && element->isKey())
     {
-        value = element->castTo<KeyElement>().value();
+        value = element->as<KeyElement>().value();
         return true;
     }
     return false;

diff --git a/doomsday/libdeng2/src/scriptsys/scriptedinfo.cpp b/doomsday/libdeng2/src/scriptsys/scriptedinfo.cpp
@@ -70,15 +70,15 @@ DENG2_PIMPL(ScriptedInfo)
     {
         if(element->isBlock())
         {
-            processBlock(element->castTo<Info::BlockElement>());
+            processBlock(element->as<Info::BlockElement>());
         }
         else if(element->isKey())
         {
-            processKey(element->castTo<Info::KeyElement>());
+            processKey(element->as<Info::KeyElement>());
         }
         else if(element->isList())
         {
-            processList(element->castTo<Info::ListElement>());
+            processList(element->as<Info::ListElement>());
         }
     }
 

diff --git a/doomsday/libshell/src/choicewidget.cpp b/doomsday/libshell/src/choicewidget.cpp
@@ -141,7 +141,7 @@ bool ChoiceWidget::handleEvent(Event const &ev)
 {
     if(ev.type() == Event::KeyPress)
     {
-        KeyEvent const &event = static_cast<KeyEvent const &>(ev);
+        KeyEvent const &event = ev.as<KeyEvent>();
         if(!event.text().isEmpty() || event.key() == Qt::Key_Enter)
         {
             DENG2_ASSERT(!isOpen());

diff --git a/doomsday/libshell/src/commandlinewidget.cpp b/doomsday/libshell/src/commandlinewidget.cpp
@@ -42,7 +42,7 @@ bool CommandLineWidget::handleEvent(Event const &event)
 {
     // There are only key press events.
     DENG2_ASSERT(event.type() == Event::KeyPress);
-    KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+    KeyEvent const &ev = event.as<KeyEvent>();
 
     // Override the editor's normal Enter handling.
     if(ev.key() == Qt::Key_Enter)

diff --git a/doomsday/libshell/src/dialogwidget.cpp b/doomsday/libshell/src/dialogwidget.cpp
@@ -84,7 +84,7 @@ bool DialogWidget::handleEvent(Event const &event)
 {
     if(event.type() == Event::KeyPress)
     {
-        KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+        KeyEvent const &ev = event.as<KeyEvent>();
         if(ev.key() == Qt::Key_Escape)
         {
             reject();

diff --git a/doomsday/libshell/src/lineeditwidget.cpp b/doomsday/libshell/src/lineeditwidget.cpp
@@ -110,7 +110,7 @@ bool LineEditWidget::handleEvent(Event const &event)
 {
     // There are only key press events.
     DENG2_ASSERT(event.type() == Event::KeyPress);
-    KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+    KeyEvent const &ev = event.as<KeyEvent>();
 
     bool eaten = true;
 

diff --git a/doomsday/libshell/src/logwidget.cpp b/doomsday/libshell/src/logwidget.cpp
@@ -264,7 +264,7 @@ bool LogWidget::handleEvent(Event const &event)
 {
     if(event.type() != Event::KeyPress) return false;
 
-    KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+    KeyEvent const &ev = event.as<KeyEvent>();
 
     int pageSize = scrollPageSize();
 

diff --git a/doomsday/libshell/src/menuwidget.cpp b/doomsday/libshell/src/menuwidget.cpp
@@ -352,7 +352,7 @@ bool MenuWidget::handleEvent(Event const &event)
 
     if(event.type() != Event::KeyPress) return false;
 
-    KeyEvent const &ev = static_cast<KeyEvent const &>(event);
+    KeyEvent const &ev = event.as<KeyEvent>();
 
     // Check menu-related control keys.
     if(ev.text().isEmpty())

diff --git a/doomsday/libshell/src/textwidget.cpp b/doomsday/libshell/src/textwidget.cpp
@@ -134,9 +134,7 @@ bool TextWidget::handleEvent(Event const &event)
     // We only support KeyEvents.
     if(event.type() == Event::KeyPress)
     {
-        DENG2_ASSERT(dynamic_cast<KeyEvent const *>(&event) != 0);
-
-        KeyEvent const &keyEvent = static_cast<KeyEvent const &>(event);
+        KeyEvent const &keyEvent = event.as<KeyEvent>();
 
         foreach(Action *act, d->actions)
         {