Changeset 65334 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 16, 2017 2:00:41 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 178): A bit of care for UIInformationModel: Reordering.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformationModel.cpp (modified) (3 diffs)
• UIInformationModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationModel.cpp

@@ -49 +49 @@
 UIInformationModel::~UIInformationModel()
 {
-    /* Destroy all data-items: */
-    qDeleteAll(m_list);
-    m_list.clear();
+    /* Cleanup: */
+    cleanup();
 }
 
@@ -68 +67 @@
     /* Return the data for the corresponding role: */
     return pItem->data(index, role);
-}
-
-void UIInformationModel::prepare()
-{
-    /* Prepare role-names for model: */
-    QHash<int, QByteArray> roleNames;
-    roleNames[Qt::DisplayRole] = "";
-    roleNames[Qt::DecorationRole] = "";
-    roleNames[Qt::UserRole + 1] = "";
-    roleNames[Qt::UserRole + 2] = "";
-    # if QT_VERSION < 0x050000
-    setRoleNames(roleNames);
-    # endif /* QT_VERSION < 0x050000 */
-
-    /* Register meta-type: */
-    qRegisterMetaType<InformationElementType>();
-}
-
-QHash<int, QByteArray> UIInformationModel::roleNames() const
-{
-    /* Add supported roles and return: */
-    QHash<int, QByteArray> roleNames;
-    roleNames[Qt::DisplayRole] = "";
-    roleNames[Qt::DecorationRole] = "";
-    roleNames[Qt::UserRole + 1] = "";
-    roleNames[Qt::UserRole + 2] = "";
-    return roleNames;
 }
 
@@ -120 +92 @@
 }
 
+void UIInformationModel::prepare()
+{
+    /* Prepare role-names for model: */
+    QHash<int, QByteArray> roleNames;
+    roleNames[Qt::DisplayRole] = "";
+    roleNames[Qt::DecorationRole] = "";
+    roleNames[Qt::UserRole + 1] = "";
+    roleNames[Qt::UserRole + 2] = "";
+    # if QT_VERSION < 0x050000
+    setRoleNames(roleNames);
+    # endif /* QT_VERSION < 0x050000 */
+
+    /* Register meta-type: */
+    qRegisterMetaType<InformationElementType>();
+}
+
+void UIInformationModel::cleanup()
+{
+    /* Destroy all data-items: */
+    qDeleteAll(m_list);
+    m_list.clear();
+}
+
+QHash<int, QByteArray> UIInformationModel::roleNames() const
+{
+    /* Add supported roles and return: */
+    QHash<int, QByteArray> roleNames;
+    roleNames[Qt::DisplayRole] = "";
+    roleNames[Qt::DecorationRole] = "";
+    roleNames[Qt::UserRole + 1] = "";
+    roleNames[Qt::UserRole + 2] = "";
+    return roleNames;
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationModel.h

@@ -82 +82 @@
     /** Prepares all. */
     void prepare();
+    /** Cleanups all. */
+    void cleanup();
 
     /** Returns the list of role-names supported by model. */