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

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIImportApplianceWzd.h

  • 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:
72
72
 
73
73
public:
74
74
 
75
 
    UIImportApplianceWzd(QWidget *pParent);
 
75
    UIImportApplianceWzd(const QString &strFile = "", QWidget *pParent = 0);
 
76
 
 
77
    bool isValid() const;
76
78
 
77
79
protected:
78
80
 
115
117
    void retranslateUi();
116
118
 
117
119
    bool validatePage();
 
120
    bool import();
118
121
 
119
122
private:
120
123