Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64685) @@ -55,5 +55,5 @@ to keep the interface clean. ModelItem is able to handle tree structures with a parent & several children's. */ -ModelItem::ModelItem(int number, ModelItem_type type, ModelItem *pParent /* = NULL */) +ModelItem::ModelItem(int number, ApplianceModelItemType type, ModelItem *pParent /* = NULL */) : m_number(number) , m_type(type) @@ -100,5 +100,5 @@ VirtualSystemItem::VirtualSystemItem(int number, CVirtualSystemDescription aDesc, ModelItem *pParent) - : ModelItem(number, VirtualSystem_type, pParent) + : ModelItem(number, ApplianceModelItemType_VirtualSystem, pParent) , m_desc(aDesc) {} @@ -107,5 +107,5 @@ { QVariant v; - if (column == DescriptionSection && + if (column == ApplianceViewSection_Description && role == Qt::DisplayRole) v = UIApplianceEditorWidget::tr("Virtual System %1").arg(m_number + 1); @@ -136,5 +136,5 @@ const QString &strExtraConfigValue, ModelItem *pParent) - : ModelItem(number, HardwareType, pParent) + : ModelItem(number, ApplianceModelItemType_Hardware, pParent) , m_type(type) , m_strRef(strRef) @@ -162,5 +162,5 @@ case Qt::CheckStateRole: { - if (column == ConfigValueSection && + if (column == ApplianceViewSection_ConfigValue && (m_type == KVirtualSystemDescriptionType_Floppy || m_type == KVirtualSystemDescriptionType_CDROM || @@ -176,7 +176,7 @@ case Qt::EditRole: { - if (column == OriginalValueSection) + if (column == ApplianceViewSection_OriginalValue) m_strOrigValue = value.toString(); - else if (column == ConfigValueSection) + else if (column == ApplianceViewSection_ConfigValue) m_strConfigValue = value.toString(); break; @@ -194,7 +194,7 @@ case Qt::EditRole: { - if (column == OriginalValueSection) + if (column == ApplianceViewSection_OriginalValue) v = m_strOrigValue; - else if (column == ConfigValueSection) + else if (column == ApplianceViewSection_ConfigValue) v = m_strConfigValue; break; @@ -202,5 +202,5 @@ case Qt::DisplayRole: { - if (column == DescriptionSection) + if (column == ApplianceViewSection_Description) { switch (m_type) @@ -230,7 +230,7 @@ } } - else if (column == OriginalValueSection) + else if (column == ApplianceViewSection_OriginalValue) v = m_strOrigValue; - else if (column == ConfigValueSection) + else if (column == ApplianceViewSection_ConfigValue) { switch (m_type) @@ -258,5 +258,5 @@ case Qt::ToolTipRole: { - if (column == ConfigValueSection) + if (column == ApplianceViewSection_ConfigValue) { if (!m_strOrigValue.isEmpty()) @@ -267,5 +267,5 @@ case Qt::DecorationRole: { - if (column == DescriptionSection) + if (column == ApplianceViewSection_Description) { switch (m_type) @@ -295,5 +295,5 @@ } } - else if (column == ConfigValueSection && + else if (column == ApplianceViewSection_ConfigValue && m_type == KVirtualSystemDescriptionType_OS) { @@ -307,5 +307,5 @@ { /* If the item is unchecked mark it with italic text. */ - if (column == ConfigValueSection && + if (column == ApplianceViewSection_ConfigValue && m_checkState == Qt::Unchecked) { @@ -319,5 +319,5 @@ { /* If the item is unchecked mark it with gray text. */ - if (column == ConfigValueSection && + if (column == ApplianceViewSection_ConfigValue && m_checkState == Qt::Unchecked) { @@ -329,5 +329,5 @@ case Qt::CheckStateRole: { - if (column == ConfigValueSection && + if (column == ApplianceViewSection_ConfigValue && (m_type == KVirtualSystemDescriptionType_Floppy || m_type == KVirtualSystemDescriptionType_CDROM || @@ -345,5 +345,5 @@ case HardwareItem::ModifiedRole: { - if (column == ConfigValueSection) + if (column == ApplianceViewSection_ConfigValue) v = m_fModified; break; @@ -356,5 +356,5 @@ { Qt::ItemFlags flags = 0; - if (column == ConfigValueSection) + if (column == ApplianceViewSection_ConfigValue) { /* Some items are checkable */ @@ -390,5 +390,5 @@ { QWidget *editor = NULL; - if (idx.column() == ConfigValueSection) + if (idx.column() == ApplianceViewSection_ConfigValue) { switch (m_type) @@ -641,5 +641,5 @@ { /* Get the index for the config value column. */ - QModelIndex hdIndex = pModel->index(list.at(i).row(), ConfigValueSection, list.at(i).parent()); + QModelIndex hdIndex = pModel->index(list.at(i).row(), ApplianceViewSection_ConfigValue, list.at(i).parent()); /* Ignore it if was already modified by the user. */ if (!hdIndex.data(ModifiedRole).toBool()) @@ -732,5 +732,5 @@ : QAbstractItemModel(pParent) { - m_pRootItem = new ModelItem(0, RootType); + m_pRootItem = new ModelItem(0, ApplianceModelItemType_Root); for (int a = 0; a < aVSDs.size(); ++a) { @@ -889,6 +889,6 @@ switch (section) { - case DescriptionSection: title = UIApplianceEditorWidget::tr("Description"); break; - case ConfigValueSection: title = UIApplianceEditorWidget::tr("Configuration"); break; + case ApplianceViewSection_Description: title = UIApplianceEditorWidget::tr("Description"); break; + case ApplianceViewSection_ConfigValue: title = UIApplianceEditorWidget::tr("Configuration"); break; } return title; @@ -900,8 +900,8 @@ return QModelIndex(); - if (idx.column() == ConfigValueSection) + if (idx.column() == ApplianceViewSection_ConfigValue) return idx; else - return index(idx.row(), ConfigValueSection, idx.parent()); + return index(idx.row(), ApplianceViewSection_ConfigValue, idx.parent()); } @@ -1065,5 +1065,5 @@ ModelItem *item = static_cast(i.internalPointer()); /* We filter hardware types only */ - if (item->type() == HardwareType) + if (item->type() == ApplianceModelItemType_Hardware) { HardwareItem *hwItem = static_cast(item); @@ -1087,6 +1087,6 @@ /* We sort hardware types only */ - if (!(pLeftItem->type() == HardwareType && - pRightItem->type() == HardwareType)) + if (!(pLeftItem->type() == ApplianceModelItemType_Hardware && + pRightItem->type() == ApplianceModelItemType_Hardware)) return false; Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64685) @@ -38,13 +38,21 @@ class QTextEdit; -//////////////////////////////////////////////////////////////////////////////// -// Globals - -enum TreeViewSection { DescriptionSection = 0, OriginalValueSection, ConfigValueSection }; - -//////////////////////////////////////////////////////////////////////////////// -// ModelItem - -enum ModelItem_type { RootType, VirtualSystem_type, HardwareType }; + +/** Appliance tree-view section types. */ +enum ApplianceViewSection +{ + ApplianceViewSection_Description = 0, + ApplianceViewSection_OriginalValue, + ApplianceViewSection_ConfigValue +}; + +/** Appliance model item types. */ +enum ApplianceModelItemType +{ + ApplianceModelItemType_Root, + ApplianceModelItemType_VirtualSystem, + ApplianceModelItemType_Hardware +}; + /* This & the following derived classes represent the data items of a Virtual @@ -55,5 +63,5 @@ { public: - ModelItem(int number, ModelItem_type type, ModelItem *pParent = NULL); + ModelItem(int number, ApplianceModelItemType type, ModelItem *pParent = NULL); virtual ~ModelItem(); @@ -79,13 +87,13 @@ virtual void putBack(QVector& finalStates, QVector& finalValues, QVector& finalExtraValues); - ModelItem_type type() const { return m_type; } + ApplianceModelItemType type() const { return m_type; } protected: /* Protected member vars */ - int m_number; - ModelItem_type m_type; - - ModelItem *m_pParentItem; - QList m_childItems; + int m_number; + ApplianceModelItemType m_type; + + ModelItem *m_pParentItem; + QList m_childItems; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (revision 64684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (revision 64685) @@ -90,5 +90,5 @@ ExportSortProxyModel *pProxy = new ExportSortProxyModel(this); pProxy->setSourceModel(m_pModel); - pProxy->sort(DescriptionSection, Qt::DescendingOrder); + pProxy->sort(ApplianceViewSection_Description, Qt::DescendingOrder); VirtualSystemDelegate *pDelegate = new VirtualSystemDelegate(pProxy, this); @@ -100,5 +100,5 @@ /* For now we hide the original column. This data is displayed as tooltip also. */ - m_pTreeViewSettings->setColumnHidden(OriginalValueSection, true); + m_pTreeViewSettings->setColumnHidden(ApplianceViewSection_OriginalValue, true); m_pTreeViewSettings->expandAll(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (revision 64684) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (revision 64685) @@ -96,5 +96,5 @@ ImportSortProxyModel *pProxy = new ImportSortProxyModel(this); pProxy->setSourceModel(m_pModel); - pProxy->sort(DescriptionSection, Qt::DescendingOrder); + pProxy->sort(ApplianceViewSection_Description, Qt::DescendingOrder); VirtualSystemDelegate *pDelegate = new VirtualSystemDelegate(pProxy, this); @@ -106,5 +106,5 @@ /* For now we hide the original column. This data is displayed as tooltip also. */ - m_pTreeViewSettings->setColumnHidden(OriginalValueSection, true); + m_pTreeViewSettings->setColumnHidden(ApplianceViewSection_OriginalValue, true); m_pTreeViewSettings->expandAll();