~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* $Id: QIDialogButtonBox.cpp $ */
 
1
/* $Id: QIDialogButtonBox.cpp 30356 2010-06-22 08:42:22Z vboxsync $ */
2
2
/** @file
3
3
 *
4
4
 * VBox frontends: Qt GUI ("VirtualBox"):
18
18
 */
19
19
 
20
20
#include "QIDialogButtonBox.h"
21
 
#include "VBoxSpecialControls.h"
 
21
#include "UISpecialControls.h"
22
22
 
23
23
#include <iprt/assert.h>
24
24
 
110
110
    {
111
111
        /* Use our very own help button if the user requested for one. */
112
112
        if (!mHelpButton)
113
 
            mHelpButton = new VBoxHelpButton;
 
113
            mHelpButton = new UIHelpButton;
114
114
        mHelpButton->initFrom (btn);
115
115
        removeButton (btn);
116
116
        QDialogButtonBox::addButton (mHelpButton, QDialogButtonBox::HelpRole);