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

Timestamp:

Sep 26, 2014 5:03:08 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mini-toolbar rework 03 (some code protection).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp (modified) (7 diffs)

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

@@ -86 +86 @@
 void UIRuntimeMiniToolBar::setAlignment(Qt::Alignment alignment)
 {
+    /* Make sure toolbar created: */
+    AssertPtrReturnVoid(m_pToolbar);
+
     /* Make sure alignment really changed: */
     if (m_alignment == alignment)
@@ -102 +105 @@
 void UIRuntimeMiniToolBar::setAutoHide(bool fAutoHide, bool fPropagateToChild /* = true */)
 {
+    /* Make sure toolbar created: */
+    AssertPtrReturnVoid(m_pToolbar);
+
     /* Make sure auto-hide really changed: */
     if (m_fAutoHide == fAutoHide)
@@ -119 +125 @@
 void UIRuntimeMiniToolBar::setText(const QString &strText)
 {
+    /* Make sure toolbar created: */
+    AssertPtrReturnVoid(m_pToolbar);
+
     /* Propagate to child: */
     m_pToolbar->setText(strText);
@@ -125 +134 @@
 void UIRuntimeMiniToolBar::addMenus(const QList<QMenu*> &menus)
 {
+    /* Make sure toolbar created: */
+    AssertPtrReturnVoid(m_pToolbar);
+
     /* Propagate to child: */
     m_pToolbar->addMenus(menus);
@@ -330 +342 @@
 {
     /* Stop hover-enter/leave timers: */
-    if (m_pHoverEnterTimer->isActive())
+    if (m_pHoverEnterTimer && m_pHoverEnterTimer->isActive())
         m_pHoverEnterTimer->stop();
-    if (m_pHoverLeaveTimer->isActive())
+    if (m_pHoverLeaveTimer && m_pHoverLeaveTimer->isActive())
         m_pHoverLeaveTimer->stop();
 
@@ -347 +359 @@
 {
     /* Stop the hover-leave timer if necessary: */
-    if (m_pHoverLeaveTimer->isActive())
+    if (m_pHoverLeaveTimer && m_pHoverLeaveTimer->isActive())
         m_pHoverLeaveTimer->stop();
 
     /* Start the hover-enter timer: */
-    if (m_fAutoHide)
+    if (m_fAutoHide && m_pHoverEnterTimer)
         m_pHoverEnterTimer->start();
 }
@@ -358 +370 @@
 {
     /* Stop the hover-enter timer if necessary: */
-    if (m_pHoverEnterTimer->isActive())
+    if (m_pHoverEnterTimer && m_pHoverEnterTimer->isActive())
         m_pHoverEnterTimer->stop();
 
     /* Start the hover-leave timer: */
-    if (m_fAutoHide)
+    if (m_fAutoHide && m_pHoverLeaveTimer)
         m_pHoverLeaveTimer->start();
 }