Index: /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp (revision 54054) +++ /trunk/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp (revision 54055) @@ -73,5 +73,5 @@ /* Next/Previous buttons: */ - m_pNextPrevButtons = new UIRoundRectSegmentedButton(2, this); + m_pNextPrevButtons = new UIRoundRectSegmentedButton(this, 2); m_pNextPrevButtons->setEnabled(0, false); m_pNextPrevButtons->setEnabled(1, false); Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.h (revision 54054) +++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.h (revision 54055) @@ -23,7 +23,5 @@ /* Qt includes */ #include - -/* Qt forward includes */ -class QMacCocoaViewContainer; +#include /* Add typedefs for Cocoa types */ @@ -32,16 +30,5 @@ ADD_COCOA_NATIVE_REF(NSSearchField); -class UICocoaWrapper: public QWidget -{ -public: - UICocoaWrapper(QWidget *pParent = 0); - -protected: - virtual void resizeEvent(QResizeEvent *pEvent); - - QMacCocoaViewContainer *m_pContainer; -}; - -class UICocoaButton: public UICocoaWrapper +class UICocoaButton: public QMacCocoaViewContainer { Q_OBJECT @@ -55,5 +42,5 @@ }; - UICocoaButton(CocoaButtonType aType, QWidget *pParent = 0); + UICocoaButton(QWidget *pParent, CocoaButtonType type); ~UICocoaButton(); @@ -69,9 +56,8 @@ private: - /* Private member vars */ - NativeNSButtonRef m_pNativeRef; + NativeNSButtonRef nativeRef() const { return static_cast(cocoaView()); } }; -class UICocoaSegmentedButton: public UICocoaWrapper +class UICocoaSegmentedButton: public QMacCocoaViewContainer { Q_OBJECT @@ -84,5 +70,5 @@ }; - UICocoaSegmentedButton(int count, CocoaSegmentType type = RoundRectSegment, QWidget *pParent = 0); + UICocoaSegmentedButton(QWidget *pParent, int count, CocoaSegmentType type = RoundRectSegment); ~UICocoaSegmentedButton(); @@ -101,14 +87,13 @@ private: - /* Private member vars */ - NativeNSSegmentedControlRef m_pNativeRef; + NativeNSSegmentedControlRef nativeRef() const { return static_cast(cocoaView()); } }; -class UICocoaSearchField: public UICocoaWrapper +class UICocoaSearchField: public QMacCocoaViewContainer { Q_OBJECT public: - UICocoaSearchField(QWidget* pParent = 0); + UICocoaSearchField(QWidget* pParent); ~UICocoaSearchField(); @@ -129,6 +114,5 @@ private: - /* Private member vars */ - NativeNSSearchFieldRef m_pNativeRef; + NativeNSSearchFieldRef nativeRef() const { return static_cast(cocoaView()); } }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm (revision 54054) +++ /trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm (revision 54055) @@ -234,72 +234,73 @@ * Public classes */ -UICocoaWrapper::UICocoaWrapper(QWidget *pParent /* = 0 */) - : QWidget(pParent) - , m_pContainer(0) -{ -} - -void UICocoaWrapper::resizeEvent(QResizeEvent *pEvent) -{ - if (m_pContainer) - m_pContainer->resize(pEvent->size()); - QWidget::resizeEvent(pEvent); -} - -UICocoaButton::UICocoaButton(CocoaButtonType aType, QWidget *pParent /* = 0 */) - : UICocoaWrapper(pParent) -{ +UICocoaButton::UICocoaButton(QWidget *pParent, CocoaButtonType type) + : QMacCocoaViewContainer(0, pParent) +{ + /* Prepare auto-release pool: */ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + /* Prepare native button reference: */ + NativeNSButtonRef pNativeRef; NSRect initFrame; - switch (aType) + /* Configure button: */ + switch (type) { case HelpButton: { - m_pNativeRef = [[NSButton alloc] init]; - [m_pNativeRef setTitle: @""]; - [m_pNativeRef setBezelStyle: NSHelpButtonBezelStyle]; - [m_pNativeRef setBordered: YES]; - [m_pNativeRef setAlignment: NSCenterTextAlignment]; - [m_pNativeRef sizeToFit]; - initFrame = [m_pNativeRef frame]; + pNativeRef = [[NSButton alloc] init]; + [pNativeRef setTitle: @""]; + [pNativeRef setBezelStyle: NSHelpButtonBezelStyle]; + [pNativeRef setBordered: YES]; + [pNativeRef setAlignment: NSCenterTextAlignment]; + [pNativeRef sizeToFit]; + initFrame = [pNativeRef frame]; initFrame.size.width += 12; /* Margin */ - [m_pNativeRef setFrame:initFrame]; + [pNativeRef setFrame:initFrame]; break; }; case CancelButton: { - m_pNativeRef = [[NSButton alloc] initWithFrame: NSMakeRect(0, 0, 13, 13)]; - [m_pNativeRef setTitle: @""]; - [m_pNativeRef setBezelStyle:NSShadowlessSquareBezelStyle]; - [m_pNativeRef setButtonType:NSMomentaryChangeButton]; - [m_pNativeRef setImage: [NSImage imageNamed: NSImageNameStopProgressFreestandingTemplate]]; - [m_pNativeRef setBordered: NO]; - [[m_pNativeRef cell] setImageScaling: NSImageScaleProportionallyDown]; - initFrame = [m_pNativeRef frame]; + pNativeRef = [[NSButton alloc] initWithFrame: NSMakeRect(0, 0, 13, 13)]; + [pNativeRef setTitle: @""]; + [pNativeRef setBezelStyle:NSShadowlessSquareBezelStyle]; + [pNativeRef setButtonType:NSMomentaryChangeButton]; + [pNativeRef setImage: [NSImage imageNamed: NSImageNameStopProgressFreestandingTemplate]]; + [pNativeRef setBordered: NO]; + [[pNativeRef cell] setImageScaling: NSImageScaleProportionallyDown]; + initFrame = [pNativeRef frame]; break; } case ResetButton: { - m_pNativeRef = [[NSButton alloc] initWithFrame: NSMakeRect(0, 0, 13, 13)]; - [m_pNativeRef setTitle: @""]; - [m_pNativeRef setBezelStyle:NSShadowlessSquareBezelStyle]; - [m_pNativeRef setButtonType:NSMomentaryChangeButton]; - [m_pNativeRef setImage: [NSImage imageNamed: NSImageNameRefreshFreestandingTemplate]]; - [m_pNativeRef setBordered: NO]; - [[m_pNativeRef cell] setImageScaling: NSImageScaleProportionallyDown]; - initFrame = [m_pNativeRef frame]; + pNativeRef = [[NSButton alloc] initWithFrame: NSMakeRect(0, 0, 13, 13)]; + [pNativeRef setTitle: @""]; + [pNativeRef setBezelStyle:NSShadowlessSquareBezelStyle]; + [pNativeRef setButtonType:NSMomentaryChangeButton]; + [pNativeRef setImage: [NSImage imageNamed: NSImageNameRefreshFreestandingTemplate]]; + [pNativeRef setBordered: NO]; + [[pNativeRef cell] setImageScaling: NSImageScaleProportionallyDown]; + initFrame = [pNativeRef frame]; break; } } + /* Install click listener: */ UIButtonTargetPrivate *bt = [[UIButtonTargetPrivate alloc] initWithObjectAndLionTrouble:this]; - [m_pNativeRef setTarget:bt]; - [m_pNativeRef setAction:@selector(clicked:)]; - - /* Create the container widget and attach the native view. */ - m_pContainer = new QMacCocoaViewContainer(m_pNativeRef, this); - /* Finally resize the widget */ + [pNativeRef setTarget:bt]; + [pNativeRef setAction:@selector(clicked:)]; + + /* Put the button to the QCocoaViewContainer: */ + setCocoaView(pNativeRef); + /* Release our reference, since our super class + * takes ownership and we don't need it anymore. */ + [pNativeRef release]; + + /* Finally resize the widget: */ setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setFixedSize(NSWidth(initFrame), NSHeight(initFrame)); + + /* Cleanup auto-release pool: */ + [pool release]; } @@ -310,5 +311,5 @@ QSize UICocoaButton::sizeHint() const { - NSRect frame = [m_pNativeRef frame]; + NSRect frame = [nativeRef() frame]; return QSize(frame.size.width, frame.size.height); } @@ -318,10 +319,10 @@ QString s(strText); /* Set it for accessibility reasons as alternative title */ - [m_pNativeRef setAlternateTitle: ::darwinQStringToNSString(s.remove('&'))]; + [nativeRef() setAlternateTitle: ::darwinQStringToNSString(s.remove('&'))]; } void UICocoaButton::setToolTip(const QString& strTip) { - [m_pNativeRef setToolTip: ::darwinQStringToNSString(strTip)]; + [nativeRef() setToolTip: ::darwinQStringToNSString(strTip)]; } @@ -331,41 +332,57 @@ } -UICocoaSegmentedButton::UICocoaSegmentedButton(int count, CocoaSegmentType type /* = RoundRectSegment */, QWidget *pParent /* = 0 */) - : UICocoaWrapper(pParent) -{ +UICocoaSegmentedButton::UICocoaSegmentedButton(QWidget *pParent, int count, CocoaSegmentType type /*= RoundRectSegment*/) + : QMacCocoaViewContainer(0, pParent) +{ + /* Prepare auto-release pool: */ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + /* Prepare native segmented-button reference: */ + NativeNSSegmentedControlRef pNativeRef; NSRect initFrame; - m_pNativeRef = [[NSSegmentedControl alloc] init]; - [m_pNativeRef setSegmentCount:count]; + /* Configure segmented-button: */ + pNativeRef = [[NSSegmentedControl alloc] init]; + [pNativeRef setSegmentCount:count]; switch (type) { case RoundRectSegment: { - [[m_pNativeRef cell] setTrackingMode: NSSegmentSwitchTrackingMomentary]; - [m_pNativeRef setFont: [NSFont controlContentFontOfSize: + [pNativeRef setSegmentStyle: NSSegmentStyleRoundRect]; + [pNativeRef setFont: [NSFont controlContentFontOfSize: [NSFont systemFontSizeForControlSize: NSSmallControlSize]]]; - [m_pNativeRef setSegmentStyle:NSSegmentStyleRoundRect]; + [[pNativeRef cell] setTrackingMode: NSSegmentSwitchTrackingMomentary]; break; } case TexturedRoundedSegment: { - [m_pNativeRef setSegmentStyle:NSSegmentStyleTexturedRounded]; - [m_pNativeRef setFont: [NSFont controlContentFontOfSize: + [pNativeRef setSegmentStyle: NSSegmentStyleTexturedRounded]; + [pNativeRef setFont: [NSFont controlContentFontOfSize: [NSFont systemFontSizeForControlSize: NSSmallControlSize]]]; break; } } - [m_pNativeRef sizeToFit]; - + + /* Calculate corresponding size: */ + [pNativeRef sizeToFit]; + initFrame = [pNativeRef frame]; + + /* Install click listener: */ UISegmentedButtonTargetPrivate *bt = [[UISegmentedButtonTargetPrivate alloc] initWithObject1:this]; - [m_pNativeRef setTarget:bt]; - [m_pNativeRef setAction:@selector(segControlClicked:)]; - - initFrame = [m_pNativeRef frame]; - /* Create the container widget and attach the native view. */ - m_pContainer = new QMacCocoaViewContainer(m_pNativeRef, this); - /* Finally resize the widget */ + [pNativeRef setTarget:bt]; + [pNativeRef setAction:@selector(segControlClicked:)]; + + /* Put the button to the QCocoaViewContainer: */ + setCocoaView(pNativeRef); + /* Release our reference, since our super class + * takes ownership and we don't need it anymore. */ + [pNativeRef release]; + + /* Finally resize the widget: */ setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setFixedSize(NSWidth(initFrame), NSHeight(initFrame)); + + /* Cleanup auto-release pool: */ + [pool release]; } @@ -376,5 +393,5 @@ QSize UICocoaSegmentedButton::sizeHint() const { - NSRect frame = [m_pNativeRef frame]; + NSRect frame = [nativeRef() frame]; return QSize(frame.size.width, frame.size.height); } @@ -383,7 +400,7 @@ { QString s(strTitle); - [m_pNativeRef setLabel: ::darwinQStringToNSString(s.remove('&')) forSegment: iSegment]; - [m_pNativeRef sizeToFit]; - NSRect frame = [m_pNativeRef frame]; + [nativeRef() setLabel: ::darwinQStringToNSString(s.remove('&')) forSegment: iSegment]; + [nativeRef() sizeToFit]; + NSRect frame = [nativeRef() frame]; setFixedSize(NSWidth(frame), NSHeight(frame)); } @@ -391,5 +408,5 @@ void UICocoaSegmentedButton::setToolTip(int iSegment, const QString &strTip) { - [[m_pNativeRef cell] setToolTip: ::darwinQStringToNSString(strTip) forSegment: iSegment]; + [[nativeRef() cell] setToolTip: ::darwinQStringToNSString(strTip) forSegment: iSegment]; } @@ -399,7 +416,7 @@ NSImage *pNSimage = [::darwinToNSImageRef(&image) autorelease]; - [m_pNativeRef setImage: pNSimage forSegment: iSegment]; - [m_pNativeRef sizeToFit]; - NSRect frame = [m_pNativeRef frame]; + [nativeRef() setImage: pNSimage forSegment: iSegment]; + [nativeRef() sizeToFit]; + NSRect frame = [nativeRef() frame]; setFixedSize(NSWidth(frame), NSHeight(frame)); } @@ -407,11 +424,11 @@ void UICocoaSegmentedButton::setEnabled(int iSegment, bool fEnabled) { - [[m_pNativeRef cell] setEnabled: fEnabled forSegment: iSegment]; + [[nativeRef() cell] setEnabled: fEnabled forSegment: iSegment]; } void UICocoaSegmentedButton::animateClick(int iSegment) { - [m_pNativeRef setSelectedSegment: iSegment]; - [[m_pNativeRef cell] performClick: m_pNativeRef]; + [nativeRef() setSelectedSegment: iSegment]; + [[nativeRef() cell] performClick: nativeRef()]; } @@ -421,30 +438,42 @@ } -UICocoaSearchField::UICocoaSearchField(QWidget *pParent /* = 0 */) - : UICocoaWrapper(pParent) -{ +UICocoaSearchField::UICocoaSearchField(QWidget *pParent) + : QMacCocoaViewContainer(0, pParent) +{ + /* Prepare auto-release pool: */ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + /* Prepare native search-field reference: */ + NativeNSSearchFieldRef pNativeRef; NSRect initFrame; - m_pNativeRef = [[UISearchFieldPrivate alloc] initWithObject2: this]; - [m_pNativeRef setFont: [NSFont controlContentFontOfSize: + /* Configure search-field: */ + pNativeRef = [[UISearchFieldPrivate alloc] initWithObject2: this]; + [pNativeRef setFont: [NSFont controlContentFontOfSize: [NSFont systemFontSizeForControlSize: NSMiniControlSize]]]; - [[m_pNativeRef cell] setControlSize: NSMiniControlSize]; - [m_pNativeRef sizeToFit]; - initFrame = [m_pNativeRef frame]; + [[pNativeRef cell] setControlSize: NSMiniControlSize]; + [pNativeRef sizeToFit]; + initFrame = [pNativeRef frame]; initFrame.size.width = 180; - [m_pNativeRef setFrame: initFrame]; - - /* Use our own delegate */ + [pNativeRef setFrame: initFrame]; + + /* Use our own delegate: */ UISearchFieldDelegatePrivate *sfd = [[UISearchFieldDelegatePrivate alloc] init]; - [m_pNativeRef setDelegate: sfd]; - - /* Create the container widget and attach the native view. */ - m_pContainer = new QMacCocoaViewContainer(m_pNativeRef, this); - - /* Finally resize the widget */ + [pNativeRef setDelegate: sfd]; + + /* Put the button to the QCocoaViewContainer: */ + setCocoaView(pNativeRef); + /* Release our reference, since our super class + * takes ownership and we don't need it anymore. */ + [pNativeRef release]; + + /* Finally resize the widget: */ setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); setMinimumWidth(NSWidth(initFrame)); setFixedHeight(NSHeight(initFrame)); setFocusPolicy(Qt::StrongFocus); + + /* Cleanup auto-release pool: */ + [pool release]; } @@ -455,5 +484,5 @@ QSize UICocoaSearchField::sizeHint() const { - NSRect frame = [m_pNativeRef frame]; + NSRect frame = [nativeRef() frame]; return QSize(frame.size.width, frame.size.height); } @@ -461,30 +490,30 @@ QString UICocoaSearchField::text() const { - return ::darwinNSStringToQString([m_pNativeRef stringValue]); + return ::darwinNSStringToQString([nativeRef() stringValue]); } void UICocoaSearchField::insert(const QString &strText) { - [[m_pNativeRef currentEditor] setString: [[m_pNativeRef stringValue] stringByAppendingString: ::darwinQStringToNSString(strText)]]; + [[nativeRef() currentEditor] setString: [[nativeRef() stringValue] stringByAppendingString: ::darwinQStringToNSString(strText)]]; } void UICocoaSearchField::setToolTip(const QString &strTip) { - [m_pNativeRef setToolTip: ::darwinQStringToNSString(strTip)]; + [nativeRef() setToolTip: ::darwinQStringToNSString(strTip)]; } void UICocoaSearchField::selectAll() { - [m_pNativeRef selectText: m_pNativeRef]; + [nativeRef() selectText: nativeRef()]; } void UICocoaSearchField::markError() { - [[m_pNativeRef cell] setBackgroundColor: [[NSColor redColor] colorWithAlphaComponent: 0.3]]; + [[nativeRef() cell] setBackgroundColor: [[NSColor redColor] colorWithAlphaComponent: 0.3]]; } void UICocoaSearchField::unmarkError() { - [[m_pNativeRef cell] setBackgroundColor: nil]; + [[nativeRef() cell] setBackgroundColor: nil]; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (revision 54054) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (revision 54055) @@ -233,10 +233,26 @@ : QIWithRetranslateUI(pParent) { - /* Prepare buttons: */ - m_pHeaderBtn = new UITexturedSegmentedButton(2); - m_pHeaderBtn->setIcon(Dtls, UIIconPool::iconSet(":/vm_settings_16px.png", - ":/vm_settings_disabled_16px.png")); - m_pHeaderBtn->setIcon(Snap, UIIconPool::iconSet(":/snapshot_take_16px.png", - ":/snapshot_take_disabled_16px.png")); + /* Create container: */ + QWidget *pContainer = new QWidget; + { + /* Create layout: */ + QHBoxLayout *pLayout = new QHBoxLayout(pContainer); + { + /* Configure layout: */ + pLayout->setContentsMargins(0, 0, 0, 0); + /* Create segmented-button: */ + m_pHeaderBtn = new UITexturedSegmentedButton(pContainer, 2); + { + /* Configure segmented-button: */ + m_pHeaderBtn->setIcon(Dtls, UIIconPool::iconSet(":/vm_settings_16px.png", + ":/vm_settings_disabled_16px.png")); + m_pHeaderBtn->setIcon(Snap, UIIconPool::iconSet(":/snapshot_take_16px.png", + ":/snapshot_take_disabled_16px.png")); + /* Add segmented-buttons into layout: */ + pLayout->addWidget(m_pHeaderBtn); + } + } + } + #ifdef Q_WS_MAC /* Cocoa stuff should be async... @@ -258,5 +274,5 @@ { pToolBar->addWidget(new UIHorizontalSpacerWidget(this)); - pToolBar->addWidget(m_pHeaderBtn); + pToolBar->addWidget(pContainer); QWidget *pSpace = new QWidget(this); /* We need a little bit more space for the beta label. */ @@ -276,5 +292,5 @@ { UIBar *pBar = new UIBar(this); - pBar->setContentWidget(m_pHeaderBtn); + pBar->setContentWidget(pContainer); pMainLayout->addWidget(pBar); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp (revision 54054) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp (revision 54055) @@ -41,5 +41,5 @@ { setShortcut(QKeySequence(Qt::Key_Escape)); - m_pButton = new UICocoaButton(UICocoaButton::CancelButton, this); + m_pButton = new UICocoaButton(this, UICocoaButton::CancelButton); connect(m_pButton, SIGNAL(clicked()), this, SIGNAL(clicked())); @@ -60,5 +60,5 @@ : QAbstractButton(pParent) { - m_pButton = new UICocoaButton(UICocoaButton::ResetButton, this); + m_pButton = new UICocoaButton(this, UICocoaButton::ResetButton); connect(m_pButton, SIGNAL(clicked()), this, SIGNAL(clicked())); @@ -80,5 +80,5 @@ { setShortcut(QKeySequence(QKeySequence::HelpContents)); - m_pButton = new UICocoaButton(UICocoaButton::HelpButton, this); + m_pButton = new UICocoaButton(this, UICocoaButton::HelpButton); connect(m_pButton, SIGNAL(clicked()), this, SIGNAL(clicked())); @@ -91,11 +91,11 @@ * ********************************************************************************/ -UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(int cCount, QWidget *pParent /* = 0 */) - : UICocoaSegmentedButton(cCount, UICocoaSegmentedButton::RoundRectSegment, pParent) -{ -} - -UITexturedSegmentedButton::UITexturedSegmentedButton(int cCount, QWidget *pParent /* = 0 */) - : UICocoaSegmentedButton(cCount, UICocoaSegmentedButton::TexturedRoundedSegment, pParent) +UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(QWidget *pParent, int cCount) + : UICocoaSegmentedButton(pParent, cCount, UICocoaSegmentedButton::RoundRectSegment) +{ +} + +UITexturedSegmentedButton::UITexturedSegmentedButton(QWidget *pParent, int cCount) + : UICocoaSegmentedButton(pParent, cCount, UICocoaSegmentedButton::TexturedRoundedSegment) { } @@ -126,5 +126,5 @@ * ********************************************************************************/ -UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */) +UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /*= 0*/) : QIWithRetranslateUI(pParent) { @@ -146,5 +146,5 @@ static const int PushButtonBottomOffset = 4; -UIHelpButton::UIHelpButton(QWidget *pParent /* = 0 */) +UIHelpButton::UIHelpButton(QWidget *pParent /*= 0*/) : QIWithRetranslateUI(pParent) { @@ -240,5 +240,5 @@ * ********************************************************************************/ -UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(int aCount, QWidget *pParent /* = 0 */) +UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(QWidget *pParent, int aCount) : QWidget(pParent) { @@ -294,6 +294,6 @@ } -UITexturedSegmentedButton::UITexturedSegmentedButton(int cCount, QWidget *pParent /* = 0 */) - : UIRoundRectSegmentedButton(cCount, pParent) +UITexturedSegmentedButton::UITexturedSegmentedButton(QWidget *pParent, int cCount) + : UIRoundRectSegmentedButton(pParent, cCount) { for (int i=0; i < m_pButtons.size(); ++i) @@ -309,5 +309,5 @@ * ********************************************************************************/ -UISearchField::UISearchField(QWidget *pParent /* = 0 */) +UISearchField::UISearchField(QWidget *pParent) : QLineEdit(pParent) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h (revision 54054) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h (revision 54055) @@ -110,5 +110,5 @@ public: - UIRoundRectSegmentedButton(int cCount, QWidget *pParent = 0); + UIRoundRectSegmentedButton(QWidget *pParent, int cCount); }; @@ -118,5 +118,5 @@ public: - UITexturedSegmentedButton(int cCount, QWidget *pParent = 0); + UITexturedSegmentedButton(QWidget *pParent, int cCount); }; @@ -131,5 +131,5 @@ public: - UISearchField(QWidget *pParent = 0); + UISearchField(QWidget *pParent); }; @@ -227,5 +227,5 @@ public: - UIRoundRectSegmentedButton(int aCount, QWidget *pParent = 0); + UIRoundRectSegmentedButton(QWidget *pParent, int aCount); ~UIRoundRectSegmentedButton(); @@ -251,5 +251,5 @@ public: - UITexturedSegmentedButton(int cCount, QWidget *pParent = 0); + UITexturedSegmentedButton(QWidget *pParent, int cCount); }; @@ -264,5 +264,5 @@ public: - UISearchField(QWidget *pParent = 0); + UISearchField(QWidget *pParent); void markError();