Changeset 64082 in vbox

Timestamp:

Sep 28, 2016 2:14:15 PM (8 years ago)

Author:

vboxsync

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

111021

Message:

FE/Qt: bugref:6899: Accessibility support (step 60): A bit of cleanup/prepare care for settings selector.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsSelector.cpp (modified) (5 diffs)
• UISettingsSelector.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp

@@ -212 +212 @@
 UISettingsSelectorTreeView::UISettingsSelectorTreeView(QWidget *pParent /* = 0 */)
     : UISettingsSelector(pParent)
-{
+    , m_pTreeWidget(0)
+{
+    /* Prepare the tree-widget: */
     m_pTreeWidget = new QITreeWidget(pParent);
-    /* Configure the selector: */
     QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
     sizePolicy.setHorizontalStretch(0);
@@ -240 +241 @@
 }
 
+UISettingsSelectorTreeView::~UISettingsSelectorTreeView()
+{
+    /* Cleanup the tree-widget: */
+    delete m_pTreeWidget;
+    m_pTreeWidget = 0;
+}
+
 QWidget *UISettingsSelectorTreeView::widget() const
 {
@@ -428 +436 @@
 UISettingsSelectorToolBar::UISettingsSelectorToolBar(QWidget *pParent /* = 0 */)
     : UISettingsSelector(pParent)
-{
-    /* Init the toolbar: */
+    , m_pToolBar(0)
+    , m_pActionGroup(0)
+{
+    /* Prepare the toolbar: */
     m_pToolBar = new UIToolBar(pParent);
     m_pToolBar->setUseTextLabels(true);
@@ -436 +446 @@
     m_pToolBar->setShowToolBarButton(false);
 #endif /* VBOX_WS_MAC */
-    /* Init the action group for house keeping: */
+
+    /* Prepare the action group: */
     m_pActionGroup = new QActionGroup(this);
     m_pActionGroup->setExclusive(true);
@@ -445 +456 @@
 UISettingsSelectorToolBar::~UISettingsSelectorToolBar()
 {
+    /* Cleanup the action group: */
+    delete m_pActionGroup;
+    m_pActionGroup = 0;
+
+    /* Cleanup the toolbar: */
     delete m_pToolBar;
+    m_pToolBar = 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.h

@@ -132 +132 @@
     /** Constructs settings selector passing @a pParent to the base-class. */
     UISettingsSelectorTreeView(QWidget *pParent = 0);
+    /** Destructs settings selector. */
+    ~UISettingsSelectorTreeView();
 
     /** Returns the widget selector operates on. */
@@ -200 +202 @@
     /** Constructs settings selector passing @a pParent to the base-class. */
     UISettingsSelectorToolBar(QWidget *pParent = 0);
+    /** Destructs settings selector. */
     ~UISettingsSelectorToolBar();