a11y: remove unneeded dynamic casts

(bzr r4054.2.3)

9 files changed, 28 insertions, 41 deletions

diff --git a/plugins/unityshell/src/nux-area-accessible.cpp b/plugins/unityshell/src/nux-area-accessible.cpp
index 555ac8d4d..d3c456c2f 100644
--- a/plugins/unityshell/src/nux-area-accessible.cpp
+++ b/plugins/unityshell/src/nux-area-accessible.cpp
@@ -173,7 +173,7 @@ nux_area_accessible_initialize(AtkObject* accessible,
 accessible->role = ATK_ROLE_UNKNOWN;
 
 nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
- area = dynamic_cast<nux::Area*>(nux_object);
+ area = static_cast<nux::Area*>(nux_object);
 
 /* focus support based on Focusable, used on the Dash */
 area->key_nav_focus_change.connect(sigc::bind(sigc::ptr_fun(on_focus_changed_cb), accessible));
@@ -249,7 +249,7 @@ nux_area_accessible_ref_state_set(AtkObject* obj)
 if (nux_object == NULL) /* defunct */
 return state_set;
 
- area = dynamic_cast<nux::Area*>(nux_object);
+ area = static_cast<nux::Area*>(nux_object);
 
 if (area->IsSensitive())
 {
@@ -311,8 +311,7 @@ nux_area_accessible_get_extents(AtkComponent* component,
 if (nux_object == NULL) /* defunct */
 return;
 
- area = dynamic_cast<nux::Area*>(nux_object);
-
+ area = static_cast<nux::Area*>(nux_object);
 geometry = area->GetGeometry();
 
 *width = geometry.GetWidth();
@@ -348,8 +347,6 @@ nux_area_accessible_grab_focus(AtkComponent* component)
 if (nux_object == NULL) /* defunct */
 return FALSE;
 
- //area = dynamic_cast<nux::Area*>(nux_object);
-
 /* FIXME: SetFocused doesn't return if the force was successful or
 not, we suppose that this is the case like in cally and gail */
 
@@ -557,7 +554,7 @@ check_focus(NuxAreaAccessible* self)
 if (nux_object == NULL) /* defunct */
 return;
 
- area = dynamic_cast<nux::Area*>(nux_object);
+ area = static_cast<nux::Area*>(nux_object);
 
 if (nux::GetWindowCompositor().GetKeyFocusArea() == area)
 focus_in = TRUE;
diff --git a/plugins/unityshell/src/nux-layout-accessible.cpp b/plugins/unityshell/src/nux-layout-accessible.cpp
index 398254fd4..d4a3e3b4a 100644
--- a/plugins/unityshell/src/nux-layout-accessible.cpp
+++ b/plugins/unityshell/src/nux-layout-accessible.cpp
@@ -76,7 +76,7 @@ nux_layout_accessible_new(nux::Object* object)
 {
 AtkObject* accessible = NULL;
 
- g_return_val_if_fail(dynamic_cast<nux::Layout*>(object), NULL);
+ g_return_val_if_fail(static_cast<nux::Layout*>(object), NULL);
 
 accessible = ATK_OBJECT(g_object_new(NUX_TYPE_LAYOUT_ACCESSIBLE, NULL));
 
@@ -98,7 +98,7 @@ nux_layout_accessible_initialize(AtkObject* accessible,
 accessible->role = ATK_ROLE_PANEL;
 
 nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
- layout = dynamic_cast<nux::Layout*>(nux_object);
+ layout = static_cast<nux::Layout*>(nux_object);
 
 layout->ViewAdded.connect(sigc::bind(sigc::ptr_fun(on_view_changed_cb),
 accessible, TRUE));
@@ -120,7 +120,7 @@ nux_layout_accessible_get_n_children(AtkObject* obj)
 if (!nux_object) /* state is defunct */
 return 0;
 
- layout = dynamic_cast<nux::Layout*>(nux_object);
+ layout = static_cast<nux::Layout*>(nux_object);
 
 element_list = layout->GetChildren();
 
@@ -148,14 +148,14 @@ nux_layout_accessible_ref_child(AtkObject* obj,
 if (!nux_object) /* state is defunct */
 return 0;
 
- layout = dynamic_cast<nux::Layout*>(nux_object);
+ layout = static_cast<nux::Layout*>(nux_object);
 
 element_list = layout->GetChildren();
 
 it = element_list.begin();
 std::advance(it, i);
 
- child = dynamic_cast<nux::Object*>(*it);
+ child = static_cast<nux::Object*>(*it);
 child_accessible = unity_a11y_get_accessible(child);
 
 parent = atk_object_get_parent(child_accessible);
diff --git a/plugins/unityshell/src/nux-view-accessible.cpp b/plugins/unityshell/src/nux-view-accessible.cpp
index 25c4944e6..bc4eea568 100644
--- a/plugins/unityshell/src/nux-view-accessible.cpp
+++ b/plugins/unityshell/src/nux-view-accessible.cpp
@@ -134,7 +134,7 @@ nux_view_accessible_initialize(AtkObject* accessible,
 accessible->role = ATK_ROLE_UNKNOWN;
 
 nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
- view = dynamic_cast<nux::View*>(nux_object);
+ view = static_cast<nux::View*>(nux_object);
 
 view->LayoutAdded.connect(sigc::bind(sigc::ptr_fun(on_layout_changed_cb),
 accessible, TRUE));
@@ -187,8 +187,7 @@ nux_view_accessible_get_n_children(AtkObject* obj)
 if (nux_object == NULL) /* state is defunct */
 return 0;
 
- view = dynamic_cast<nux::View*>(nux_object);
-
+ view = static_cast<nux::View*>(nux_object);
 layout = view->GetLayout();
 
 if (layout == NULL)
@@ -216,8 +215,7 @@ nux_view_accessible_ref_child(AtkObject* obj,
 if (nux_object == NULL) /* state is defunct */
 return 0;
 
- view = dynamic_cast<nux::View*>(nux_object);
-
+ view = static_cast<nux::View*>(nux_object);
 layout = view->GetLayout();
 
 layout_accessible = unity_a11y_get_accessible(layout);
diff --git a/plugins/unityshell/src/unity-expander-view-accessible.cpp b/plugins/unityshell/src/unity-expander-view-accessible.cpp
index ba03d3f05..b16f5c3d2 100644
--- a/plugins/unityshell/src/unity-expander-view-accessible.cpp
+++ b/plugins/unityshell/src/unity-expander-view-accessible.cpp
@@ -135,10 +135,8 @@ unity_expander_view_accessible_initialize(AtkObject* accessible,
 ATK_OBJECT_CLASS(unity_expander_view_accessible_parent_class)->initialize(accessible, data);
 
 object = (nux::Object*)data;
- view = dynamic_cast<ExpanderView*>(object);
-
+ view = static_cast<ExpanderView*>(object);
 view->key_nav_focus_change.connect(sigc::bind(sigc::ptr_fun(on_focus_changed_cb), accessible));
-
 view->expanded.changed.connect(sigc::bind(sigc::ptr_fun(on_expanded_changed_cb), accessible));
 view->label.changed.connect(sigc::bind(sigc::ptr_fun(on_name_changed_cb), accessible));
 
diff --git a/plugins/unityshell/src/unity-filter-basic-button-accessible.cpp b/plugins/unityshell/src/unity-filter-basic-button-accessible.cpp
index a6fe8acbc..1011e86f5 100644
--- a/plugins/unityshell/src/unity-filter-basic-button-accessible.cpp
+++ b/plugins/unityshell/src/unity-filter-basic-button-accessible.cpp
@@ -191,7 +191,7 @@ unity_filter_basic_button_accessible_ref_state_set(AtkObject* obj)
 if (nux_object == NULL) /* defunct */
 return state_set;
 
- button = dynamic_cast<FilterBasicButton*>(nux_object);
+ button = static_cast<FilterBasicButton*>(nux_object);
 
 atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE);
 atk_state_set_add_state(state_set, ATK_STATE_ENABLED);
@@ -234,8 +234,7 @@ unity_filter_basic_button_accessible_do_action(AtkAction *action,
 if (nux_object == NULL)
 return FALSE;
 
- button = dynamic_cast<FilterBasicButton*>(nux_object);
-
+ button = static_cast<FilterBasicButton*>(nux_object);
 button->Activate();
 
 return TRUE;
diff --git a/plugins/unityshell/src/unity-launcher-accessible.cpp b/plugins/unityshell/src/unity-launcher-accessible.cpp
index 2764a9d83..182ad524f 100644
--- a/plugins/unityshell/src/unity-launcher-accessible.cpp
+++ b/plugins/unityshell/src/unity-launcher-accessible.cpp
@@ -156,8 +156,7 @@ unity_launcher_accessible_initialize(AtkObject* accessible,
 self = UNITY_LAUNCHER_ACCESSIBLE(accessible);
 nux_object = nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(accessible));
 
- launcher = dynamic_cast<Launcher*>(nux_object);
-
+ launcher = static_cast<Launcher*>(nux_object);
 model = launcher->GetModel();
 
 if (model)
@@ -189,7 +188,7 @@ unity_launcher_accessible_get_n_children(AtkObject* obj)
 if (!object) /* state is defunct */
 return 0;
 
- launcher = dynamic_cast<Launcher*>(object);
+ launcher = static_cast<Launcher*>(object);
 
 launcher_model = launcher->GetModel();
 
@@ -220,8 +219,7 @@ unity_launcher_accessible_ref_child(AtkObject* obj,
 if (!nux_object) /* state is defunct */
 return 0;
 
- launcher = dynamic_cast<Launcher*>(nux_object);
-
+ launcher = static_cast<Launcher*>(nux_object);
 launcher_model = launcher->GetModel();
 
 it = launcher_model->begin();
@@ -298,7 +296,7 @@ unity_launcher_accessible_ref_selection(AtkSelection* selection,
 if (!nux_object) /* state is defunct */
 return 0;
 
- launcher = dynamic_cast<Launcher*>(nux_object);
+ launcher = static_cast<Launcher*>(nux_object);
 AbstractLauncherIcon::Ptr const& selected_icon = launcher->GetSelectedMenuIcon();
 
 if (selected_icon)
@@ -322,7 +320,7 @@ unity_launcher_accessible_get_selection_count(AtkSelection* selection)
 if (!nux_object) /* state is defunct */
 return 0;
 
- launcher = dynamic_cast<Launcher*>(nux_object);
+ launcher = static_cast<Launcher*>(nux_object);
 
 if (!launcher->GetSelectedMenuIcon())
 return 0;
@@ -344,7 +342,7 @@ unity_launcher_accessible_is_child_selected(AtkSelection* selection,
 if (!nux_object) /* state is defunct */
 return 0;
 
- launcher = dynamic_cast<Launcher*>(nux_object);
+ launcher = static_cast<Launcher*>(nux_object);
 LauncherModel::Ptr const& launcher_model = launcher->GetModel();
 it = launcher_model->begin();
 std::advance(it, i);
@@ -428,7 +426,7 @@ update_children_index(UnityLauncherAccessible* self)
 if (!nux_object) /* state is defunct */
 return;
 
- launcher = dynamic_cast<Launcher*>(nux_object);
+ launcher = static_cast<Launcher*>(nux_object);
 launcher_model = launcher->GetModel();
 
 if (launcher_model == NULL)
diff --git a/plugins/unityshell/src/unity-rvgrid-accessible.cpp b/plugins/unityshell/src/unity-rvgrid-accessible.cpp
index d56a275c7..e17f15e2a 100644
--- a/plugins/unityshell/src/unity-rvgrid-accessible.cpp
+++ b/plugins/unityshell/src/unity-rvgrid-accessible.cpp
@@ -158,8 +158,7 @@ check_selection(UnityRvgridAccessible* self)
 if (!object) /* state is defunct */
 return;
 
- rvgrid = dynamic_cast<ResultViewGrid*>(object);
-
+ rvgrid = static_cast<ResultViewGrid*>(object);
 index = rvgrid->GetSelectedIndex();
 
 if (index >= 0)
diff --git a/plugins/unityshell/src/unity-session-button-accessible.cpp b/plugins/unityshell/src/unity-session-button-accessible.cpp
index 62ec0b8ed..65653ef73 100644
--- a/plugins/unityshell/src/unity-session-button-accessible.cpp
+++ b/plugins/unityshell/src/unity-session-button-accessible.cpp
@@ -153,8 +153,7 @@ unity_session_button_accessible_initialize(AtkObject* accessible,
 if (nux_object == NULL) /* defunct */
 return;
 
- button = dynamic_cast<Button*>(nux_object);
-
+ button = static_cast<Button*>(nux_object);
 button->highlighted.changed.connect(sigc::bind(sigc::ptr_fun(on_focus_change_cb),
 UNITY_SESSION_BUTTON_ACCESSIBLE(self)));
 }
diff --git a/plugins/unityshell/src/unity-switcher-accessible.cpp b/plugins/unityshell/src/unity-switcher-accessible.cpp
index ab83d6477..80651bc01 100644
--- a/plugins/unityshell/src/unity-switcher-accessible.cpp
+++ b/plugins/unityshell/src/unity-switcher-accessible.cpp
@@ -292,8 +292,7 @@ unity_switcher_accessible_ref_selection(AtkSelection* selection,
 if (!nux_object) /* state is defunct */
 return 0;
 
- switcher = dynamic_cast<SwitcherView*>(nux_object);
-
+ switcher = static_cast<SwitcherView*>(nux_object);
 switcher_model = switcher->GetModel();
 selected_index = switcher_model->SelectionIndex();
 
@@ -319,7 +318,7 @@ unity_switcher_accessible_get_selection_count(AtkSelection* selection)
 if (!nux_object) /* state is defunct */
 return 0;
 
- switcher = dynamic_cast<SwitcherView*>(nux_object);
+ switcher = static_cast<SwitcherView*>(nux_object);
 switcher_model = switcher->GetModel();
 
 if (!switcher_model->Selection())
@@ -344,7 +343,7 @@ unity_switcher_accessible_is_child_selected(AtkSelection* selection,
 if (!nux_object) /* state is defunct */
 return 0;
 
- switcher = dynamic_cast<SwitcherView*>(nux_object);
+ switcher = static_cast<SwitcherView*>(nux_object);
 switcher_model = switcher->GetModel();
 selected_index = switcher_model->SelectionIndex();
 
@@ -393,7 +392,7 @@ create_children(UnitySwitcherAccessible* self)
 if (!nux_object) /* state is defunct */
 return;
 
- switcher = dynamic_cast<SwitcherView*>(nux_object);
+ switcher = static_cast<SwitcherView*>(nux_object);
 SwitcherModel::Ptr const& switcher_model = switcher->GetModel();
 
 if (!switcher_model)