Changeset 64127 in vbox

Timestamp:

Oct 3, 2016 3:42:39 PM (8 years ago)

Author:

vboxsync

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

111084

Message:

FE/Qt: bugref:6899: Accessibility support (step 68): Move Settings Selector and Language Tree onto QITreeWidgetItem rails.

Location:

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

Files:

• UISettingsSelector.cpp (modified) (1 diff)
• global/UIGlobalSettingsLanguage.cpp (modified) (5 diffs)

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

@@ -355 +355 @@
         m_list.append(pItem);
 
-        QTreeWidgetItem *pTwItem = new QTreeWidgetItem(m_pTreeWidget, QStringList() << QString("")
-                                                                                    << idToString(iID)
-                                                                                    << strLink);
+        QTreeWidgetItem *pTwItem = new QITreeWidgetItem(m_pTreeWidget, QStringList() << QString("")
+                                                                                     << idToString(iID)
+                                                                                     << strLink);
         pTwItem->setIcon(TreeWidgetSection_Category, pItem->icon());
         pPage->setContentsMargins(0, 0, 0, 0);

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

@@ -48 +48 @@
 
 /* Language item: */
-class UILanguageItem : public QTreeWidgetItem
+class UILanguageItem : public QITreeWidgetItem
 {
 public:
 
-    /* Language item type: */
-    enum { UILanguageItemType = QTreeWidgetItem::UserType + 1 };
-
     /* Language item constructor: */
-    UILanguageItem(QTreeWidget *pParent, const QTranslator &translator,
+    UILanguageItem(QITreeWidget *pParent, const QTranslator &translator,
                    const QString &strId, bool fBuiltIn = false)
-        : QTreeWidgetItem(pParent, UILanguageItemType), m_fBuiltIn(fBuiltIn)
+        : QITreeWidgetItem(pParent), m_fBuiltIn(fBuiltIn)
     {
         Assert (!strId.isEmpty());
@@ -113 +110 @@
     /* Constructs an item for an invalid language ID
      * (i.e. when a language file is missing or corrupt): */
-    UILanguageItem(QTreeWidget *pParent, const QString &strId)
-        : QTreeWidgetItem(pParent, UILanguageItemType), m_fBuiltIn(false)
+    UILanguageItem(QITreeWidget *pParent, const QString &strId)
+        : QITreeWidgetItem(pParent), m_fBuiltIn(false)
     {
         Assert(!strId.isEmpty());
@@ -131 +128 @@
     /* Constructs an item for the default language ID
      * (column 1 will be set to QString::null): */
-    UILanguageItem(QTreeWidget *pParent)
-        : QTreeWidgetItem(pParent, UILanguageItemType), m_fBuiltIn(false)
+    UILanguageItem(QITreeWidget *pParent)
+        : QITreeWidgetItem(pParent), m_fBuiltIn(false)
     {
         setText(0, UIGlobalSettingsLanguage::tr("Default", "Language"));
@@ -159 +156 @@
         if (m_fBuiltIn)
             return true;
-        if (other.type() == UILanguageItemType && ((UILanguageItem*)&other)->m_fBuiltIn)
+        if (other.type() == ItemType && ((UILanguageItem*)&other)->m_fBuiltIn)
             return false;
-        return QTreeWidgetItem::operator<(other);
+        return QITreeWidgetItem::operator<(other);
     }
 
@@ -351 +348 @@
 void UIGlobalSettingsLanguage::sltLanguageItemPainted(QTreeWidgetItem *pItem, QPainter *pPainter)
 {
-    if (pItem && pItem->type() == UILanguageItem::UILanguageItemType)
+    if (pItem && pItem->type() == QITreeWidgetItem::ItemType)
     {
         UILanguageItem *pLanguageItem = static_cast<UILanguageItem*>(pItem);