Changeset 57880 in vbox

Timestamp:

Sep 24, 2015 2:05:48 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: work around accidental undefined behaviour in Qt.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (2 diffs)
• widgets/UIPopupStack.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -112 +112 @@
 UIMenu* UIAction::menu() const
 {
-    return qobject_cast<UIMenu*>(QAction::menu());
+    return QAction::menu() ? qobject_cast<UIMenu*>(QAction::menu()) : 0;
 }
 
@@ -959 +959 @@
 {
     /* Make sure menu is valid: */
+    AssertPtrReturnVoid(sender());
     UIMenu *pMenu = qobject_cast<UIMenu*>(sender());
     AssertPtrReturnVoid(pMenu);
     /* Make sure action is valid: */
+    AssertPtrReturnVoid(pMenu->menuAction());
     UIAction *pAction = qobject_cast<UIAction*>(pMenu->menuAction());
     AssertPtrReturnVoid(pAction);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp

@@ -314 +314 @@
 {
     /* Menu-bar can exist only on QMainWindow sub-class: */
-    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
-    {
-        /* Search for existing menu-bar child: */
-        if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
-            return pMenuBar->height();
+    if (pParent)
+    {
+        if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
+        {
+            /* Search for existing menu-bar child: */
+            if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
+                return pMenuBar->height();
+        }
     }
     /* Zero by default: */
@@ -328 +331 @@
 {
     /* Status-bar can exist only on QMainWindow sub-class: */
-    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
-    {
-        /* Search for existing status-bar child: */
-        if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())
-            return pStatusBar->height();
+    if (pParent)
+    {
+        if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
+        {
+            /* Search for existing status-bar child: */
+            if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())
+                return pStatusBar->height();
+        }
     }
     /* Zero by default: */