Changeset 63720 in vbox

Timestamp:

Sep 5, 2016 3:45:33 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110495

Message:

FE/Qt: bugref:6899: Accessibility support (step 6): Selector UI: Couple of condition fixes for r110457 and r110460.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItem.cpp (modified) (2 diffs)
• UIGChooserView.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.cpp

@@ -94 +94 @@
         /* Make sure item still alive: */
         AssertPtrReturn(item(), 0);
-
         /* Make sure index is valid: */
-        if (iIndex < childCount())
-            return QAccessible::queryAccessibleInterface(item()->items().at(iIndex));
-
-        /* Null by default: */
-        return 0;
+        AssertReturn(iIndex >= 0 && iIndex < childCount(), 0);
+
+        /* Return the child with the passed iIndex: */
+        return QAccessible::queryAccessibleInterface(item()->items().at(iIndex));
     }
 
@@ -150 +148 @@
         AssertPtrReturn(item(), QAccessible::NoRole);
 
-        /* Return the number of group children: */
+        /* Return the role of group: */
         if (item()->type() == UIGChooserItemType_Group)
             return QAccessible::List;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserView.cpp

@@ -72 +72 @@
         /* Make sure view still alive: */
         AssertPtrReturn(view(), 0);
+        /* Make sure index is valid: */
+        AssertReturn(iIndex >= 0 && iIndex < childCount(), 0);
 
-        /* Make sure index is valid: */
-        if (iIndex < childCount())
-            return QAccessible::queryAccessibleInterface(view()->chooser()->model()->root()->items().at(iIndex));
-
-        /* Null by default: */
-        return 0;
+        /* Return the child with the passed iIndex: */
+        return QAccessible::queryAccessibleInterface(view()->chooser()->model()->root()->items().at(iIndex));
     }