Changeset 57808 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 17, 2015 4:09:23 PM (9 years ago)

Author:

vboxsync

Message:

Installer/linux and tinderclient: use Qt from build server for RPM builds - changed the wrong line in tinderclient.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (3 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()) : NULL;
 }
 
 UIActionPolymorphic* UIAction::toActionPolymorphic()
 {
-    return qobject_cast<UIActionPolymorphic*>(this);
+    return this ? qobject_cast<UIActionPolymorphic*>(this) : NULL;
 }
 
 UIActionPolymorphicMenu* UIAction::toActionPolymorphicMenu()
 {
-    return qobject_cast<UIActionPolymorphicMenu*>(this);
+    return this ? qobject_cast<UIActionPolymorphicMenu*>(this) : NULL;
 }
 
@@ -890 +890 @@
 UIActionPoolRuntime* UIActionPool::toRuntime()
 {
-    return qobject_cast<UIActionPoolRuntime*>(this);
+    return this ? qobject_cast<UIActionPoolRuntime*>(this) : NULL;
 }
 
 UIActionPoolSelector* UIActionPool::toSelector()
 {
-    return qobject_cast<UIActionPoolSelector*>(this);
+    return this ? qobject_cast<UIActionPoolSelector*>(this) : NULL;
 }
 
@@ -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);
 
     /* Determine action index: */

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))
-    {
+    if (pParent)
+    {
+        QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent);
+
         /* Search for existing menu-bar child: */
         if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
@@ -328 +330 @@
 {
     /* Status-bar can exist only on QMainWindow sub-class: */
-    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
-    {
+    if (pParent)
+    {
+        QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent);
+
         /* Search for existing status-bar child: */
         if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())