VirtualBox

Changeset 38410 in vbox


Ignore:
Timestamp:
Aug 11, 2011 9:34:18 AM (13 years ago)
Author:
vboxsync
Message:

FE/Qt4: VBoxExportApplianceWgt -> UIApplianceExportEditorWidget; Code Style cleanup

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r38384 r38410  
    345345        src/widgets/UISpecialControls.h \
    346346        src/widgets/UIApplianceEditorWidget.h \
    347         src/widgets/VBoxExportApplianceWgt.h \
     347        src/widgets/UIApplianceExportEditorWidget.h \
    348348        src/widgets/VBoxFilePathSelectorWidget.h \
    349349        src/widgets/VBoxImportApplianceWgt.h \
     
    516516        src/widgets/UIToolBar.cpp \
    517517        src/widgets/UIApplianceEditorWidget.cpp \
    518         src/widgets/VBoxExportApplianceWgt.cpp \
     518        src/widgets/UIApplianceExportEditorWidget.cpp \
    519519        src/widgets/VBoxFilePathSelectorWidget.cpp \
    520520        src/widgets/VBoxGuestRAMSlider.cpp \
  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r38384 r38410  
    201201#include "VBoxDefs.h"
    202202#include "VBoxDownloaderWgt.h"
    203 #include "VBoxExportApplianceWgt.h"
     203#include "UIApplianceExportEditorWidget.h"
    204204#include "VBoxExportApplianceWzd.h"
    205205#include "VBoxFBOverlay.h"
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp

    r38384 r38410  
    33 *
    44 * VBox frontends: Qt4 GUI ("VirtualBox"):
    5  * VBoxExportApplianceWgt class implementation
     5 * UIApplianceExportEditorWidget class implementation
    66 */
    77
    88/*
    9  * Copyright (C) 2009 Oracle Corporation
     9 * Copyright (C) 2009-2011 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
     
    1919
    2020/* VBox includes */
    21 #include "VBoxExportApplianceWgt.h"
     21#include "UIApplianceExportEditorWidget.h"
    2222#include "VBoxGlobal.h"
    2323#include "UIMessageCenter.h"
     
    2929{
    3030public:
    31     ExportSortProxyModel (QObject *aParent = NULL)
    32       : VirtualSystemSortProxyModel (aParent)
     31    ExportSortProxyModel(QObject *pParent = NULL)
     32      : VirtualSystemSortProxyModel(pParent)
    3333    {
    3434        m_filterList
     
    4949
    5050////////////////////////////////////////////////////////////////////////////////
    51 // VBoxExportApplianceWgt
     51// UIApplianceExportEditorWidget
    5252
    53 VBoxExportApplianceWgt::VBoxExportApplianceWgt (QWidget *aParent /* = NULL */)
    54   : UIApplianceEditorWidget (aParent)
     53UIApplianceExportEditorWidget::UIApplianceExportEditorWidget(QWidget *pParent /* = NULL */)
     54  : UIApplianceEditorWidget(pParent)
    5555{
    5656}
    5757
    58 CAppliance* VBoxExportApplianceWgt::init()
     58CAppliance* UIApplianceExportEditorWidget::init()
    5959{
    6060    if (m_pAppliance)
     
    6767}
    6868
    69 void VBoxExportApplianceWgt::populate()
     69void UIApplianceExportEditorWidget::populate()
    7070{
    7171    if (m_pModel)
     
    7474    QVector<CVirtualSystemDescription> vsds = m_pAppliance->GetVirtualSystemDescriptions();
    7575
    76     m_pModel = new VirtualSystemModel (vsds, this);
     76    m_pModel = new VirtualSystemModel(vsds, this);
    7777
    78     ExportSortProxyModel *proxy = new ExportSortProxyModel (this);
    79     proxy->setSourceModel (m_pModel);
    80     proxy->sort (DescriptionSection, Qt::DescendingOrder);
     78    ExportSortProxyModel *pProxy = new ExportSortProxyModel(this);
     79    pProxy->setSourceModel(m_pModel);
     80    pProxy->sort(DescriptionSection, Qt::DescendingOrder);
    8181
    82     VirtualSystemDelegate *delegate = new VirtualSystemDelegate (proxy, this);
     82    VirtualSystemDelegate *pDelegate = new VirtualSystemDelegate(pProxy, this);
    8383
    8484    /* Set our own model */
    85     m_pTvSettings->setModel (proxy);
     85    m_pTvSettings->setModel(pProxy);
    8686    /* Set our own delegate */
    87     m_pTvSettings->setItemDelegate (delegate);
     87    m_pTvSettings->setItemDelegate(pDelegate);
    8888    /* For now we hide the original column. This data is displayed as tooltip
    8989       also. */
    90     m_pTvSettings->setColumnHidden (OriginalValueSection, true);
     90    m_pTvSettings->setColumnHidden(OriginalValueSection, true);
    9191    m_pTvSettings->expandAll();
    9292
     
    9797    {
    9898        foreach (const QString& text, warnings)
    99             mWarningTextEdit->append ("- " + text);
     99            mWarningTextEdit->append("- " + text);
    100100        fWarningsEnabled = true;
    101101    }
    102     m_pWarningWidget->setShown (fWarningsEnabled);
     102    m_pWarningWidget->setShown(fWarningsEnabled);
    103103}
    104104
    105 void VBoxExportApplianceWgt::prepareExport()
     105void UIApplianceExportEditorWidget::prepareExport()
    106106{
    107107    if (m_pAppliance)
  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h

    r38384 r38410  
    22 *
    33 * VBox frontends: Qt4 GUI ("VirtualBox"):
    4  * VBoxExportApplianceWgt class declaration
     4 * UIApplianceExportEditorWidget class declaration
    55 */
    66
    77/*
    8  * Copyright (C) 2009 Oracle Corporation
     8 * Copyright (C) 2009-2011 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
     
    1717 */
    1818
    19 #ifndef __VBoxExportApplianceWgt_h__
    20 #define __VBoxExportApplianceWgt_h__
     19#ifndef __UIApplianceExportEditorWidget_h__
     20#define __UIApplianceExportEditorWidget_h__
    2121
    2222#include "UIApplianceEditorWidget.h"
    2323
    24 class VBoxExportApplianceWgt : public UIApplianceEditorWidget
     24class UIApplianceExportEditorWidget: public UIApplianceEditorWidget
    2525{
    2626    Q_OBJECT;
    2727
    2828public:
    29     VBoxExportApplianceWgt (QWidget *aParent = NULL);
     29    UIApplianceExportEditorWidget(QWidget *pParent = NULL);
    3030
    31     CAppliance* init();
     31    CAppliance *init();
    3232
    3333    void populate();
     
    3535};
    3636
    37 #endif /* __VBoxExportApplianceWgt_h__ */
     37#endif /* __UIApplianceExportEditorWidget_h__ */
    3838
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.h

    r38343 r38410  
    3838Q_DECLARE_METATYPE(StorageType);
    3939
    40 typedef QPointer<VBoxExportApplianceWgt> ExportAppliancePointer;
     40typedef QPointer<UIApplianceExportEditorWidget> ExportAppliancePointer;
    4141Q_DECLARE_METATYPE(ExportAppliancePointer);
    4242
  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui

    r38343 r38410  
    4545   </item>
    4646   <item>
    47     <widget class="VBoxExportApplianceWgt" name="m_pApplianceWidget" native="true">
     47    <widget class="UIApplianceExportEditorWidget" name="m_pApplianceWidget" native="true">
    4848     <property name="sizePolicy">
    4949      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
     
    6363  </customwidget>
    6464  <customwidget>
    65    <class>VBoxExportApplianceWgt</class>
     65   <class>UIApplianceExportEditorWidget</class>
    6666   <extends>QWidget</extends>
    67    <header>VBoxExportApplianceWgt.h</header>
     67   <header>UIApplianceExportEditorWidget.h</header>
    6868   <container>1</container>
    6969  </customwidget>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette