← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/virtualbox-ose/oneiric

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.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:
src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h
25
25
/* Local includes */
26
26
#include "QIWithRetranslateUI.h"
27
27
#include "UIMachineWindow.h"
28
 
#ifdef Q_WS_X11
29
 
# include <X11/Xlib.h>
30
 
#endif
31
28
 
32
29
/* Local forwards */
33
30
class VBoxMiniToolBar;
77
74
    /* Cleanup helpers: */
78
75
    void saveWindowSettings();
79
76
    void cleanupMachineView();
80
 
    //void cleanupMiniToolBar() {}
 
77
    void cleanupMiniToolBar();
81
78
    void cleanupMenu();
82
79
 
83
80
    /* Update routines: */