Changeset 32759 in vbox

Timestamp:

Sep 24, 2010 1:20:18 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: coding style

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• VBoxSelectorWnd.cpp (modified) (65 diffs)
• VBoxSelectorWnd.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -76 +76 @@
  */
 VBoxSelectorWnd::
-VBoxSelectorWnd (VBoxSelectorWnd **aSelf, QWidget* aParent,
-                 Qt::WindowFlags aFlags /* = Qt::Window */)
-    : QIWithRetranslateUI2<QMainWindow> (aParent, aFlags)
-    , mDoneInaccessibleWarningOnce (false)
+VBoxSelectorWnd(VBoxSelectorWnd **aSelf, QWidget* aParent,
+                Qt::WindowFlags aFlags /* = Qt::Window */)
+    : QIWithRetranslateUI2<QMainWindow>(aParent, aFlags)
+    , mDoneInaccessibleWarningOnce(false)
 {
     VBoxGlobalSettings settings = vboxGlobal().settings();
@@ -91 +91 @@
 
 #if defined (Q_WS_MAC) && (QT_VERSION < 0x040402)
-    qApp->installEventFilter (this);
+    qApp->installEventFilter(this);
 #endif /* defined (Q_WS_MAC) && (QT_VERSION < 0x040402) */
 
@@ -97 +97 @@
     /* The application icon. On Win32, it's built-in to the executable. On Mac
      * OS X the icon referenced in info.plist is used. */
-    setWindowIcon (QIcon (":/VirtualBox_48px.png"));
+    setWindowIcon(QIcon(":/VirtualBox_48px.png"));
 #endif
 
     /* actions */
 
-    mFileMediaMgrAction = new QAction (this);
+    mFileMediaMgrAction = new QAction(this);
     mFileMediaMgrAction->setIcon(UIIconPool::iconSet(":/diskimage_16px.png"));
 
-    mFileApplianceImportAction = new QAction (this);
+    mFileApplianceImportAction = new QAction(this);
     mFileApplianceImportAction->setIcon(UIIconPool::iconSet(":/import_16px.png"));
 
-    mFileApplianceExportAction = new QAction (this);
+    mFileApplianceExportAction = new QAction(this);
     mFileApplianceExportAction->setIcon(UIIconPool::iconSet(":/export_16px.png"));
 
     mFileSettingsAction = new QAction(this);
-    mFileSettingsAction->setMenuRole (QAction::PreferencesRole);
+    mFileSettingsAction->setMenuRole(QAction::PreferencesRole);
     mFileSettingsAction->setIcon(UIIconPool::iconSet(":/global_settings_16px.png"));
-    mFileExitAction = new QAction (this);
-    mFileExitAction->setMenuRole (QAction::QuitRole);
+    mFileExitAction = new QAction(this);
+    mFileExitAction->setMenuRole(QAction::QuitRole);
     mFileExitAction->setIcon(UIIconPool::iconSet(":/exit_16px.png"));
 
-    mVmNewAction = new QAction (this);
+    mVmNewAction = new QAction(this);
     mVmNewAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_new_32px.png", ":/new_16px.png"));
-    mVmConfigAction = new QAction (this);
+    mVmConfigAction = new QAction(this);
     mVmConfigAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_settings_32px.png", ":/settings_16px.png",
         ":/vm_settings_disabled_32px.png", ":/settings_dis_16px.png"));
-    mVmDeleteAction = new QAction (this);
+    mVmDeleteAction = new QAction(this);
     mVmDeleteAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_delete_32px.png", ":/delete_16px.png",
         ":/vm_delete_disabled_32px.png", ":/delete_dis_16px.png"));
-    mVmStartAction = new QAction (this);
+    mVmStartAction = new QAction(this);
     mVmStartAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_start_32px.png", ":/start_16px.png",
         ":/vm_start_disabled_32px.png", ":/start_dis_16px.png"));
-    mVmDiscardAction = new QAction (this);
+    mVmDiscardAction = new QAction(this);
     mVmDiscardAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_discard_32px.png", ":/discard_16px.png",
         ":/vm_discard_disabled_32px.png", ":/discard_dis_16px.png"));
-    mVmPauseAction = new QAction (this);
-    mVmPauseAction->setCheckable (true);
+    mVmPauseAction = new QAction(this);
+    mVmPauseAction->setCheckable(true);
     mVmPauseAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_pause_32px.png", ":/pause_16px.png",
         ":/vm_pause_disabled_32px.png", ":/pause_disabled_16px.png"));
-    mVmRefreshAction = new QAction (this);
+    mVmRefreshAction = new QAction(this);
     mVmRefreshAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/refresh_32px.png", ":/refresh_16px.png",
         ":/refresh_disabled_32px.png", ":/refresh_disabled_16px.png"));
-    mVmShowLogsAction = new QAction (this);
+    mVmShowLogsAction = new QAction(this);
     mVmShowLogsAction->setIcon(UIIconPool::iconSetFull(
-        QSize (32, 32), QSize (16, 16),
+        QSize(32, 32), QSize(16, 16),
         ":/vm_show_logs_32px.png", ":/show_logs_16px.png",
         ":/vm_show_logs_disabled_32px.png", ":/show_logs_disabled_16px.png"));
 
-    mHelpActions.setup (this);
+    mHelpActions.setup(this);
 
     /* VM list toolbar */
@@ -181 +181 @@
     /* Make non-possible to activate list elements by single click,
      * this hack should disable the current possibility to do it if present */
-    if (mVMListView->style()->styleHint (QStyle::SH_ItemView_ActivateItemOnSingleClick, 0, mVMListView))
-        mVMListView->setStyleSheet ("activate-on-singleclick : 0");
+    if (mVMListView->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, 0, mVMListView))
+        mVMListView->setStyleSheet("activate-on-singleclick : 0");
 
     m_pSplitter = new QISplitter(this);
@@ -190 +190 @@
 #if MAC_LEOPARD_STYLE
     /* Enable unified toolbars on Mac OS X. Available on Qt >= 4.3 */
-    addToolBar (mVMToolBar);
+    addToolBar(mVMToolBar);
     mVMToolBar->setMacToolbar();
     /* Central widget @ horizontal layout */
     setCentralWidget(m_pSplitter);
-    m_pSplitter->addWidget (mVMListView);
+    m_pSplitter->addWidget(mVMListView);
 #else /* MAC_LEOPARD_STYLE */
 //    mVMToolBar->setContentsMargins(5, 5, 0, 0);
-//    addToolBar (mVMToolBar);
-//    m_pSplitter->addWidget (mVMListView);
+//    addToolBar(mVMToolBar);
+//    m_pSplitter->addWidget(mVMListView);
     QWidget *pLeftWidget = new QWidget(this);
     QVBoxLayout *pLeftVLayout = new QVBoxLayout(pLeftWidget);
@@ -220 +220 @@
     /* add actions to the toolbar */
 
-    mVMToolBar->setIconSize (QSize (32, 32));
-    mVMToolBar->setToolButtonStyle (Qt::ToolButtonTextUnderIcon);
-//    mVMToolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Preferred);
-
-    mVMToolBar->addAction (mVmNewAction);
-    mVMToolBar->addAction (mVmConfigAction);
+    mVMToolBar->setIconSize(QSize(32, 32));
+    mVMToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+//    mVMToolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
+
+    mVMToolBar->addAction(mVmNewAction);
+    mVMToolBar->addAction(mVmConfigAction);
 #if 0 /* delete action is really rare */
-    mVMToolBar->addAction (mVmDeleteAction);
+    mVMToolBar->addAction(mVmDeleteAction);
 #endif
-    mVMToolBar->addAction (mVmStartAction);
-    mVMToolBar->addAction (mVmDiscardAction);
+    mVMToolBar->addAction(mVmStartAction);
+    mVMToolBar->addAction(mVmDiscardAction);
 
     /* VM tab widget containing details and snapshots tabs */
@@ -240 +240 @@
     pVBox->addWidget(m_pVMDesktop);
 
-    m_pSplitter->addWidget (w);
+    m_pSplitter->addWidget(w);
 
     /* Set the initial distribution. The right site is bigger. */
@@ -252 +252 @@
 
     /* add actions to menubar */
-    mFileMenu = menuBar()->addMenu (QString::null);
-    mFileMenu->addAction (mFileMediaMgrAction);
-    mFileMenu->addAction (mFileApplianceImportAction);
-    mFileMenu->addAction (mFileApplianceExportAction);
+    mFileMenu = menuBar()->addMenu(QString::null);
+    mFileMenu->addAction(mFileMediaMgrAction);
+    mFileMenu->addAction(mFileApplianceImportAction);
+    mFileMenu->addAction(mFileApplianceExportAction);
 #ifndef Q_WS_MAC
     mFileMenu->addSeparator();
 #endif /* Q_WS_MAC */
-    mFileMenu->addAction (mFileSettingsAction);
+    mFileMenu->addAction(mFileSettingsAction);
 #ifndef Q_WS_MAC
     mFileMenu->addSeparator();
 #endif /* Q_WS_MAC */
-    mFileMenu->addAction (mFileExitAction);
-
-    mVMMenu = menuBar()->addMenu (QString::null);
-    mVMMenu->addAction (mVmNewAction);
-    mVMMenu->addAction (mVmConfigAction);
-    mVMMenu->addAction (mVmDeleteAction);
+    mFileMenu->addAction(mFileExitAction);
+
+    mVMMenu = menuBar()->addMenu(QString::null);
+    mVMMenu->addAction(mVmNewAction);
+    mVMMenu->addAction(mVmConfigAction);
+    mVMMenu->addAction(mVmDeleteAction);
     mVMMenu->addSeparator();
-    mVMMenu->addAction (mVmStartAction);
-    mVMMenu->addAction (mVmDiscardAction);
-    mVMMenu->addAction (mVmPauseAction);
+    mVMMenu->addAction(mVmStartAction);
+    mVMMenu->addAction(mVmDiscardAction);
+    mVMMenu->addAction(mVmPauseAction);
     mVMMenu->addSeparator();
-    mVMMenu->addAction (mVmRefreshAction);
-    mVMMenu->addAction (mVmShowLogsAction);
-
-    mVMCtxtMenu = new QMenu (this);
-    mVMCtxtMenu->addAction (mVmConfigAction);
-    mVMCtxtMenu->addAction (mVmDeleteAction);
+    mVMMenu->addAction(mVmRefreshAction);
+    mVMMenu->addAction(mVmShowLogsAction);
+
+    mVMCtxtMenu = new QMenu(this);
+    mVMCtxtMenu->addAction(mVmConfigAction);
+    mVMCtxtMenu->addAction(mVmDeleteAction);
     mVMCtxtMenu->addSeparator();
-    mVMCtxtMenu->addAction (mVmStartAction);
-    mVMCtxtMenu->addAction (mVmDiscardAction);
-    mVMCtxtMenu->addAction (mVmPauseAction);
+    mVMCtxtMenu->addAction(mVmStartAction);
+    mVMCtxtMenu->addAction(mVmDiscardAction);
+    mVMCtxtMenu->addAction(mVmPauseAction);
     mVMCtxtMenu->addSeparator();
-    mVMCtxtMenu->addAction (mVmRefreshAction);
-    mVMCtxtMenu->addAction (mVmShowLogsAction);
+    mVMCtxtMenu->addAction(mVmRefreshAction);
+    mVMCtxtMenu->addAction(mVmShowLogsAction);
 
     /* Make sure every status bar hint from the context menu is cleared when
      * the menu is closed. */
-    connect (mVMCtxtMenu, SIGNAL(aboutToHide()),
-             statusBar(), SLOT(clearMessage()));
-
-    mHelpMenu = menuBar()->addMenu (QString::null);
-    mHelpActions.addTo (mHelpMenu);
+    connect(mVMCtxtMenu, SIGNAL(aboutToHide()),
+            statusBar(), SLOT(clearMessage()));
+
+    mHelpMenu = menuBar()->addMenu(QString::null);
+    mHelpActions.addTo(mHelpMenu);
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    mTrayIcon = new VBoxTrayIcon (this, mVMModel);
-    Assert (mTrayIcon);
-    connect (mTrayIcon, SIGNAL (activated (QSystemTrayIcon::ActivationReason)),
-             this, SLOT (trayIconActivated (QSystemTrayIcon::ActivationReason)));
+    mTrayIcon = new VBoxTrayIcon(this, mVMModel);
+    Assert(mTrayIcon);
+    connect(mTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+            this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
 #endif
 
@@ -308 +308 @@
     /* Restore the position of the window */
     {
-        QString winPos = vbox.GetExtraData (VBoxDefs::GUI_LastWindowPosition);
+        QString winPos = vbox.GetExtraData(VBoxDefs::GUI_LastWindowPosition);
 
         bool ok = false, max = false;
         int x = 0, y = 0, w = 0, h = 0;
-        x = winPos.section (',', 0, 0).toInt (&ok);
+        x = winPos.section(',', 0, 0).toInt(&ok);
         if (ok)
-            y = winPos.section (',', 1, 1).toInt (&ok);
+            y = winPos.section(',', 1, 1).toInt(&ok);
         if (ok)
-            w = winPos.section (',', 2, 2).toInt (&ok);
+            w = winPos.section(',', 2, 2).toInt(&ok);
         if (ok)
-            h = winPos.section (',', 3, 3).toInt (&ok);
+            h = winPos.section(',', 3, 3).toInt(&ok);
         if (ok)
-            max = winPos.section (',', 4, 4) == VBoxDefs::GUI_LastWindowState_Max;
-
-        QRect ar = ok ? QApplication::desktop()->availableGeometry (QPoint (x, y)) :
-                        QApplication::desktop()->availableGeometry (this);
+            max = winPos.section(',', 4, 4) == VBoxDefs::GUI_LastWindowState_Max;
+
+        QRect ar = ok ? QApplication::desktop()->availableGeometry(QPoint(x, y)) :
+                        QApplication::desktop()->availableGeometry(this);
 
         if (ok /* previous parameters were read correctly */
@@ -329 +329 @@
             && (x + w > ar.left()) && (x < ar.right()) /* & horizontal bounds */)
         {
-            mNormalGeo.moveTo (x, y);
-            mNormalGeo.setSize (QSize (w, h).expandedTo (minimumSizeHint())
-                                            .boundedTo (ar.size()));
-            setGeometry (mNormalGeo);
+            mNormalGeo.moveTo(x, y);
+            mNormalGeo.setSize(QSize(w, h).expandedTo(minimumSizeHint())
+                                          .boundedTo(ar.size()));
+            setGeometry(mNormalGeo);
             if (max) /* maximize if needed */
                 showMaximized();
@@ -338 +338 @@
         else
         {
-            mNormalGeo.setSize (QSize (770, 550).expandedTo (minimumSizeHint())
-                                                .boundedTo (ar.size()));
-            mNormalGeo.moveCenter (ar.center());
-            setGeometry (mNormalGeo);
+            mNormalGeo.setSize(QSize(770, 550).expandedTo(minimumSizeHint())
+                                              .boundedTo(ar.size()));
+            mNormalGeo.moveCenter(ar.center());
+            setGeometry(mNormalGeo);
         }
     }
@@ -349 +349 @@
 
     /* Reset to the first item */
-    mVMListView->selectItemByRow (0);
+    mVMListView->selectItemByRow(0);
 
     /* restore the position of vm selector */
     {
-        QString prevVMId = vbox.GetExtraData (VBoxDefs::GUI_LastVMSelected);
-
-        mVMListView->selectItemById (prevVMId);
+        QString prevVMId = vbox.GetExtraData(VBoxDefs::GUI_LastVMSelected);
+
+        mVMListView->selectItemById(prevVMId);
     }
 
@@ -383 +383 @@
 
     /* signals and slots connections */
-    connect (mFileMediaMgrAction, SIGNAL (triggered()), this, SLOT (fileMediaMgr()));
-    connect (mFileApplianceImportAction, SIGNAL (triggered()), this, SLOT (fileImportAppliance()));
-    connect (mFileApplianceExportAction, SIGNAL (triggered()), this, SLOT (fileExportAppliance()));
-    connect (mFileSettingsAction, SIGNAL (triggered()), this, SLOT (fileSettings()));
-    connect (mFileExitAction, SIGNAL (triggered()), this, SLOT (fileExit()));
-    connect (mVmNewAction, SIGNAL (triggered()), this, SLOT (vmNew()));
-
-    connect (mVmConfigAction, SIGNAL (triggered()), this, SLOT (vmSettings()));
-    connect (mVmDeleteAction, SIGNAL (triggered()), this, SLOT (vmDelete()));
-    connect (mVmStartAction, SIGNAL (triggered()), this, SLOT (vmStart()));
-    connect (mVmDiscardAction, SIGNAL (triggered()), this, SLOT (vmDiscard()));
-    connect (mVmPauseAction, SIGNAL (toggled (bool)), this, SLOT (vmPause (bool)));
-    connect (mVmRefreshAction, SIGNAL (triggered()), this, SLOT (vmRefresh()));
-    connect (mVmShowLogsAction, SIGNAL (triggered()), this, SLOT (vmShowLogs()));
-
-    connect (mVMListView, SIGNAL (currentChanged()),
-             this, SLOT (vmListViewCurrentChanged()));
-    connect (mVMListView, SIGNAL (activated()),
-             this, SLOT (vmStart()));
-    connect (mVMListView, SIGNAL (customContextMenuRequested (const QPoint &)),
-             this, SLOT (showContextMenu (const QPoint &)));
-
-    connect (m_pVMDesktop, SIGNAL(linkClicked(const QString &)),
-             this, SLOT(vmSettings(const QString &)));
+    connect(mFileMediaMgrAction, SIGNAL(triggered()), this, SLOT(fileMediaMgr()));
+    connect(mFileApplianceImportAction, SIGNAL(triggered()), this, SLOT(fileImportAppliance()));
+    connect(mFileApplianceExportAction, SIGNAL(triggered()), this, SLOT(fileExportAppliance()));
+    connect(mFileSettingsAction, SIGNAL(triggered()), this, SLOT(fileSettings()));
+    connect(mFileExitAction, SIGNAL(triggered()), this, SLOT(fileExit()));
+    connect(mVmNewAction, SIGNAL(triggered()), this, SLOT(vmNew()));
+
+    connect(mVmConfigAction, SIGNAL(triggered()), this, SLOT(vmSettings()));
+    connect(mVmDeleteAction, SIGNAL(triggered()), this, SLOT(vmDelete()));
+    connect(mVmStartAction, SIGNAL(triggered()), this, SLOT(vmStart()));
+    connect(mVmDiscardAction, SIGNAL(triggered()), this, SLOT(vmDiscard()));
+    connect(mVmPauseAction, SIGNAL(toggled(bool)), this, SLOT(vmPause(bool)));
+    connect(mVmRefreshAction, SIGNAL(triggered()), this, SLOT(vmRefresh()));
+    connect(mVmShowLogsAction, SIGNAL(triggered()), this, SLOT(vmShowLogs()));
+
+    connect(mVMListView, SIGNAL(currentChanged()),
+            this, SLOT(vmListViewCurrentChanged()));
+    connect(mVMListView, SIGNAL(activated()),
+            this, SLOT(vmStart()));
+    connect(mVMListView, SIGNAL(customContextMenuRequested(const QPoint &)),
+            this, SLOT(showContextMenu(const QPoint &)));
+
+    connect(m_pVMDesktop, SIGNAL(linkClicked(const QString &)),
+            this, SLOT(vmSettings(const QString &)));
 
     /* listen to media enumeration signals */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumStarted()),
-             this, SLOT (mediumEnumStarted()));
-    connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)),
-             this, SLOT (mediumEnumFinished (const VBoxMediaList &)));
+    connect(&vboxGlobal(), SIGNAL(mediumEnumStarted()),
+            this, SLOT(mediumEnumStarted()));
+    connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)),
+            this, SLOT(mediumEnumFinished(const VBoxMediaList &)));
 
     /* connect VirtualBox events */
-    connect (gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
-             this, SLOT(machineStateChanged(QString, KMachineState)));
-    connect (gVBoxEvents, SIGNAL(sigMachineDataChange(QString)),
-             this, SLOT(machineDataChanged(QString)));
-    connect (gVBoxEvents, SIGNAL(sigMachineRegistered(QString, bool)),
-             this, SLOT(machineRegistered(QString, bool)));
-    connect (gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)),
-             this, SLOT(sessionStateChanged(QString, KSessionState)));
-    connect (gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)),
-             this, SLOT(snapshotChanged(QString, QString)));
+    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
+            this, SLOT(machineStateChanged(QString, KMachineState)));
+    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)),
+            this, SLOT(machineDataChanged(QString)));
+    connect(gVBoxEvents, SIGNAL(sigMachineRegistered(QString, bool)),
+            this, SLOT(machineRegistered(QString, bool)));
+    connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)),
+            this, SLOT(sessionStateChanged(QString, KSessionState)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)),
+            this, SLOT(snapshotChanged(QString, QString)));
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    connect (gEDataEvents, SIGNAL(sigMainWindowCountChange(int)),
-             this, SLOT(mainWindowCountChanged(int)));
-    connect (gEDataEvents, SIGNAL(sigCanShowTrayIcon(bool)),
-             this, SLOT(trayIconCanShow(bool)));
-    connect (gEDataEvents, SIGNAL(sigTrayIconChange(bool)),
-             this, SLOT(trayIconChanged(bool)));
-    connect (&vboxGlobal(), SIGNAL(sigTrayIconShow(bool)),
-             this, SLOT(trayIconShow(bool)));
+    connect(gEDataEvents, SIGNAL(sigMainWindowCountChange(int)),
+            this, SLOT(mainWindowCountChanged(int)));
+    connect(gEDataEvents, SIGNAL(sigCanShowTrayIcon(bool)),
+            this, SLOT(trayIconCanShow(bool)));
+    connect(gEDataEvents, SIGNAL(sigTrayIconChange(bool)),
+            this, SLOT(trayIconChanged(bool)));
+    connect(&vboxGlobal(), SIGNAL(sigTrayIconShow(bool)),
+            this, SLOT(trayIconShow(bool)));
 #endif
 
@@ -453 +453 @@
     {
         int y = mNormalGeo.y();
-        QString winPos = QString ("%1,%2,%3,%4")
-            .arg (mNormalGeo.x()).arg (y)
-            .arg (mNormalGeo.width()).arg (mNormalGeo.height());
+        QString winPos = QString("%1,%2,%3,%4")
+            .arg(mNormalGeo.x()).arg(y)
+            .arg(mNormalGeo.width()).arg(mNormalGeo.height());
 #ifdef Q_WS_MAC
         ::darwinUnregisterForUnifiedToolbarContextMenuEvents(this);
@@ -462 +462 @@
         if (isMaximized())
 #endif /* !Q_WS_MAC */
-            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowState_Max);
-
-        vbox.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);
+            winPos += QString(",%1").arg(VBoxDefs::GUI_LastWindowState_Max);
+
+        vbox.SetExtraData(VBoxDefs::GUI_LastWindowPosition, winPos);
     }
 
@@ -471 +471 @@
         UIVMItem *item = mVMListView->selectedItem();
         QString curVMId = item ?
-            QString (item->id()) :
+            QString(item->id()) :
             QString::null;
-        vbox.SetExtraData (VBoxDefs::GUI_LastVMSelected, curVMId);
+        vbox.SetExtraData(VBoxDefs::GUI_LastVMSelected, curVMId);
     }
 
@@ -497 +497 @@
 void VBoxSelectorWnd::fileMediaMgr()
 {
-    VBoxMediaManagerDlg::showModeless (this);
+    VBoxMediaManagerDlg::showModeless(this);
 }
 
 void VBoxSelectorWnd::fileImportAppliance()
 {
-    UIImportApplianceWzd wzd (this);
+    UIImportApplianceWzd wzd(this);
 
     wzd.exec();
@@ -515 +515 @@
         name = item->name();
 
-    UIExportApplianceWzd wzd (this, name);
+    UIExportApplianceWzd wzd(this, name);
 
     wzd.exec();
@@ -525 +525 @@
     CSystemProperties props = vboxGlobal().virtualBox().GetSystemProperties();
 
-    UISettingsDialog *dlg = new UIGLSettingsDlg (this);
+    UISettingsDialog *dlg = new UIGLSettingsDlg(this);
     dlg->getFrom();
 
@@ -540 +540 @@
      * different to Qt3 where a *mainWidget* exists & if this going to close
      * all other windows are closed automatically. We do the same below. */
-    foreach (QWidget *widget, QApplication::topLevelWidgets())
+    foreach(QWidget *widget, QApplication::topLevelWidgets())
     {
         if (widget->isVisible() &&
@@ -552 +552 @@
 void VBoxSelectorWnd::vmNew()
 {
-    UINewVMWzd wzd (this);
+    UINewVMWzd wzd(this);
     if (wzd.exec() == QDialog::Accepted)
     {
@@ -559 +559 @@
         /* wait until the list is updated by OnMachineRegistered() */
         QModelIndex index;
-        while (!index.isValid())
+        while(!index.isValid())
         {
             qApp->processEvents();
-            index = mVMModel->indexById (m.GetId());
-        }
-        mVMListView->setCurrentIndex (index);
+            index = mVMModel->indexById(m.GetId());
+        }
+        mVMListView->setCurrentIndex(index);
     }
 }
@@ -571 +571 @@
  *  Opens the VM settings dialog.
  */
-void VBoxSelectorWnd::vmSettings (const QString &aCategory /* = QString::null */,
-                                  const QString &aControl /* = QString::null */,
-                                  const QString &aUuid /* = QString::null */)
+void VBoxSelectorWnd::vmSettings(const QString &aCategory /* = QString::null */,
+                                 const QString &aControl /* = QString::null */,
+                                 const QString &aUuid /* = QString::null */)
 {
     if (!aCategory.isEmpty() && aCategory [0] != '#')
     {
         /* Assume it's a href from the Details HTML */
-        vboxGlobal().openURL (aCategory);
+        vboxGlobal().openURL(aCategory);
         return;
     }
@@ -595 +595 @@
 
     UIVMItem *item = aUuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
 
     // open a direct session to modify VM settings
     QString id = item->id();
-    CSession session = vboxGlobal().openSession (id);
+    CSession session = vboxGlobal().openSession(id);
     if (session.isNull())
         return;
 
     CMachine m = session.GetMachine();
-    AssertMsgReturn (!m.isNull(), ("Machine must not be null"), (void) 0);
-
-    UISettingsDialog *dlg = new UIVMSettingsDlg (this, m, strCategory, strControl);
+    AssertMsgReturn(!m.isNull(), ("Machine must not be null"), (void) 0);
+
+    UISettingsDialog *dlg = new UIVMSettingsDlg(this, m, strCategory, strControl);
     dlg->getFrom();
 
@@ -619 +619 @@
         if (m.isOk())
         {
-            if (oldName.compare (m.GetName()))
+            if (oldName.compare(m.GetName()))
                 mVMModel->sort();
         }
         else
-            vboxProblem().cannotSaveMachineSettings (m);
+            vboxProblem().cannotSaveMachineSettings(m);
 
         /* To check use the result in future
-         * vboxProblem().cannotApplyMachineSettings (m, res); */
+         * vboxProblem().cannotApplyMachineSettings(m, res); */
     }
 
@@ -636 +636 @@
 }
 
-void VBoxSelectorWnd::vmDelete (const QString &aUuid /* = QString::null */)
+void VBoxSelectorWnd::vmDelete(const QString &aUuid /* = QString::null */)
 {
     UIVMItem *item = aUuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
 
     CMachine machine = item->machine();
@@ -667 +667 @@
 }
 
-void VBoxSelectorWnd::vmStart (const QString &aUuid /* = QString::null */)
-{
-    QUuid uuid (aUuid);
+void VBoxSelectorWnd::vmStart(const QString &aUuid /* = QString::null */)
+{
+    QUuid uuid(aUuid);
     UIVMItem *item = uuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
 
     /* Are we called from the mVMListView's activated() signal? */
@@ -684 +684 @@
     }
 
-    AssertMsg (!vboxGlobal().isVMConsoleProcess(),
-               ("Must NOT be a VM console process"));
+    AssertMsg(!vboxGlobal().isVMConsoleProcess(),
+              ("Must NOT be a VM console process"));
 
     /* just switch to the VM window if it already exists */
@@ -694 +694 @@
     }
 
-    AssertMsg (   item->machineState() == KMachineState_PoweredOff
-               || item->machineState() == KMachineState_Saved
-               || item->machineState() == KMachineState_Teleported
-               || item->machineState() == KMachineState_Aborted
-               , ("Machine must be PoweredOff/Saved/Aborted (%d)", item->machineState()));
+    AssertMsg(   item->machineState() == KMachineState_PoweredOff
+              || item->machineState() == KMachineState_Saved
+              || item->machineState() == KMachineState_Teleported
+              || item->machineState() == KMachineState_Aborted
+              , ("Machine must be PoweredOff/Saved/Aborted (%d)", item->machineState()));
 
     QString id = item->id();
@@ -704 +704 @@
     CSession session;
 
-    session.createInstance (CLSID_Session);
+    session.createInstance(CLSID_Session);
     if (session.isNull())
     {
-        vboxProblem().cannotOpenSession (session);
+        vboxProblem().cannotOpenSession(session);
         return;
     }
 
-#if defined (Q_OS_WIN32)
+#if defined(Q_OS_WIN32)
     /* allow the started VM process to make itself the foreground window */
-    AllowSetForegroundWindow (ASFW_ANY);
+    AllowSetForegroundWindow(ASFW_ANY);
 #endif
 
     QString env;
-#if defined (Q_WS_X11)
+#if defined(Q_WS_X11)
     /* make sure the VM process will start on the same display as the Selector */
-    const char *display = RTEnvGet ("DISPLAY");
+    const char *display = RTEnvGet("DISPLAY");
     if (display)
         env.append(QString("DISPLAY=%1\n").arg(display));
-    const char *xauth = RTEnvGet ("XAUTHORITY");
+    const char *xauth = RTEnvGet("XAUTHORITY");
     if (xauth)
         env.append(QString("XAUTHORITY=%1\n").arg(xauth));
@@ -744 +744 @@
 }
 
-void VBoxSelectorWnd::vmDiscard (const QString &aUuid /* = QString::null */)
+void VBoxSelectorWnd::vmDiscard(const QString &aUuid /* = QString::null */)
 {
     UIVMItem *item = aUuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
-
-    if (!vboxProblem().confirmDiscardSavedState (item->machine()))
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
+
+    if (!vboxProblem().confirmDiscardSavedState(item->machine()))
         return;
 
@@ -758 +758 @@
     CSession session;
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    session.createInstance (CLSID_Session);
+    session.createInstance(CLSID_Session);
     if (session.isNull())
     {
@@ -770 +770 @@
     if (!vbox.isOk())
     {
-        vboxProblem().cannotOpenSession (vbox, item->machine());
+        vboxProblem().cannotOpenSession(vbox, item->machine());
         return;
     }
@@ -777 +777 @@
     console.DiscardSavedState(true /* fDeleteFile */);
     if (!console.isOk())
-        vboxProblem().cannotDiscardSavedState (console);
+        vboxProblem().cannotDiscardSavedState(console);
 
     session.UnlockMachine();
 }
 
-void VBoxSelectorWnd::vmPause (bool aPause, const QString &aUuid /* = QString::null */)
+void VBoxSelectorWnd::vmPause(bool aPause, const QString &aUuid /* = QString::null */)
 {
     UIVMItem *item = aUuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
-
-    CSession session = vboxGlobal().openExistingSession (item->id());
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
+
+    CSession session = vboxGlobal().openExistingSession(item->id());
     if (session.isNull())
         return;
@@ -806 +806 @@
     {
         if (aPause)
-            vboxProblem().cannotPauseMachine (console);
+            vboxProblem().cannotPauseMachine(console);
         else
-            vboxProblem().cannotResumeMachine (console);
+            vboxProblem().cannotResumeMachine(console);
     }
 
@@ -814 +814 @@
 }
 
-void VBoxSelectorWnd::vmRefresh (const QString &aUuid /* = QString::null */)
+void VBoxSelectorWnd::vmRefresh(const QString &aUuid /* = QString::null */)
 {
     UIVMItem *item = aUuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
-
-    refreshVMItem (item->id(),
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
+
+    refreshVMItem(item->id(),
                    true /* aDetails */,
                    true /* aSnapshot */,
@@ -827 +827 @@
 }
 
-void VBoxSelectorWnd::vmShowLogs (const QString &aUuid /* = QString::null */)
+void VBoxSelectorWnd::vmShowLogs(const QString &aUuid /* = QString::null */)
 {
     UIVMItem *item = aUuid.isNull() ? mVMListView->selectedItem() :
-                       mVMModel->itemById (aUuid);
-
-    AssertMsgReturnVoid (item, ("Item must be always selected here"));
+                       mVMModel->itemById(aUuid);
+
+    AssertMsgReturnVoid(item, ("Item must be always selected here"));
 
     CMachine machine = item->machine();
-    VBoxVMLogViewer::createLogViewer (this, machine);
+    VBoxVMLogViewer::createLogViewer(this, machine);
 }
 
@@ -844 +844 @@
     for (CMachineVector::ConstIterator m = vec.begin();
          m != vec.end(); ++ m)
-        mVMModel->addItem (new UIVMItem (*m));
+        mVMModel->addItem(new UIVMItem(*m));
     mVMModel->sort();
 
@@ -860 +860 @@
                                     bool aDescription)
 {
-    UIVMItem *item = mVMModel->itemById (aID);
+    UIVMItem *item = mVMModel->itemById(aID);
     if (item)
     {
-        mVMModel->refreshItem (item);
+        mVMModel->refreshItem(item);
         if (item && item->id() == aID)
-            vmListViewCurrentChanged (aDetails, aSnapshots, aDescription);
-    }
-}
-
-void VBoxSelectorWnd::showContextMenu (const QPoint &aPoint)
+            vmListViewCurrentChanged(aDetails, aSnapshots, aDescription);
+    }
+}
+
+void VBoxSelectorWnd::showContextMenu(const QPoint &aPoint)
 {
     /* Send a context menu request */
-    const QModelIndex &index = mVMListView->indexAt (aPoint);
+    const QModelIndex &index = mVMListView->indexAt(aPoint);
     if (index.isValid())
-        if (mVMListView->model()->data (index,
+        if (mVMListView->model()->data(index,
             UIVMItemModel::UIVMItemPtrRole).value <UIVMItem*>())
-                mVMCtxtMenu->exec (mVMListView->mapToGlobal (aPoint));
+                mVMCtxtMenu->exec(mVMListView->mapToGlobal(aPoint));
 }
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
 
-void VBoxSelectorWnd::trayIconActivated (QSystemTrayIcon::ActivationReason aReason)
+void VBoxSelectorWnd::trayIconActivated(QSystemTrayIcon::ActivationReason aReason)
 {
     switch (aReason)
@@ -918 +918 @@
 /////////////////////////////////////////////////////////////////////////////
 
-bool VBoxSelectorWnd::event (QEvent *e)
+bool VBoxSelectorWnd::event(QEvent *e)
 {
     switch (e->type())
@@ -931 +931 @@
             if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
                                   Qt::WindowFullScreen)) == 0)
-                mNormalGeo.setSize (re->size());
+                mNormalGeo.setSize(re->size());
             break;
         }
@@ -938 +938 @@
             if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
                                   Qt::WindowFullScreen)) == 0)
-                mNormalGeo.moveTo (geometry().x(), geometry().y());
+                mNormalGeo.moveTo(geometry().x(), geometry().y());
             break;
         }
@@ -974 +974 @@
     }
 
-    return QMainWindow::event (e);
-}
-
-void VBoxSelectorWnd::closeEvent (QCloseEvent *aEvent)
+    return QMainWindow::event(e);
+}
+
+void VBoxSelectorWnd::closeEvent(QCloseEvent *aEvent)
 {
 #ifdef VBOX_GUI_WITH_SYSTRAY
     /* Needed for breaking out of the while() loop in main(). */
     if (vboxGlobal().isTrayMenu())
-        vboxGlobal().setTrayMenu (false);
+        vboxGlobal().setTrayMenu(false);
 #endif
 
     emit closing();
-    QMainWindow::closeEvent (aEvent);
+    QMainWindow::closeEvent(aEvent);
 }
 
 #if defined (Q_WS_MAC) && (QT_VERSION < 0x040402)
-bool VBoxSelectorWnd::eventFilter (QObject *aObject, QEvent *aEvent)
+bool VBoxSelectorWnd::eventFilter(QObject *aObject, QEvent *aEvent)
 {
     if (!isActiveWindow())
-        return QIWithRetranslateUI2<QMainWindow>::eventFilter (aObject, aEvent);
-
-    if (qobject_cast<QWidget*> (aObject) &&
-        qobject_cast<QWidget*> (aObject)->window() != this)
-        return QIWithRetranslateUI2<QMainWindow>::eventFilter (aObject, aEvent);
+        return QIWithRetranslateUI2<QMainWindow>::eventFilter(aObject, aEvent);
+
+    if (qobject_cast<QWidget*>(aObject) &&
+        qobject_cast<QWidget*>(aObject)->window() != this)
+        return QIWithRetranslateUI2<QMainWindow>::eventFilter(aObject, aEvent);
 
     switch (aEvent->type())
@@ -1012 +1012 @@
             break;
     }
-    return QIWithRetranslateUI2<QMainWindow>::eventFilter (aObject, aEvent);
+    return QIWithRetranslateUI2<QMainWindow>::eventFilter(aObject, aEvent);
 }
 #endif /* defined (Q_WS_MAC) && (QT_VERSION < 0x040402) */
@@ -1023 +1023 @@
 {
 #ifdef VBOX_OSE
-    QString title (tr ("VirtualBox OSE"));
+    QString title(tr("VirtualBox OSE"));
 #else
-    QString title (VBOX_PRODUCT);
+    QString title(VBOX_PRODUCT);
 #endif
 
@@ -1036 +1036 @@
 #endif
 
-    setWindowTitle (title);
+    setWindowTitle(title);
 
     /* ensure the details and screenshot view are updated */
     vmListViewCurrentChanged();
 
-    mFileMediaMgrAction->setText (tr ("&Virtual Media Manager..."));
-    mFileMediaMgrAction->setShortcut (QKeySequence ("Ctrl+D"));
-    mFileMediaMgrAction->setStatusTip (tr ("Display the Virtual Media Manager dialog"));
-
-    mFileApplianceImportAction->setText (tr ("&Import Appliance..."));
-    mFileApplianceImportAction->setShortcut (QKeySequence ("Ctrl+I"));
-    mFileApplianceImportAction->setStatusTip (tr ("Import an appliance into VirtualBox"));
-
-    mFileApplianceExportAction->setText (tr ("&Export Appliance..."));
-    mFileApplianceExportAction->setShortcut (QKeySequence ("Ctrl+E"));
-    mFileApplianceExportAction->setStatusTip (tr ("Export one or more VirtualBox virtual machines as an appliance"));
+    mFileMediaMgrAction->setText(tr("&Virtual Media Manager..."));
+    mFileMediaMgrAction->setShortcut(QKeySequence("Ctrl+D"));
+    mFileMediaMgrAction->setStatusTip(tr("Display the Virtual Media Manager dialog"));
+
+    mFileApplianceImportAction->setText(tr("&Import Appliance..."));
+    mFileApplianceImportAction->setShortcut(QKeySequence("Ctrl+I"));
+    mFileApplianceImportAction->setStatusTip(tr("Import an appliance into VirtualBox"));
+
+    mFileApplianceExportAction->setText(tr("&Export Appliance..."));
+    mFileApplianceExportAction->setShortcut(QKeySequence("Ctrl+E"));
+    mFileApplianceExportAction->setStatusTip(tr("Export one or more VirtualBox virtual machines as an appliance"));
 
 #ifdef Q_WS_MAC
@@ -1064 +1064 @@
      * be really interesting to see how this plays on non-english systems...
      */
-    mFileSettingsAction->setText (tr ("&Preferences...", "global settings"));
+    mFileSettingsAction->setText(tr("&Preferences...", "global settings"));
 #else
     /*
@@ -1071 +1071 @@
      * to figure out.
      */
-    mFileSettingsAction->setText (tr ("&Preferences...", "global settings"));
+    mFileSettingsAction->setText(tr("&Preferences...", "global settings"));
 #endif
-    mFileSettingsAction->setShortcut (QKeySequence ("Ctrl+G"));
-    mFileSettingsAction->setStatusTip (tr ("Display the global settings dialog"));
-
-    mFileExitAction->setText (tr ("E&xit"));
-    mFileExitAction->setShortcut (QKeySequence ("Ctrl+Q"));
-    mFileExitAction->setStatusTip (tr ("Close application"));
-
-    mVmNewAction->setText (tr ("&New..."));
-    mVmNewAction->setShortcut (QKeySequence ("Ctrl+N"));
-    mVmNewAction->setStatusTip (tr ("Create a new virtual machine"));
-    mVmNewAction->setToolTip (mVmNewAction->text().remove ('&').remove ('.') +
-        QString (" (%1)").arg (mVmNewAction->shortcut().toString()));
-
-    mVmConfigAction->setText (tr ("&Settings..."));
-    mVmConfigAction->setShortcut (QKeySequence ("Ctrl+S"));
-    mVmConfigAction->setStatusTip (tr ("Configure the selected virtual machine"));
-    mVmConfigAction->setToolTip (mVmConfigAction->text().remove ('&').remove ('.') +
-        QString (" (%1)").arg (mVmConfigAction->shortcut().toString()));
-
-    mVmDeleteAction->setText (tr ("&Delete"));
-    mVmDeleteAction->setShortcut (QKeySequence ("Ctrl+R"));
-    mVmDeleteAction->setStatusTip (tr ("Delete the selected virtual machine"));
+    mFileSettingsAction->setShortcut(QKeySequence("Ctrl+G"));
+    mFileSettingsAction->setStatusTip(tr("Display the global settings dialog"));
+
+    mFileExitAction->setText(tr("E&xit"));
+    mFileExitAction->setShortcut(QKeySequence("Ctrl+Q"));
+    mFileExitAction->setStatusTip(tr("Close application"));
+
+    mVmNewAction->setText(tr("&New..."));
+    mVmNewAction->setShortcut(QKeySequence("Ctrl+N"));
+    mVmNewAction->setStatusTip(tr("Create a new virtual machine"));
+    mVmNewAction->setToolTip(mVmNewAction->text().remove('&').remove('.') +
+        QString("(%1)").arg(mVmNewAction->shortcut().toString()));
+
+    mVmConfigAction->setText(tr("&Settings..."));
+    mVmConfigAction->setShortcut(QKeySequence("Ctrl+S"));
+    mVmConfigAction->setStatusTip(tr("Configure the selected virtual machine"));
+    mVmConfigAction->setToolTip(mVmConfigAction->text().remove('&').remove('.') +
+        QString("(%1)").arg(mVmConfigAction->shortcut().toString()));
+
+    mVmDeleteAction->setText(tr("&Delete"));
+    mVmDeleteAction->setShortcut(QKeySequence("Ctrl+R"));
+    mVmDeleteAction->setStatusTip(tr("Delete the selected virtual machine"));
 
     /* Note: mVmStartAction text is set up in vmListViewCurrentChanged() */
 
-    mVmDiscardAction->setText (tr ("D&iscard"));
-    mVmDiscardAction->setStatusTip (
-        tr ("Discard the saved state of the selected virtual machine"));
-
-    mVmPauseAction->setText (tr ("&Pause"));
-    mVmPauseAction->setStatusTip (
-        tr ("Suspend the execution of the virtual machine"));
-
-    mVmRefreshAction->setText (tr ("Re&fresh"));
-    mVmRefreshAction->setStatusTip (
-        tr ("Refresh the accessibility state of the selected virtual machine"));
-
-    mVmShowLogsAction->setText (tr ("Show &Log..."));
-    mVmShowLogsAction->setIconText (tr ("Log", "icon text"));
-    mVmShowLogsAction->setShortcut (QKeySequence ("Ctrl+L"));
-    mVmShowLogsAction->setStatusTip (
-        tr ("Show the log files of the selected virtual machine"));
+    mVmDiscardAction->setText(tr("D&iscard"));
+    mVmDiscardAction->setStatusTip(
+        tr("Discard the saved state of the selected virtual machine"));
+
+    mVmPauseAction->setText(tr("&Pause"));
+    mVmPauseAction->setStatusTip(
+        tr("Suspend the execution of the virtual machine"));
+
+    mVmRefreshAction->setText(tr("Re&fresh"));
+    mVmRefreshAction->setStatusTip(
+        tr("Refresh the accessibility state of the selected virtual machine"));
+
+    mVmShowLogsAction->setText(tr("Show &Log..."));
+    mVmShowLogsAction->setIconText(tr("Log", "icon text"));
+    mVmShowLogsAction->setShortcut(QKeySequence("Ctrl+L"));
+    mVmShowLogsAction->setStatusTip(
+        tr("Show the log files of the selected virtual machine"));
 
     mHelpActions.retranslateUi();
 
 #ifdef Q_WS_MAC
-    mFileMenu->setTitle (tr("&File", "Mac OS X version"));
+    mFileMenu->setTitle(tr("&File", "Mac OS X version"));
 #else /* Q_WS_MAC */
-    mFileMenu->setTitle (tr("&File", "Non Mac OS X version"));
+    mFileMenu->setTitle(tr("&File", "Non Mac OS X version"));
 #endif /* !Q_WS_MAC */
-    mVMMenu->setTitle (tr ("&Machine"));
-    mHelpMenu->setTitle (tr ("&Help"));
+    mVMMenu->setTitle(tr("&Machine"));
+    mHelpMenu->setTitle(tr("&Help"));
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
@@ -1151 +1151 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void VBoxSelectorWnd::vmListViewCurrentChanged (bool aRefreshDetails,
-                                                bool aRefreshSnapshots,
-                                                bool aRefreshDescription)
+void VBoxSelectorWnd::vmListViewCurrentChanged(bool aRefreshDetails,
+                                               bool aRefreshSnapshots,
+                                               bool aRefreshDescription)
 {
     UIVMItem *item = mVMListView->selectedItem();
@@ -1191 +1191 @@
            )
         {
-            mVmStartAction->setText (tr ("S&tart"));
+            mVmStartAction->setText(tr("S&tart"));
 #ifdef QT_MAC_USE_COCOA
             /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
@@ -1199 +1199 @@
             mVMToolBar->updateLayout();
 #endif /* QT_MAC_USE_COCOA */
-            mVmStartAction->setStatusTip (
-                tr ("Start the selected virtual machine"));
-
-            mVmStartAction->setEnabled (!running);
+            mVmStartAction->setStatusTip(
+                tr("Start the selected virtual machine"));
+
+            mVmStartAction->setEnabled(!running);
         }
         else
         {
-            mVmStartAction->setText (tr ("S&how"));
+            mVmStartAction->setText(tr("S&how"));
 #ifdef QT_MAC_USE_COCOA
             /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
@@ -1214 +1214 @@
             mVMToolBar->updateLayout();
 #endif /* QT_MAC_USE_COCOA */
-            mVmStartAction->setStatusTip (
-                tr ("Switch to the window of the selected virtual machine"));
-
-            mVmStartAction->setEnabled (item->canSwitchTo());
+            mVmStartAction->setStatusTip(
+                tr("Switch to the window of the selected virtual machine"));
+
+            mVmStartAction->setEnabled(item->canSwitchTo());
         }
 
@@ -1225 +1225 @@
            )
         {
-            mVmPauseAction->setText (tr ("R&esume"));
-            mVmPauseAction->setShortcut (QKeySequence ("Ctrl+P"));
-            mVmPauseAction->setStatusTip (
-                tr ("Resume the execution of the virtual machine"));
-            mVmPauseAction->blockSignals (true);
-            mVmPauseAction->setChecked (true);
-            mVmPauseAction->blockSignals (false);
+            mVmPauseAction->setText(tr("R&esume"));
+            mVmPauseAction->setShortcut(QKeySequence("Ctrl+P"));
+            mVmPauseAction->setStatusTip(
+                tr("Resume the execution of the virtual machine"));
+            mVmPauseAction->blockSignals(true);
+            mVmPauseAction->setChecked(true);
+            mVmPauseAction->blockSignals(false);
         }
         else
         {
-            mVmPauseAction->setText (tr ("&Pause"));
-            mVmPauseAction->setShortcut (QKeySequence ("Ctrl+P"));
-            mVmPauseAction->setStatusTip (
-                tr ("Suspend the execution of the virtual machine"));
-            mVmPauseAction->blockSignals (true);
-            mVmPauseAction->setChecked (false);
-            mVmPauseAction->blockSignals (false);
+            mVmPauseAction->setText(tr("&Pause"));
+            mVmPauseAction->setShortcut(QKeySequence("Ctrl+P"));
+            mVmPauseAction->setStatusTip(
+                tr("Suspend the execution of the virtual machine"));
+            mVmPauseAction->blockSignals(true);
+            mVmPauseAction->setChecked(false);
+            mVmPauseAction->blockSignals(false);
         }
 
         /* disable Refresh for accessible machines */
-        mVmRefreshAction->setEnabled (false);
+        mVmRefreshAction->setEnabled(false);
 
         /* enable the show log item for the selected vm */
-        mVmShowLogsAction->setEnabled (true);
+        mVmShowLogsAction->setEnabled(true);
     }
     else
@@ -1281 +1281 @@
                    "or visit "
                    "<a href=http://www.virtualbox.org>www.virtualbox.org</a> "
-                   "for the latest information and news.</p>").arg (QKeySequence (QKeySequence::HelpContents).toString (QKeySequence::NativeText)));
+                   "for the latest information and news.</p>").arg(QKeySequence(QKeySequence::HelpContents).toString(QKeySequence::NativeText)));
             mVmRefreshAction->setEnabled(false);
         }
@@ -1290 +1290 @@
 
         /* disable modify actions */
-        mVmConfigAction->setEnabled (false);
-        mVmDeleteAction->setEnabled (item != NULL);
-        mVmDiscardAction->setEnabled (false);
-        mVmPauseAction->setEnabled (false);
+        mVmConfigAction->setEnabled(false);
+        mVmDeleteAction->setEnabled(item != NULL);
+        mVmDiscardAction->setEnabled(false);
+        mVmPauseAction->setEnabled(false);
 
         /* change the Start button text accordingly */
-        mVmStartAction->setText (tr ("S&tart"));
-        mVmStartAction->setStatusTip (
-            tr ("Start the selected virtual machine"));
-        mVmStartAction->setEnabled (false);
+        mVmStartAction->setText(tr("S&tart"));
+        mVmStartAction->setStatusTip(
+            tr("Start the selected virtual machine"));
+        mVmStartAction->setEnabled(false);
 
         /* disable the show log item for the selected vm */
-        mVmShowLogsAction->setEnabled (false);
+        mVmShowLogsAction->setEnabled(false);
     }
 }
@@ -1309 +1309 @@
 {
     /* refresh the current details to pick up hard disk sizes */
-    vmListViewCurrentChanged (true /* aRefreshDetails */);
-}
-
-void VBoxSelectorWnd::mediumEnumFinished (const VBoxMediaList &list)
+    vmListViewCurrentChanged(true /* aRefreshDetails */);
+}
+
+void VBoxSelectorWnd::mediumEnumFinished(const VBoxMediaList &list)
 {
     /* refresh the current details to pick up hard disk sizes */
-    vmListViewCurrentChanged (true /* aRefreshDetails */);
+    vmListViewCurrentChanged(true /* aRefreshDetails */);
 
     /* we warn about inaccessible media only once (after media emumeration
@@ -1337 +1337 @@
         /* ignore the signal if a VBoxMediaManagerDlg window is active */
         if (qApp->activeWindow() &&
-            !strcmp (qApp->activeWindow()->metaObject()->className(), "VBoxMediaManagerDlg"))
+            !strcmp(qApp->activeWindow()->metaObject()->className(), "VBoxMediaManagerDlg"))
             break;
 
@@ -1350 +1350 @@
             /* Show the VDM dialog but don't refresh once more after a
              * just-finished refresh */
-            VBoxMediaManagerDlg::showModeless (this, false /* aRefresh */);
+            VBoxMediaManagerDlg::showModeless(this, false /* aRefresh */);
         }
     }
@@ -1371 +1371 @@
 #endif
 
-    refreshVMItem (strId,
-                   false /* aDetails */,
-                   false /* aSnapshots */,
-                   false /* aDescription */);
+    refreshVMItem(strId,
+                  false /* aDetails */,
+                  false /* aSnapshots */,
+                  false /* aDescription */);
 
     /* simulate a state change signal */
@@ -1382 +1382 @@
 void VBoxSelectorWnd::machineDataChanged(QString strId)
 {
-    refreshVMItem (strId,
-                   true  /* aDetails */,
-                   false /* aSnapshots */,
-                   true  /* aDescription */);
+    refreshVMItem(strId,
+                  true  /* aDetails */,
+                  false /* aSnapshots */,
+                  true  /* aDescription */);
 }
 
@@ -1393 +1393 @@
     {
         CVirtualBox vbox = vboxGlobal().virtualBox();
-        CMachine m = vbox.GetMachine (strId);
+        CMachine m = vbox.GetMachine(strId);
         if (!m.isNull())
         {
-            mVMModel->addItem (new UIVMItem (m));
+            mVMModel->addItem(new UIVMItem(m));
             mVMModel->sort();
             /* Make sure the description, ... pages are properly updated.
@@ -1409 +1409 @@
     else
     {
-        UIVMItem *item = mVMModel->itemById (strId);
+        UIVMItem *item = mVMModel->itemById(strId);
         if (item)
         {
-            int row = mVMModel->rowById (item->id());
-            mVMModel->removeItem (item);
+            int row = mVMModel->rowById(item->id());
+            mVMModel->removeItem(item);
             delete item;
-            mVMListView->ensureSomeRowSelected (row);
+            mVMListView->ensureSomeRowSelected(row);
         }
 
@@ -1425 +1425 @@
 void VBoxSelectorWnd::sessionStateChanged(QString strId, KSessionState /* state */)
 {
-    refreshVMItem (strId,
-                   true  /* aDetails */,
-                   false /* aSnapshots */,
-                   false /* aDescription */);
+    refreshVMItem(strId,
+                  true  /* aDetails */,
+                  false /* aSnapshots */,
+                  false /* aDescription */);
 
     /* simulate a state change signal */
@@ -1436 +1436 @@
 void VBoxSelectorWnd::snapshotChanged(QString strId, QString /* strSnapshotId */)
 {
-    refreshVMItem (strId,
-                   false /* aDetails */,
-                   true  /* aSnapshot */,
-                   false /* aDescription */);
+    refreshVMItem(strId,
+                  false /* aDetails */,
+                  true  /* aSnapshot */,
+                  false /* aDescription */);
 }
 
@@ -1452 +1452 @@
 void VBoxSelectorWnd::trayIconCanShow(bool fEnabled)
 {
-    emit trayIconChanged(VBoxChangeTrayIconEvent (vboxGlobal().settings().trayIconEnabled()));
+    emit trayIconChanged(VBoxChangeTrayIconEvent(vboxGlobal().settings().trayIconEnabled()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.h

@@ -50 +50 @@
 public:
 
-    VBoxSelectorWnd (VBoxSelectorWnd **aSelf,
-                     QWidget* aParent = 0,
-                     Qt::WindowFlags aFlags = Qt::Window);
+    VBoxSelectorWnd(VBoxSelectorWnd **aSelf,
+                    QWidget* aParent = 0,
+                    Qt::WindowFlags aFlags = Qt::Window);
     virtual ~VBoxSelectorWnd();
 
@@ -68 +68 @@
 
     void vmNew();
-    void vmSettings (const QString &aCategory = QString::null,
-                     const QString &aControl = QString::null,
-                     const QString & = QString::null);
-    void vmDelete (const QString & = QString::null);
-    void vmStart (const QString & = QString::null);
-    void vmDiscard (const QString & = QString::null);
-    void vmPause (bool, const QString & = QString::null);
-    void vmRefresh (const QString & = QString::null);
-    void vmShowLogs (const QString & = QString::null);
+    void vmSettings(const QString &aCategory = QString::null, const QString &aControl = QString::null, const QString & = QString::null);
+    void vmDelete(const QString & = QString::null);
+    void vmStart(const QString & = QString::null);
+    void vmDiscard(const QString & = QString::null);
+    void vmPause(bool, const QString & = QString::null);
+    void vmRefresh(const QString & = QString::null);
+    void vmShowLogs(const QString & = QString::null);
 
     void refreshVMList();
-    void refreshVMItem (const QString &aID, bool aDetails,
-                                          bool aSnapshots,
-                                          bool aDescription);
+    void refreshVMItem(const QString &aID, bool aDetails, bool aSnapshots, bool aDescription);
 
-    void showContextMenu (const QPoint &aPoint);
+    void showContextMenu(const QPoint &aPoint);
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
-    void trayIconActivated (QSystemTrayIcon::ActivationReason aReason);
+    void trayIconActivated(QSystemTrayIcon::ActivationReason aReason);
     void showWindow();
 #endif
@@ -102 +98 @@
 
     /* Events */
-    bool event (QEvent *aEvent);
-    void closeEvent (QCloseEvent *aEvent);
+    bool event(QEvent *aEvent);
+    void closeEvent(QCloseEvent *aEvent);
 //#if defined (Q_WS_MAC) && (QT_VERSION < 0x040402)
-//    bool eventFilter (QObject *aObject, QEvent *aEvent);
+//    bool eventFilter(QObject *aObject, QEvent *aEvent);
 //#endif /* defined (Q_WS_MAC) && (QT_VERSION < 0x040402) */
 
@@ -112 +108 @@
 private slots:
 
-    void vmListViewCurrentChanged (bool aRefreshDetails = true,
-                                   bool aRefreshSnapshots = true,
-                                   bool aRefreshDescription = true);
-
+    void vmListViewCurrentChanged(bool aRefreshDetails = true, bool aRefreshSnapshots = true, bool aRefreshDescription = true);
     void mediumEnumStarted();
-    void mediumEnumFinished (const VBoxMediaList &);
+    void mediumEnumFinished(const VBoxMediaList &);
 
     /* VirtualBox callback events we're interested in */