Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64691) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (revision 64692) @@ -46,14 +46,14 @@ -/** Describes the interface of Virtual System item. +/** Describes the interface of Appliance item. * Represented as a tree structure with a parent & multiple children. */ -class ModelItem +class UIApplianceModelItem { public: /** Constructs item with specified @a iNumber, @a enmType and @a pParentItem. */ - ModelItem(int iNumber, ApplianceModelItemType enmType, ModelItem *pParentItem = 0); + UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, UIApplianceModelItem *pParentItem = 0); /** Destructs item. */ - virtual ~ModelItem(); + virtual ~UIApplianceModelItem(); /** Returns the item type. */ @@ -61,10 +61,10 @@ /** Returns the parent of the item. */ - ModelItem *parent() const { return m_pParentItem; } + UIApplianceModelItem *parent() const { return m_pParentItem; } /** Appends the passed @a pChildItem to the item's list of children. */ - void appendChild(ModelItem *pChildItem); + void appendChild(UIApplianceModelItem *pChildItem); /** Returns the child specified by the @a iRow. */ - ModelItem *child(int iRow) const; + UIApplianceModelItem *child(int iRow) const; /** Returns the row of the item in the parent. */ @@ -108,18 +108,18 @@ /** Holds the parent item reference. */ - ModelItem *m_pParentItem; + UIApplianceModelItem *m_pParentItem; /** Holds the list of children item instances. */ - QList m_childItems; + QList m_childItems; }; -/** ModelItem subclass representing Virtual System. */ -class VirtualSystemItem : public ModelItem +/** UIApplianceModelItem subclass representing Appliance Virtual System item. */ +class UIVirtualSystemItem : public UIApplianceModelItem { public: /** Constructs item passing @a iNumber and @a pParentItem to the base-class. - * @param enmDescription Brings the Virtual System Description. */ - VirtualSystemItem(int iNumber, CVirtualSystemDescription enmDescription, ModelItem *pParentItem); + * @param comDescription Brings the Virtual System Description. */ + UIVirtualSystemItem(int iNumber, CVirtualSystemDescription comDescription, UIApplianceModelItem *pParentItem); /** Returns the data stored under the given @a iRole for the item referred to by the @a iColumn. */ @@ -132,12 +132,12 @@ /** Holds the Virtual System Description. */ - CVirtualSystemDescription m_enmDescription; + CVirtualSystemDescription m_comDescription; }; -/** ModelItem subclass representing Virtual System item. */ -class HardwareItem : public ModelItem -{ - friend class VirtualSystemSortProxyModel; +/** UIApplianceModelItem subclass representing Appliance Virtual Hardware item. */ +class UIVirtualHardwareItem : public UIApplianceModelItem +{ + friend class UIApplianceSortProxyModel; /** Data roles. */ @@ -156,11 +156,11 @@ * @param strConfigValue Brings the configuration value. * @param strExtraConfigValue Brings the extra configuration value. */ - HardwareItem(int iNumber, - KVirtualSystemDescriptionType enmType, - const QString &strRef, - const QString &strOrigValue, - const QString &strConfigValue, - const QString &strExtraConfigValue, - ModelItem *pParentItem); + UIVirtualHardwareItem(int iNumber, + KVirtualSystemDescriptionType enmType, + const QString &strRef, + const QString &strOrigValue, + const QString &strConfigValue, + const QString &strExtraConfigValue, + UIApplianceModelItem *pParentItem); /** Returns the item flags for the given @a iColumn. */ @@ -190,5 +190,5 @@ private: - /** Holds the Virtual System description type. */ + /** Holds the Virtual System Description type. */ KVirtualSystemDescriptionType m_enmType; /** Holds something totally useless. */ @@ -210,8 +210,8 @@ /********************************************************************************************************************************* -* Class ModelItem implementation. * +* Class UIApplianceModelItem implementation. * *********************************************************************************************************************************/ -ModelItem::ModelItem(int iNumber, ApplianceModelItemType enmType, ModelItem *pParentItem /* = 0 */) +UIApplianceModelItem::UIApplianceModelItem(int iNumber, ApplianceModelItemType enmType, UIApplianceModelItem *pParentItem /* = 0 */) : m_iNumber(iNumber) , m_enmType(enmType) @@ -220,10 +220,10 @@ } -ModelItem::~ModelItem() +UIApplianceModelItem::~UIApplianceModelItem() { qDeleteAll(m_childItems); } -void ModelItem::appendChild(ModelItem *pChildItem) +void UIApplianceModelItem::appendChild(UIApplianceModelItem *pChildItem) { AssertPtr(pChildItem); @@ -231,23 +231,23 @@ } -ModelItem *ModelItem::child(int iRow) const +UIApplianceModelItem *UIApplianceModelItem::child(int iRow) const { return m_childItems.value(iRow); } -int ModelItem::row() const +int UIApplianceModelItem::row() const { if (m_pParentItem) - return m_pParentItem->m_childItems.indexOf(const_cast(this)); + return m_pParentItem->m_childItems.indexOf(const_cast(this)); return 0; } -int ModelItem::childCount() const +int UIApplianceModelItem::childCount() const { return m_childItems.count(); } -void ModelItem::putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) +void UIApplianceModelItem::putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) { for (int i = 0; i < childCount(); ++i) @@ -257,14 +257,14 @@ /********************************************************************************************************************************* -* Class VirtualSystemItem implementation. * +* Class UIVirtualSystemItem implementation. * *********************************************************************************************************************************/ -VirtualSystemItem::VirtualSystemItem(int iNumber, CVirtualSystemDescription enmDescription, ModelItem *pParentItem) - : ModelItem(iNumber, ApplianceModelItemType_VirtualSystem, pParentItem) - , m_enmDescription(enmDescription) -{ -} - -QVariant VirtualSystemItem::data(int iColumn, int iRole) const +UIVirtualSystemItem::UIVirtualSystemItem(int iNumber, CVirtualSystemDescription comDescription, UIApplianceModelItem *pParentItem) + : UIApplianceModelItem(iNumber, ApplianceModelItemType_VirtualSystem, pParentItem) + , m_comDescription(comDescription) +{ +} + +QVariant UIVirtualSystemItem::data(int iColumn, int iRole) const { QVariant value; @@ -275,30 +275,30 @@ } -void VirtualSystemItem::putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) +void UIVirtualSystemItem::putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) { /* Resize the vectors */ - unsigned long iCount = m_enmDescription.GetCount(); + unsigned long iCount = m_comDescription.GetCount(); finalStates.resize(iCount); finalValues.resize(iCount); finalExtraValues.resize(iCount); /* Recursively fill the vectors */ - ModelItem::putBack(finalStates, finalValues, finalExtraValues); + UIApplianceModelItem::putBack(finalStates, finalValues, finalExtraValues); /* Set all final values at once */ - m_enmDescription.SetFinalValues(finalStates, finalValues, finalExtraValues); + m_comDescription.SetFinalValues(finalStates, finalValues, finalExtraValues); } /********************************************************************************************************************************* -* Class HardwareItem implementation. * +* Class UIVirtualHardwareItem implementation. * *********************************************************************************************************************************/ -HardwareItem::HardwareItem(int iNumber, - KVirtualSystemDescriptionType enmType, - const QString &strRef, - const QString &aOrigValue, - const QString &strConfigValue, - const QString &strExtraConfigValue, - ModelItem *pParentItem) - : ModelItem(iNumber, ApplianceModelItemType_Hardware, pParentItem) +UIVirtualHardwareItem::UIVirtualHardwareItem(int iNumber, + KVirtualSystemDescriptionType enmType, + const QString &strRef, + const QString &aOrigValue, + const QString &strConfigValue, + const QString &strExtraConfigValue, + UIApplianceModelItem *pParentItem) + : UIApplianceModelItem(iNumber, ApplianceModelItemType_VirtualHardware, pParentItem) , m_enmType(enmType) , m_strRef(strRef) @@ -312,5 +312,5 @@ } -Qt::ItemFlags HardwareItem::itemFlags(int iColumn) const +Qt::ItemFlags UIVirtualHardwareItem::itemFlags(int iColumn) const { Qt::ItemFlags enmFlags = 0; @@ -346,5 +346,5 @@ } -bool HardwareItem::setData(int iColumn, const QVariant &value, int iRole) +bool UIVirtualHardwareItem::setData(int iColumn, const QVariant &value, int iRole) { bool fDone = false; @@ -378,5 +378,5 @@ } -QVariant HardwareItem::data(int iColumn, int iRole) const +QVariant UIVirtualHardwareItem::data(int iColumn, int iRole) const { QVariant value; @@ -529,10 +529,10 @@ break; } - case HardwareItem::TypeRole: + case UIVirtualHardwareItem::TypeRole: { value = m_enmType; break; } - case HardwareItem::ModifiedRole: + case UIVirtualHardwareItem::ModifiedRole: { if (iColumn == ApplianceViewSection_ConfigValue) @@ -544,5 +544,5 @@ } -QWidget *HardwareItem::createEditor(QWidget *pParent, const QStyleOptionViewItem & /* styleOption */, const QModelIndex &idx) const +QWidget *UIVirtualHardwareItem::createEditor(QWidget *pParent, const QStyleOptionViewItem & /* styleOption */, const QModelIndex &idx) const { QWidget *pEditor = 0; @@ -653,5 +653,5 @@ } -bool HardwareItem::setEditorData(QWidget *pEditor, const QModelIndex & /* idx */) const +bool UIVirtualHardwareItem::setEditorData(QWidget *pEditor, const QModelIndex & /* idx */) const { bool fDone = false; @@ -744,5 +744,5 @@ } -bool HardwareItem::setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex & idx) +bool UIVirtualHardwareItem::setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex & idx) { bool fDone = false; @@ -791,5 +791,5 @@ * are child's of this item. */ QModelIndexList list = pModel->match(c0Index, - HardwareItem::TypeRole, + UIVirtualHardwareItem::TypeRole, KVirtualSystemDescriptionType_HardDiskImage, -1, @@ -880,5 +880,5 @@ } -void HardwareItem::restoreDefaults() +void UIVirtualHardwareItem::restoreDefaults() { m_strConfigValue = m_strConfigDefaultValue; @@ -886,26 +886,26 @@ } -void HardwareItem::putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) +void UIVirtualHardwareItem::putBack(QVector &finalStates, QVector &finalValues, QVector &finalExtraValues) { finalStates[m_iNumber] = m_checkState == Qt::Checked; finalValues[m_iNumber] = m_strConfigValue; finalExtraValues[m_iNumber] = m_strExtraConfigValue; - ModelItem::putBack(finalStates, finalValues, finalExtraValues); + UIApplianceModelItem::putBack(finalStates, finalValues, finalExtraValues); } /********************************************************************************************************************************* -* Class VirtualSystemModel implementation. * +* Class UIApplianceModel implementation. * *********************************************************************************************************************************/ -VirtualSystemModel::VirtualSystemModel(QVector& aVSDs, QObject *pParent /* = 0 */) +UIApplianceModel::UIApplianceModel(QVector& aVSDs, QObject *pParent /* = 0 */) : QAbstractItemModel(pParent) { - m_pRootItem = new ModelItem(0, ApplianceModelItemType_Root); + m_pRootItem = new UIApplianceModelItem(0, ApplianceModelItemType_Root); for (int iVSDIndex = 0; iVSDIndex < aVSDs.size(); ++iVSDIndex) { CVirtualSystemDescription vsd = aVSDs[iVSDIndex]; - VirtualSystemItem *pVirtualSystemItem = new VirtualSystemItem(iVSDIndex, vsd, m_pRootItem); + UIVirtualSystemItem *pVirtualSystemItem = new UIVirtualSystemItem(iVSDIndex, vsd, m_pRootItem); m_pRootItem->appendChild(pVirtualSystemItem); @@ -918,5 +918,5 @@ QList hdIndexes; - QMap controllerMap; + QMap controllerMap; vsd.GetDescription(types, refs, origValues, configValues, extraConfigValues); for (int i = 0; i < types.size(); ++i) @@ -928,5 +928,5 @@ else { - HardwareItem *pHardwareItem = new HardwareItem(i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], pVirtualSystemItem); + UIVirtualHardwareItem *pHardwareItem = new UIVirtualHardwareItem(i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], pVirtualSystemItem); pVirtualSystemItem->appendChild(pHardwareItem); /* Save the hard disk controller types in an extra map */ @@ -947,9 +947,9 @@ { /* Get the controller */ - HardwareItem *pControllerItem = controllerMap[rx.cap(1).toInt()]; + UIVirtualHardwareItem *pControllerItem = controllerMap[rx.cap(1).toInt()]; if (pControllerItem) { /* New hardware item as child of the controller */ - HardwareItem *pStorageItem = new HardwareItem(i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], pControllerItem); + UIVirtualHardwareItem *pStorageItem = new UIVirtualHardwareItem(i, types[i], refs[i], origValues[i], configValues[i], extraConfigValues[i], pControllerItem); pControllerItem->appendChild(pStorageItem); } @@ -959,5 +959,5 @@ } -VirtualSystemModel::~VirtualSystemModel() +UIApplianceModel::~UIApplianceModel() { if (m_pRootItem) @@ -965,17 +965,17 @@ } -QModelIndex VirtualSystemModel::index(int iRow, int iColumn, const QModelIndex &parentIdx /* = QModelIndex() */) const +QModelIndex UIApplianceModel::index(int iRow, int iColumn, const QModelIndex &parentIdx /* = QModelIndex() */) const { if (!hasIndex(iRow, iColumn, parentIdx)) return QModelIndex(); - ModelItem *pParentItem; + UIApplianceModelItem *pParentItem; if (!parentIdx.isValid()) pParentItem = m_pRootItem; else - pParentItem = static_cast(parentIdx.internalPointer()); - - ModelItem *pChildItem = pParentItem->child(iRow); + pParentItem = static_cast(parentIdx.internalPointer()); + + UIApplianceModelItem *pChildItem = pParentItem->child(iRow); if (pChildItem) return createIndex(iRow, iColumn, pChildItem); @@ -984,11 +984,11 @@ } -QModelIndex VirtualSystemModel::parent(const QModelIndex &idx) const +QModelIndex UIApplianceModel::parent(const QModelIndex &idx) const { if (!idx.isValid()) return QModelIndex(); - ModelItem *pChildItem = static_cast(idx.internalPointer()); - ModelItem *pParentItem = pChildItem->parent(); + UIApplianceModelItem *pChildItem = static_cast(idx.internalPointer()); + UIApplianceModelItem *pParentItem = pChildItem->parent(); if (pParentItem == m_pRootItem) @@ -998,7 +998,7 @@ } -int VirtualSystemModel::rowCount(const QModelIndex &parentIdx /* = QModelIndex() */) const -{ - ModelItem *pParentItem; +int UIApplianceModel::rowCount(const QModelIndex &parentIdx /* = QModelIndex() */) const +{ + UIApplianceModelItem *pParentItem; if (parentIdx.column() > 0) return 0; @@ -1007,28 +1007,28 @@ pParentItem = m_pRootItem; else - pParentItem = static_cast(parentIdx.internalPointer()); + pParentItem = static_cast(parentIdx.internalPointer()); return pParentItem->childCount(); } -int VirtualSystemModel::columnCount(const QModelIndex &parentIdx /* = QModelIndex() */) const +int UIApplianceModel::columnCount(const QModelIndex &parentIdx /* = QModelIndex() */) const { if (parentIdx.isValid()) - return static_cast(parentIdx.internalPointer())->columnCount(); + return static_cast(parentIdx.internalPointer())->columnCount(); else return m_pRootItem->columnCount(); } -Qt::ItemFlags VirtualSystemModel::flags(const QModelIndex &idx) const +Qt::ItemFlags UIApplianceModel::flags(const QModelIndex &idx) const { if (!idx.isValid()) return 0; - ModelItem *pItem = static_cast(idx.internalPointer()); + UIApplianceModelItem *pItem = static_cast(idx.internalPointer()); return Qt::ItemIsEnabled | Qt::ItemIsSelectable | pItem->itemFlags(idx.column()); } -QVariant VirtualSystemModel::headerData(int iSection, Qt::Orientation enmOrientation, int iRole) const +QVariant UIApplianceModel::headerData(int iSection, Qt::Orientation enmOrientation, int iRole) const { if (iRole != Qt::DisplayRole || @@ -1045,25 +1045,25 @@ } -bool VirtualSystemModel::setData(const QModelIndex &idx, const QVariant &value, int iRole) +bool UIApplianceModel::setData(const QModelIndex &idx, const QVariant &value, int iRole) { if (!idx.isValid()) return false; - ModelItem *pTtem = static_cast(idx.internalPointer()); + UIApplianceModelItem *pTtem = static_cast(idx.internalPointer()); return pTtem->setData(idx.column(), value, iRole); } -QVariant VirtualSystemModel::data(const QModelIndex &idx, int iRole /* = Qt::DisplayRole */) const +QVariant UIApplianceModel::data(const QModelIndex &idx, int iRole /* = Qt::DisplayRole */) const { if (!idx.isValid()) return QVariant(); - ModelItem *pTtem = static_cast(idx.internalPointer()); + UIApplianceModelItem *pTtem = static_cast(idx.internalPointer()); return pTtem->data(idx.column(), iRole); } -QModelIndex VirtualSystemModel::buddy(const QModelIndex &idx) const +QModelIndex UIApplianceModel::buddy(const QModelIndex &idx) const { if (!idx.isValid()) @@ -1076,12 +1076,12 @@ } -void VirtualSystemModel::restoreDefaults(const QModelIndex &parentIdx /* = QModelIndex() */) -{ - ModelItem *pParentItem; +void UIApplianceModel::restoreDefaults(const QModelIndex &parentIdx /* = QModelIndex() */) +{ + UIApplianceModelItem *pParentItem; if (!parentIdx.isValid()) pParentItem = m_pRootItem; else - pParentItem = static_cast(parentIdx.internalPointer()); + pParentItem = static_cast(parentIdx.internalPointer()); for (int i = 0; i < pParentItem->childCount(); ++i) @@ -1093,5 +1093,5 @@ } -void VirtualSystemModel::putBack() +void UIApplianceModel::putBack() { QVector v1; @@ -1103,8 +1103,8 @@ /********************************************************************************************************************************* -* Class VirtualSystemDelegate implementation. * +* Class UIApplianceDelegate implementation. * *********************************************************************************************************************************/ -VirtualSystemDelegate::VirtualSystemDelegate(QAbstractProxyModel *pProxy, QObject *pParent /* = 0 */) +UIApplianceDelegate::UIApplianceDelegate(QAbstractProxyModel *pProxy, QObject *pParent /* = 0 */) : QItemDelegate(pParent) , m_pProxy(pProxy) @@ -1112,5 +1112,5 @@ } -QWidget *VirtualSystemDelegate::createEditor(QWidget *pParent, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const +QWidget *UIApplianceDelegate::createEditor(QWidget *pParent, const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const { if (!idx.isValid()) @@ -1121,5 +1121,5 @@ index = m_pProxy->mapToSource(idx); - ModelItem *pItem = static_cast(index.internalPointer()); + UIApplianceModelItem *pItem = static_cast(index.internalPointer()); QWidget *pEditor = pItem->createEditor(pParent, styleOption, index); @@ -1134,5 +1134,5 @@ } -void VirtualSystemDelegate::setEditorData(QWidget *pEditor, const QModelIndex &idx) const +void UIApplianceDelegate::setEditorData(QWidget *pEditor, const QModelIndex &idx) const { if (!idx.isValid()) @@ -1143,5 +1143,5 @@ index = m_pProxy->mapToSource(idx); - ModelItem *pItem = static_cast(index.internalPointer()); + UIApplianceModelItem *pItem = static_cast(index.internalPointer()); if (!pItem->setEditorData(pEditor, index)) @@ -1149,5 +1149,5 @@ } -void VirtualSystemDelegate::setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex &idx) const +void UIApplianceDelegate::setModelData(QWidget *pEditor, QAbstractItemModel *pModel, const QModelIndex &idx) const { if (!idx.isValid()) @@ -1158,10 +1158,10 @@ index = m_pProxy->mapToSource(idx); - ModelItem *pItem = static_cast(index.internalPointer()); + UIApplianceModelItem *pItem = static_cast(index.internalPointer()); if (!pItem->setModelData(pEditor, pModel, idx)) QItemDelegate::setModelData(pEditor, pModel, idx); } -void VirtualSystemDelegate::updateEditorGeometry(QWidget *pEditor, const QStyleOptionViewItem &styleOption, const QModelIndex & /* idx */) const +void UIApplianceDelegate::updateEditorGeometry(QWidget *pEditor, const QStyleOptionViewItem &styleOption, const QModelIndex & /* idx */) const { if (pEditor) @@ -1169,5 +1169,5 @@ } -QSize VirtualSystemDelegate::sizeHint(const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const +QSize UIApplianceDelegate::sizeHint(const QStyleOptionViewItem &styleOption, const QModelIndex &idx) const { QSize size = QItemDelegate::sizeHint(styleOption, idx); @@ -1182,5 +1182,5 @@ #ifdef VBOX_WS_MAC -bool VirtualSystemDelegate::eventFilter(QObject *pObject, QEvent *pEvent) +bool UIApplianceDelegate::eventFilter(QObject *pObject, QEvent *pEvent) { if (pEvent->type() == QEvent::FocusOut) @@ -1204,9 +1204,9 @@ /********************************************************************************************************************************* -* Class VirtualSystemSortProxyModel implementation. * +* Class UIApplianceSortProxyModel implementation. * *********************************************************************************************************************************/ /* static */ -KVirtualSystemDescriptionType VirtualSystemSortProxyModel::s_aSortList[] = +KVirtualSystemDescriptionType UIApplianceSortProxyModel::s_aSortList[] = { KVirtualSystemDescriptionType_Name, @@ -1232,10 +1232,10 @@ }; -VirtualSystemSortProxyModel::VirtualSystemSortProxyModel(QObject *pParent) +UIApplianceSortProxyModel::UIApplianceSortProxyModel(QObject *pParent) : QSortFilterProxyModel(pParent) { } -bool VirtualSystemSortProxyModel::filterAcceptsRow(int iSourceRow, const QModelIndex &srcParenIdx) const +bool UIApplianceSortProxyModel::filterAcceptsRow(int iSourceRow, const QModelIndex &srcParenIdx) const { /* By default enable all, we will explicitly filter out below */ @@ -1245,9 +1245,9 @@ if (i.isValid()) { - ModelItem *pItem = static_cast(i.internalPointer()); + UIApplianceModelItem *pItem = static_cast(i.internalPointer()); /* We filter hardware types only */ - if (pItem->type() == ApplianceModelItemType_Hardware) - { - HardwareItem *hwItem = static_cast(pItem); + if (pItem->type() == ApplianceModelItemType_VirtualHardware) + { + UIVirtualHardwareItem *hwItem = static_cast(pItem); /* The license type shouldn't be displayed */ if (m_aFilteredList.contains(hwItem->m_enmType)) @@ -1259,5 +1259,5 @@ } -bool VirtualSystemSortProxyModel::lessThan(const QModelIndex &leftIdx, const QModelIndex &rightIdx) const +bool UIApplianceSortProxyModel::lessThan(const QModelIndex &leftIdx, const QModelIndex &rightIdx) const { if (!leftIdx.isValid() || @@ -1265,14 +1265,14 @@ return false; - ModelItem *pLeftItem = static_cast(leftIdx.internalPointer()); - ModelItem *pRightItem = static_cast(rightIdx.internalPointer()); + UIApplianceModelItem *pLeftItem = static_cast(leftIdx.internalPointer()); + UIApplianceModelItem *pRightItem = static_cast(rightIdx.internalPointer()); /* We sort hardware types only */ - if (!(pLeftItem->type() == ApplianceModelItemType_Hardware && - pRightItem->type() == ApplianceModelItemType_Hardware)) + if (!(pLeftItem->type() == ApplianceModelItemType_VirtualHardware && + pRightItem->type() == ApplianceModelItemType_VirtualHardware)) return false; - HardwareItem *pHwLeft = static_cast(pLeftItem); - HardwareItem *pHwRight = static_cast(pRightItem); + UIVirtualHardwareItem *pHwLeft = static_cast(pLeftItem); + UIVirtualHardwareItem *pHwRight = static_cast(pRightItem); for (unsigned int i = 0; i < RT_ELEMENTS(s_aSortList); ++i) Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64691) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h (revision 64692) @@ -33,5 +33,5 @@ /* Forward declarations: */ -class ModelItem; +class UIApplianceModelItem; class QCheckBox; class QLabel; @@ -54,18 +54,18 @@ ApplianceModelItemType_Root, ApplianceModelItemType_VirtualSystem, - ApplianceModelItemType_Hardware -}; - - -/** QAbstractItemModel subclass used as Virtual System model. */ -class VirtualSystemModel : public QAbstractItemModel -{ -public: - - /** Constructs the Virtual System model passing @a pParent to the base-class. + ApplianceModelItemType_VirtualHardware +}; + + +/** QAbstractItemModel subclass used as Appliance model. */ +class UIApplianceModel : public QAbstractItemModel +{ +public: + + /** Constructs the Appliance model passing @a pParent to the base-class. * @param aVSDs Brings the Virtual System descriptions. */ - VirtualSystemModel(QVector& aVSDs, QObject *pParent = 0); - /** Destructs the Virtual System model. */ - ~VirtualSystemModel(); + UIApplianceModel(QVector& aVSDs, QObject *pParent = 0); + /** Destructs the Appliance model. */ + ~UIApplianceModel(); /** Returns the index of the item in the model specified by the given @a iRow, @a iColumn and @a parentIdx. */ @@ -101,16 +101,16 @@ /** Holds the root item reference. */ - ModelItem *m_pRootItem; -}; - - -/** QItemDelegate subclass used to create various Virtual System model editors. */ -class VirtualSystemDelegate : public QItemDelegate -{ -public: - - /** Constructs the Virtual System Delegate passing @a pParent to the base-class. + UIApplianceModelItem *m_pRootItem; +}; + + +/** QItemDelegate subclass used to create various Appliance model editors. */ +class UIApplianceDelegate : public QItemDelegate +{ +public: + + /** Constructs the Appliance Delegate passing @a pParent to the base-class. * @param pProxy Brings the proxy model reference used to redirect requests to. */ - VirtualSystemDelegate(QAbstractProxyModel *pProxy, QObject *pParent = 0); + UIApplianceDelegate(QAbstractProxyModel *pProxy, QObject *pParent = 0); /** Returns the widget used to edit the item specified by @a idx for editing. @@ -144,11 +144,11 @@ -/** QSortFilterProxyModel subclass used as the Virtual System Sorting model. */ -class VirtualSystemSortProxyModel : public QSortFilterProxyModel -{ -public: - - /** Constructs the Virtual System Sorting model passing @a pParent to the base-class. */ - VirtualSystemSortProxyModel(QObject *pParent = 0); +/** QSortFilterProxyModel subclass used as the Appliance Sorting Proxy model. */ +class UIApplianceSortProxyModel : public QSortFilterProxyModel +{ +public: + + /** Constructs the Appliance Sorting Proxy model passing @a pParent to the base-class. */ + UIApplianceSortProxyModel(QObject *pParent = 0); protected: @@ -205,6 +205,6 @@ /** Holds the currently set appliance reference. */ CAppliance *m_pAppliance; - /** Holds the Virtual System model reference. */ - VirtualSystemModel *m_pModel; + /** Holds the Appliance model reference. */ + UIApplianceModel *m_pModel; /** Holds the information pane instance. */ @@ -224,5 +224,5 @@ private: - /** Performs Virtual System settings initialization. */ + /** Performs Appliance settings initialization. */ static void initSystemSettings(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (revision 64691) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp (revision 64692) @@ -38,9 +38,9 @@ // ExportSortProxyModel -class ExportSortProxyModel: public VirtualSystemSortProxyModel +class ExportSortProxyModel: public UIApplianceSortProxyModel { public: ExportSortProxyModel(QObject *pParent = NULL) - : VirtualSystemSortProxyModel(pParent) + : UIApplianceSortProxyModel(pParent) { m_aFilteredList @@ -86,5 +86,5 @@ QVector vsds = m_pAppliance->GetVirtualSystemDescriptions(); - m_pModel = new VirtualSystemModel(vsds, this); + m_pModel = new UIApplianceModel(vsds, this); ExportSortProxyModel *pProxy = new ExportSortProxyModel(this); @@ -92,5 +92,5 @@ pProxy->sort(ApplianceViewSection_Description, Qt::DescendingOrder); - VirtualSystemDelegate *pDelegate = new VirtualSystemDelegate(pProxy, this); + UIApplianceDelegate *pDelegate = new UIApplianceDelegate(pProxy, this); /* Set our own model */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (revision 64691) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp (revision 64692) @@ -39,9 +39,9 @@ // ImportSortProxyModel -class ImportSortProxyModel: public VirtualSystemSortProxyModel +class ImportSortProxyModel: public UIApplianceSortProxyModel { public: ImportSortProxyModel(QObject *pParent = NULL) - : VirtualSystemSortProxyModel(pParent) + : UIApplianceSortProxyModel(pParent) { m_aFilteredList << KVirtualSystemDescriptionType_License; @@ -92,5 +92,5 @@ QVector vsds = m_pAppliance->GetVirtualSystemDescriptions(); - m_pModel = new VirtualSystemModel(vsds, this); + m_pModel = new UIApplianceModel(vsds, this); ImportSortProxyModel *pProxy = new ImportSortProxyModel(this); @@ -98,5 +98,5 @@ pProxy->sort(ApplianceViewSection_Description, Qt::DescendingOrder); - VirtualSystemDelegate *pDelegate = new VirtualSystemDelegate(pProxy, this); + UIApplianceDelegate *pDelegate = new UIApplianceDelegate(pProxy, this); /* Set our own model */