← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/virtualbox/oneiric-updates

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/main.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-09-02 11:50:47 UTC
  • mfrom: (3.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20110902115047-kfhmsikrpydgyoji
Tags: 4.1.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox.files/source_virtualbox.py
    - debian/virtualbox.install
  - Drop *-source packages.
  - Add vboxguest modalias the to the package control field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/src/main.cpp
1
 
/* $Id: main.cpp 35652 2011-01-20 14:16:38Z vboxsync $ */
 
1
/* $Id: main.cpp 38324 2011-08-05 14:02:53Z vboxsync $ */
2
2
/** @file
3
3
 *
4
4
 * VBox frontends: Qt GUI ("VirtualBox"):
24
24
#endif /* Q_WS_MAC */
25
25
#else /* !VBOX_WITH_PRECOMPILED_HEADERS */
26
26
#include "VBoxGlobal.h"
27
 
#include "VBoxProblemReporter.h"
 
27
#include "UIMessageCenter.h"
28
28
#include "VBoxSelectorWnd.h"
29
29
#include "VBoxUtils.h"
30
30
#ifdef Q_WS_MAC
160
160
    /* Check for Snow Leopard or higher */
161
161
    char szInfo[64];
162
162
    int rc = RTSystemQueryOSInfo (RTSYSOSINFO_RELEASE, szInfo, sizeof(szInfo));
163
 
    if (RT_SUCCESS (rc) &&
164
 
        szInfo[0] == '1') /* higher than 1x.x.x */
 
163
    if (   RT_SUCCESS (rc)
 
164
        && szInfo[0] == '1') /* higher than 1x.x.x */
165
165
    {
166
166
        /*
167
167
         * Find issetguid() and make it always return 0 by modifying the code.
262
262
            "  --start-paused             start the VM in the paused state\n"
263
263
            "  --start-running            start the VM running (for overriding --debug*)\n"
264
264
            "\n"
 
265
# endif
 
266
            "Expert options:\n"
 
267
            "  --disable-patm             disable code patching (ignored by AMD-V/VT-x)\n"
 
268
            "  --disable-csam             disable code scanning (ignored by AMD-V/VT-x)\n"
 
269
            "  --recompile-supervisor     recompiled execution of supervisor code (*)\n"
 
270
            "  --recompile-user           recompiled execution of user code (*)\n"
 
271
            "  --recompile-all            recompiled execution of all code, with disabled\n"
 
272
            "                             code patching and scanning\n"
 
273
            "  (*) For AMD-V/VT-x setups the effect is --recompile-all.\n"
 
274
            "\n"
 
275
# ifdef VBOX_WITH_DEBUGGER_GUI
265
276
            "The following environment variables are evaluated:\n"
266
277
            "  VBOX_GUI_DBG_ENABLED       enable the GUI debug menu if set\n"
267
278
            "  VBOX_GUI_DBG_AUTO_SHOW     show debug windows at VM startup\n"
448
459
            if (vboxGlobal().processArgs())
449
460
                return 0;
450
461
 
451
 
            vboxProblem().checkForMountedWrongUSB();
 
462
            msgCenter().checkForMountedWrongUSB();
452
463
 
453
464
            VBoxGlobalSettings settings = vboxGlobal().settings();
454
465
            /* Process known keys */
470
481
            }
471
482
            else if (noSelector)
472
483
            {
473
 
                vboxProblem().cannotRunInSelectorMode();
 
484
                msgCenter().cannotRunInSelectorMode();
474
485
            }
475
486
            else
476
487
            {
477
488
#ifdef VBOX_BLEEDING_EDGE
478
 
                vboxProblem().showBEBWarning();
 
489
                msgCenter().showBEBWarning();
479
490
#else
480
491
# ifndef DEBUG
481
492
                /* Check for BETA version */
486
497
                    QString str = vboxGlobal().virtualBox().
487
498
                        GetExtraData (VBoxDefs::GUI_PreventBetaWarning);
488
499
                    if (str != vboxVersion)
489
 
                        vboxProblem().showBETAWarning();
 
500
                        msgCenter().showBETAWarning();
490
501
                }
491
502
# endif
492
503
#endif