Changeset 64747 in vbox

Timestamp:

Nov 24, 2016 5:10:19 PM (8 years ago)

Author:

vboxsync

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

112084

Message:

FE/Qt: bugref:6899: Accessibility support (step 139): Extend UIApplianceModelItem with constructor for root-item.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIApplianceEditorWidget.cpp (modified) (3 diffs)
• UIApplianceEditorWidget.h (modified) (1 diff)
• UIApplianceExportEditorWidget.cpp (modified) (1 diff)
• UIApplianceImportEditorWidget.cpp (modified) (1 diff)

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

@@ -52 +52 @@
 public:
 
-    /** Constructs item with specified @a iNumber, @a enmType and @a pParentItem. */
-    UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, UIApplianceModelItem *pParentItem = 0);
+    /** Constructs root item with specified @a iNumber, @a enmType and @a pParent. */
+    UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, QTreeView *pParent);
+    /** Constructs non-root item with specified @a iNumber, @a enmType and @a pParentItem. */
+    UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, UIApplianceModelItem *pParentItem);
     /** Destructs item. */
     virtual ~UIApplianceModelItem();
@@ -213 +215 @@
 *********************************************************************************************************************************/
 
-UIApplianceModelItem::UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, UIApplianceModelItem *pParentItem /* = 0 */)
+UIApplianceModelItem::UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, QTreeView *pParent)
+    : m_iNumber(iNumber)
+    , m_enmType(enmType)
+    , m_pParentItem(0)
+{
+}
+
+UIApplianceModelItem::UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, UIApplianceModelItem *pParentItem)
     : m_iNumber(iNumber)
     , m_enmType(enmType)
@@ -899 +908 @@
 *********************************************************************************************************************************/
 
-UIApplianceModel::UIApplianceModel(QVector<CVirtualSystemDescription>& aVSDs, QObject *pParent /* = 0 */)
+UIApplianceModel::UIApplianceModel(QVector<CVirtualSystemDescription>& aVSDs, QTreeView *pParent)
     : QAbstractItemModel(pParent)
-{
-    m_pRootItem = new UIApplianceModelItem(0, ApplianceModelItemType_Root);
+    , m_pRootItem(new UIApplianceModelItem(0, ApplianceModelItemType_Root, pParent))
+{
     for (int iVSDIndex = 0; iVSDIndex < aVSDs.size(); ++iVSDIndex)
     {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

@@ -67 +67 @@
     /** Constructs the Appliance model passing @a pParent to the base-class.
       * @param  aVSDs  Brings the Virtual System descriptions. */
-    UIApplianceModel(QVector<CVirtualSystemDescription>& aVSDs, QObject *pParent = 0);
+    UIApplianceModel(QVector<CVirtualSystemDescription>& aVSDs, QTreeView *pParent);
     /** Destructs the Appliance model. */
     ~UIApplianceModel();

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

@@ -86 +86 @@
     QVector<CVirtualSystemDescription> vsds = m_pAppliance->GetVirtualSystemDescriptions();
 
-    m_pModel = new UIApplianceModel(vsds, this);
+    m_pModel = new UIApplianceModel(vsds, m_pTreeViewSettings);
 
     ExportSortProxyModel *pProxy = new ExportSortProxyModel(this);

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

@@ -92 +92 @@
                         QVector<CVirtualSystemDescription> vsds = m_pAppliance->GetVirtualSystemDescriptions();
 
-                        m_pModel = new UIApplianceModel(vsds, this);
+                        m_pModel = new UIApplianceModel(vsds, m_pTreeViewSettings);
 
                         ImportSortProxyModel *pProxy = new ImportSortProxyModel(this);