VirtualBox

Changeset 32760 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Sep 24, 2010 1:41:31 PM (14 years ago)
Author:
vboxsync
Message:

FE/Qt4: coding style; renaming; adding extra cpp file

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
21 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r32758 r32760  
    470470        src/widgets/UIPopupBox.cpp \
    471471        src/widgets/UISpecialControls.cpp \
     472        src/widgets/UIToolBar.cpp \
    472473        src/widgets/VBoxApplianceEditorWgt.cpp \
    473474        src/widgets/VBoxBootTable.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

    r31568 r32760  
    3939#include "UINewHDWzd.h"
    4040#include "VBoxProblemReporter.h"
    41 #include "VBoxToolBar.h"
     41#include "UIToolBar.h"
    4242#include "QIFileDialog.h"
    4343#include "QILabel.h"
    … …  
    318318
    319319    /* Toolbar composing */
    320     mToolBar = new VBoxToolBar (this);
     320    mToolBar = new UIToolBar (this);
    321321    mToolBar->setIconSize (QSize (22, 22));
    322322    mToolBar->setToolButtonStyle (Qt::ToolButtonTextUnderIcon);

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.h

    r30677 r32760  
    3131class MediaItem;
    3232class VBoxProgressBar;
    33 class VBoxToolBar;
     33class UIToolBar;
    3434
    3535class VBoxMediaManagerDlg : public QIWithRetranslateUI2<QIMainDialog>,
    … …  
    152152    QMenu       *mActionsContextMenu;
    153153    QMenu       *mActionsMenu;
    154     VBoxToolBar *mToolBar;
     154    UIToolBar *mToolBar;
    155155    QAction     *mNewAction;
    156156    QAction     *mAddAction;

  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r32667 r32760  
    244244#include "VBoxSpecialControls.h"
    245245#include "VBoxTakeSnapshotDlg.h"
    246 #include "VBoxToolBar.h"
     246#include "UIToolBar.h"
    247247#include "VBoxUpdateDlg.h"
    248248#include "VBoxUtils-darwin.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

    r31500 r32760  
    3131#include "UIVirtualBoxEventHandler.h"
    3232#include "VBoxSnapshotsWgt.h"
    33 #include "VBoxToolBar.h"
     33#include "UIToolBar.h"
    3434
    3535#include "VBoxUtils.h"
    … …  
    13251325};
    13261326
    1327 UIVMDesktop::UIVMDesktop(VBoxToolBar *pToolBar, QAction *pRefreshAction, QWidget *pParent /* = 0 */)
     1327UIVMDesktop::UIVMDesktop(UIToolBar *pToolBar, QAction *pRefreshAction, QWidget *pParent /* = 0 */)
    13281328  : QIWithRetranslateUI<QWidget>(pParent)
    13291329{

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h

    r31500 r32760  
    3333class UIVMItem;
    3434class VBoxSnapshotsWgt;
    35 class VBoxToolBar;
     35class UIToolBar;
    3636
    3737class UIVMDesktop: public QIWithRetranslateUI<QWidget>
    … …  
    4141public:
    4242
    43     UIVMDesktop(VBoxToolBar *pToolBar, QAction *pRefreshAction, QWidget *pParent = 0);
     43    UIVMDesktop(UIToolBar *pToolBar, QAction *pRefreshAction, QWidget *pParent = 0);
    4444
    4545    void updateDetails(UIVMItem *pVMItem, const CMachine& machine);

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

    r32759 r32760  
    3535#include "VBoxSelectorWnd.h"
    3636#include "UISettingsDialogSpecific.h"
    37 #include "VBoxToolBar.h"
     37#include "UIToolBar.h"
    3838#include "VBoxVMLogViewer.h"
    3939
    … …  
    4242# include "UIExtraDataEventHandler.h"
    4343#endif /* VBOX_GUI_WITH_SYSTRAY */
     44
     45#ifdef Q_WS_MAC
     46# include "VBoxUtils.h"
     47#endif
    4448
    4549/* Global includes */
    … …  
    162166
    163167    /* VM list toolbar */
    164     mVMToolBar = new VBoxToolBar(this);
     168    mVMToolBar = new UIToolBar(this);
    165169    mVMToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
    166170#ifndef Q_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h

    r32759 r32760  
    4040class UIVMItemModel;
    4141class UIVMListView;
    42 class VBoxToolBar;
     42class UIToolBar;
    4343class VBoxTrayIcon;
    4444class VBoxVMLogViewer;
    … …  
    144144    UIBar *m_pBar;
    145145#endif /* !Q_WS_MAC */
    146     VBoxToolBar *mVMToolBar;
     146    UIToolBar *mVMToolBar;
    147147
    148148    /* VM list context menu */

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

    r31070 r32760  
    2727#include "VBoxSnapshotsWgt.h"
    2828#include "VBoxTakeSnapshotDlg.h"
    29 #include "VBoxToolBar.h"
     29#include "UIToolBar.h"
    3030#include "UIVirtualBoxEventHandler.h"
    3131
    … …  
    3535#include <QMenu>
    3636#include <QScrollBar>
     37#include <QWindowsStyle>
    3738
    3839#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    … …  
    349350
    350351    /* ToolBar creation */
    351     VBoxToolBar *toolBar = new VBoxToolBar (this);
     352    UIToolBar *toolBar = new UIToolBar (this);
    352353    toolBar->setUsesTextLabel (false);
    353354    toolBar->setIconSize (QSize (22, 22));

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

    r32667 r32760  
    3131#include "VBoxSettingsSelector.h"
    3232#include "VBoxSettingsPage.h"
    33 #include "VBoxToolBar.h"
     33#include "UIToolBar.h"
    3434#include "UIIconPool.h"
    3535#ifdef Q_WS_MAC
    … …  
    8181    /* Create modern tool-bar selector: */
    8282    m_pSelector = new VBoxSettingsToolBarSelector(this);
    83     static_cast<VBoxToolBar*>(m_pSelector->widget())->setMacToolbar();
     83    static_cast<UIToolBar*>(m_pSelector->widget())->setMacToolbar();
    8484    addToolBar(qobject_cast<QToolBar*>(m_pSelector->widget()));
    8585    /* No title in this mode, we change the title of the window: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp

    r29972 r32760  
    2626#include "VBoxSettingsPage.h"
    2727#include "VBoxGlobal.h"
    28 #include "VBoxToolBar.h"
     28#include "UIToolBar.h"
    2929#include "QITreeWidget.h"
    3030#include "QITabWidget.h"
    … …  
    371371{
    372372    /* Init the toolbar */
    373     mTbSelector = new VBoxToolBar (aParent);
     373    mTbSelector = new UIToolBar (aParent);
    374374    mTbSelector->setUsesTextLabel (true);
    375375    mTbSelector->setIconSize (QSize (32, 32));

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.h

    r28800 r32760  
    2424
    2525class QITreeWidget;
    26 class VBoxToolBar;
     26class UIToolBar;
    2727class VBoxSettingsPage;
    2828class SelectorItem;
    … …  
    168168
    169169    /* Private member vars */
    170     VBoxToolBar *mTbSelector;
     170    UIToolBar *mTbSelector;
    171171    QActionGroup *mActionGroup;
    172172};

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsNetwork.ui

    r28800 r32760  
    9797      </property>
    9898      <item>
    99        <widget class="VBoxToolBar" name="mTbActions">
     99       <widget class="UIToolBar" name="mTbActions">
    100100        <property name="orientation">
    101101         <enum>Qt::Horizontal</enum>
    … …  
    158158 <customwidgets>
    159159  <customwidget>
    160    <class>VBoxToolBar</class>
     160   <class>UIToolBar</class>
    161161   <extends>QToolBar</extends>
    162    <header>VBoxToolBar.h</header>
     162   <header>UIToolBar.h</header>
    163163  </customwidget>
    164164 </customwidgets>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.cpp

    r32074 r32760  
    2525#include "VBoxMediaManagerDlg.h"
    2626#include "VBoxProblemReporter.h"
    27 #include "VBoxToolBar.h"
    2827#include "VBoxVMSettingsHD.h"
    2928
    … …  
    3635#include <QStylePainter>
    3736#include <QTimer>
     37#include <QCommonStyle>
    3838
    3939/* String Tags */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.ui

    r28804 r32760  
    8787           </item>
    8888           <item>
    89             <widget class="VBoxToolBar" native="1" name="mTbStorageBar" />
     89            <widget class="UIToolBar" native="1" name="mTbStorageBar" />
    9090           </item>
    9191          </layout>
    … …  
    519519  </customwidget>
    520520  <customwidget>
    521    <class>VBoxToolBar</class>
     521   <class>UIToolBar</class>
    522522   <extends>QWidget</extends>
    523    <header>VBoxToolBar.h</header>
     523   <header>UIToolBar.h</header>
    524524   <container>1</container>
    525525  </customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp

    r32460 r32760  
    3333#include "VBoxGlobal.h"
    3434#include "VBoxProblemReporter.h"
    35 #include "VBoxToolBar.h"
     35#include "UIToolBar.h"
    3636#include "QITableView.h"
    3737#include "QIDialogButtonBox.h"
    … …  
    458458
    459459    /* Create toolbar: */
    460     m_pToolBar = new VBoxToolBar(this);
     460    m_pToolBar = new UIToolBar(this);
    461461    m_pToolBar->setIconSize(QSize(16, 16));
    462462    m_pToolBar->setOrientation(Qt::Vertical);

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsPortForwardingDlg.h

    r31563 r32760  
    2727/* Forward declarations: */
    2828class QITableView;
    29 class VBoxToolBar;
     29class UIToolBar;
    3030class QIDialogButtonBox;
    3131class UIPortForwardingModel;
    … …  
    133133    /* Widgets: */
    134134    QITableView *m_pTableView;
    135     VBoxToolBar *m_pToolBar;
     135    UIToolBar *m_pToolBar;
    136136    QIDialogButtonBox *m_pButtonBox;
    137137

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSF.ui

    r31002 r32760  
    8888     </item>
    8989     <item>
    90       <widget class="VBoxToolBar" native="1" name="mTbFolders"/>
     90      <widget class="UIToolBar" native="1" name="mTbFolders"/>
    9191     </item>
    9292    </layout>
    … …  
    102102  </customwidget>
    103103  <customwidget>
    104    <class>VBoxToolBar</class>
     104   <class>UIToolBar</class>
    105105   <extends>QWidget</extends>
    106    <header>VBoxToolBar.h</header>
     106   <header>UIToolBar.h</header>
    107107   <container>1</container>
    108108  </customwidget>

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.cpp

    r31946 r32760  
    2222#include "UIIconPool.h"
    2323#include "VBoxGlobal.h"
    24 #include "VBoxToolBar.h"
     24#include "UIToolBar.h"
    2525#include "VBoxVMSettingsUSB.h"
    2626#include "VBoxVMSettingsUSBFilterDetails.h"
    … …  
    8383
    8484    /* Prepare toolbar */
    85     VBoxToolBar *toolBar = new VBoxToolBar (mWtFilterHandler);
     85    UIToolBar *toolBar = new UIToolBar (mWtFilterHandler);
    8686    toolBar->setUsesTextLabel (false);
    8787    toolBar->setIconSize (QSize (16, 16));

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp

    r32746 r32760  
    22 *
    33 * VBox frontends: Qt GUI ("VirtualBox"):
    4  * VBoxToolBar class declaration & implementation
     4 * UIToolBar class declaration & implementation
    55 */
    66
    77/*
    8  * Copyright (C) 2006-2007 Oracle Corporation
     8 * Copyright (C) 2006-2010 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1717 */
    1818
    19 #ifndef ___VBoxToolBar_h___
    20 #define ___VBoxToolBar_h___
    21 
    22 #include <QGlobalStatic> /* for Q_WS_MAC */
     19/* Local includes */
     20#include "UIToolBar.h"
    2321#ifdef Q_WS_MAC
    2422# include "VBoxUtils.h"
    2523#endif
    2624
    27 /* Qt includes */
     25/* Global includes */
    2826#include <QLayout>
    2927#include <QMainWindow>
    30 #include <QToolBar>
    31 
    3228/* Note: This styles are available on _all_ platforms. */
    3329#include <QCleanlooksStyle>
    3430#include <QWindowsStyle>
    3531
    36 /**
    37  *  The VBoxToolBar class is a simple QToolBar reimplementation to disable
    38  *  its built-in context menu and add some default behavior we need.
    39  */
    40 class VBoxToolBar : public QToolBar
     32UIToolBar::UIToolBar(QWidget *pParent)
     33    : QToolBar(pParent)
     34    , m_pMainWindow(qobject_cast <QMainWindow*>(pParent))
    4135{
     36    setFloatable(false);
     37    setMovable(false);
    4238
    43 public:
     39    /* Remove that ugly frame panel around the toolbar.
     40     * Doing that currently for Cleanlooks & Windows styles. */
     41    if (qobject_cast <QCleanlooksStyle*>(QToolBar::style()) ||
     42        qobject_cast <QWindowsStyle*>(QToolBar::style()))
     43        setStyleSheet("QToolBar { border: 0px none black; }");
    4444
    45     VBoxToolBar (QWidget *aParent)
    46         : QToolBar (aParent)
    47         , mMainWindow (qobject_cast <QMainWindow*> (aParent))
    48     {
    49         setFloatable (false);
    50         setMovable (false);
     45    if (layout())
     46        layout()->setContentsMargins(0, 0, 0, 0);;
    5147
    52         /* Remove that ugly frame panel around the toolbar.
    53          * Doing that currently for Cleanlooks & Windows styles. */
    54         if (qobject_cast <QCleanlooksStyle*> (QToolBar::style()) ||
    55             qobject_cast <QWindowsStyle*> (QToolBar::style()))
    56             setStyleSheet ("QToolBar { border: 0px none black; }");
    57 
    58         if (layout())
    59             layout()->setContentsMargins (0, 0, 0, 0);;
    60 
    61         setContextMenuPolicy (Qt::NoContextMenu);
    62     }
     48    setContextMenuPolicy(Qt::NoContextMenu);
     49}
    6350
    6451#ifdef Q_WS_MAC
    65     void setMacToolbar()
    66     {
    67         if (mMainWindow)
    68             mMainWindow->setUnifiedTitleAndToolBarOnMac (true);
    69     }
     52void UIToolBar::setMacToolbar()
     53{
     54    if (m_pMainWindow)
     55        m_pMainWindow->setUnifiedTitleAndToolBarOnMac(true);
     56}
    7057
    71     void setShowToolBarButton (bool aShow)
    72     {
    73         ::darwinSetShowsToolbarButton (this, aShow);
    74     }
     58void UIToolBar::setShowToolBarButton(bool fShow)
     59{
     60    ::darwinSetShowsToolbarButton(this, fShow);
     61}
    7562#endif /* Q_WS_MAC */
    7663
    77     void updateLayout()
    78     {
     64void UIToolBar::updateLayout()
     65{
    7966#ifdef Q_WS_MAC
    80         /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
    81            the necessary size of the toolbar is increased. Also for some languages
    82            the with doesn't match if the text increase. So manually adjust the size
    83            after changing the text. */
    84         QSizePolicy sp = sizePolicy();
    85         setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
    86         adjustSize();
    87         setSizePolicy(sp);
    88         layout()->invalidate();
    89         layout()->activate();
     67    /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
     68       the necessary size of the toolbar is increased. Also for some languages
     69       the with doesn't match if the text increase. So manually adjust the size
     70       after changing the text. */
     71    QSizePolicy sp = sizePolicy();
     72    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     73    adjustSize();
     74    setSizePolicy(sp);
     75    layout()->invalidate();
     76    layout()->activate();
    9077#endif /* Q_WS_MAC */
    91     }
     78}
    9279
    93     void setUsesTextLabel (bool aEnable)
    94     {
    95         Qt::ToolButtonStyle tbs = Qt::ToolButtonTextUnderIcon;
    96         if (!aEnable)
    97             tbs = Qt::ToolButtonIconOnly;
     80void UIToolBar::setUsesTextLabel(bool fEnable)
     81{
     82    Qt::ToolButtonStyle tbs = Qt::ToolButtonTextUnderIcon;
     83    if (!fEnable)
     84        tbs = Qt::ToolButtonIconOnly;
    9885
    99         if (mMainWindow)
    100             mMainWindow->setToolButtonStyle (tbs);
    101         else
    102             setToolButtonStyle (tbs);
    103     }
     86    if (m_pMainWindow)
     87        m_pMainWindow->setToolButtonStyle(tbs);
     88    else
     89        setToolButtonStyle(tbs);
     90}
    10491
    105 private:
    106 
    107     QMainWindow *mMainWindow;
    108 };
    109 
    110 #endif // !___VBoxToolBar_h___
    111 

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.h

    r32746 r32760  
    22 *
    33 * VBox frontends: Qt GUI ("VirtualBox"):
    4  * VBoxToolBar class declaration & implementation
     4 * UIToolBar class declaration & implementation
    55 */
    66
    77/*
    8  * Copyright (C) 2006-2007 Oracle Corporation
     8 * Copyright (C) 2006-2010 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1717 */
    1818
    19 #ifndef ___VBoxToolBar_h___
    20 #define ___VBoxToolBar_h___
     19#ifndef ___UIToolBar_h___
     20#define ___UIToolBar_h___
    2121
    22 #include <QGlobalStatic> /* for Q_WS_MAC */
    23 #ifdef Q_WS_MAC
    24 # include "VBoxUtils.h"
    25 #endif
    26 
    27 /* Qt includes */
    28 #include <QLayout>
    29 #include <QMainWindow>
     22/* Global includes */
    3023#include <QToolBar>
    3124
    32 /* Note: This styles are available on _all_ platforms. */
    33 #include <QCleanlooksStyle>
    34 #include <QWindowsStyle>
     25/* Global forward declarations */
     26class QMainWindow;
    3527
    3628/**
    37  *  The VBoxToolBar class is a simple QToolBar reimplementation to disable
     29 *  The UIToolBar class is a simple QToolBar reimplementation to disable
    3830 *  its built-in context menu and add some default behavior we need.
    3931 */
    40 class VBoxToolBar : public QToolBar
     32class UIToolBar : public QToolBar
    4133{
    42 
    4334public:
    4435
    45     VBoxToolBar (QWidget *aParent)
    46         : QToolBar (aParent)
    47         , mMainWindow (qobject_cast <QMainWindow*> (aParent))
    48     {
    49         setFloatable (false);
    50         setMovable (false);
    51 
    52         /* Remove that ugly frame panel around the toolbar.
    53          * Doing that currently for Cleanlooks & Windows styles. */
    54         if (qobject_cast <QCleanlooksStyle*> (QToolBar::style()) ||
    55             qobject_cast <QWindowsStyle*> (QToolBar::style()))
    56             setStyleSheet ("QToolBar { border: 0px none black; }");
    57 
    58         if (layout())
    59             layout()->setContentsMargins (0, 0, 0, 0);;
    60 
    61         setContextMenuPolicy (Qt::NoContextMenu);
    62     }
     36    UIToolBar(QWidget *pParent);
    6337
    6438#ifdef Q_WS_MAC
    65     void setMacToolbar()
    66     {
    67         if (mMainWindow)
    68             mMainWindow->setUnifiedTitleAndToolBarOnMac (true);
    69     }
    70 
    71     void setShowToolBarButton (bool aShow)
    72     {
    73         ::darwinSetShowsToolbarButton (this, aShow);
    74     }
     39    void setMacToolbar();
     40    void setShowToolBarButton(bool fShow);
    7541#endif /* Q_WS_MAC */
    7642
    77     void updateLayout()
    78     {
    79 #ifdef Q_WS_MAC
    80         /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
    81            the necessary size of the toolbar is increased. Also for some languages
    82            the with doesn't match if the text increase. So manually adjust the size
    83            after changing the text. */
    84         QSizePolicy sp = sizePolicy();
    85         setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
    86         adjustSize();
    87         setSizePolicy(sp);
    88         layout()->invalidate();
    89         layout()->activate();
    90 #endif /* Q_WS_MAC */
    91     }
    92 
    93     void setUsesTextLabel (bool aEnable)
    94     {
    95         Qt::ToolButtonStyle tbs = Qt::ToolButtonTextUnderIcon;
    96         if (!aEnable)
    97             tbs = Qt::ToolButtonIconOnly;
    98 
    99         if (mMainWindow)
    100             mMainWindow->setToolButtonStyle (tbs);
    101         else
    102             setToolButtonStyle (tbs);
    103     }
     43    void updateLayout();
     44    void setUsesTextLabel(bool fEnable);
    10445
    10546private:
    10647
    107     QMainWindow *mMainWindow;
     48    /* Private member vars */
     49    QMainWindow *m_pMainWindow;
    10850};
    10951
    110 #endif // !___VBoxToolBar_h___
     52#endif // !___UIToolBar_h___
    11153

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp

    r31954 r32760  
    3838/* Mini-toolbar constructor */
    3939VBoxMiniToolBar::VBoxMiniToolBar(QWidget *pParent, Alignment alignment, bool fActive, bool fAutoHide)
    40     : VBoxToolBar(pParent)
     40    : UIToolBar(pParent)
    4141    , m_pAutoHideAction(0)
    4242    , m_pDisplayLabel(0)
    … …  
    238238    }
    239239    /* Base-class event-filter: */
    240     return VBoxToolBar::eventFilter(pObject, pEvent);
     240    return UIToolBar::eventFilter(pObject, pEvent);
    241241}
    242242
    … …  
    251251    }
    252252    /* Base-class mouse-move event processing: */
    253     VBoxToolBar::mouseMoveEvent(pEvent);
     253    UIToolBar::mouseMoveEvent(pEvent);
    254254}
    255255
    … …  
    346346    }
    347347    /* Base-class show event processing: */
    348     VBoxToolBar::showEvent(pEvent);
     348    UIToolBar::showEvent(pEvent);
    349349}
    350350
    … …  
    358358    painter.end();
    359359    /* Base-class paint event processing: */
    360     VBoxToolBar::paintEvent(pEvent);
     360    UIToolBar::paintEvent(pEvent);
    361361}
    362362

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h

    r31866 r32760  
    2424
    2525/* Local includes */
    26 #include "VBoxToolBar.h"
     26#include "UIToolBar.h"
    2727
    2828/* Global forwards */
    … …  
    3434 *  It supports auto hiding and animated sliding up/down.
    3535 */
    36 class VBoxMiniToolBar : public VBoxToolBar
     36class VBoxMiniToolBar : public UIToolBar
    3737{
    3838    Q_OBJECT;
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