Changeset 14355 in vbox for trunk

Timestamp:

Nov 19, 2008 4:03:59 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Removed some dead code and corrected indent.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSelectorWnd.h (modified) (1 diff)
• include/VBoxVMListView.h (modified) (3 diffs)
• src/VBoxSelectorWnd.cpp (modified) (9 diffs)
• src/VBoxVMListView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxSelectorWnd.h

@@ -149 +149 @@
 #ifdef VBOX_GUI_WITH_SYSTRAY
     QAction *mTrayShowWindowAction;
-    QAction *mTrayExitAction;
 #endif
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMListView.h

@@ -33 +33 @@
 class VBoxSelectorWnd;
 
-class VBoxVMItem : public QObject
-{
-    Q_OBJECT;
-
-public:
-
-    enum Action
-    {
-        Config = 0,
-        Delete,
-        Start,
-        Discard,
-        Pause,
-        Refresh,
-        ShowLogs
-    };
-
-public:
-
-    VBoxVMItem (const CMachine &aMachine, VBoxSelectorWnd *pParent);
+class VBoxVMItem
+{
+public:
+
+    VBoxVMItem (const CMachine &aMachine);
     virtual ~VBoxVMItem();
 
@@ -70 +55 @@
 
     bool accessible() const { return mAccessible; }
-    bool running() const {  return (sessionState() != KSessionState_Closed); }
     const CVirtualBoxErrorInfo &accessError() const { return mAccessError; }
     KMachineState state() const { return mState; }
@@ -83 +67 @@
 
     /* Private member vars */
-    VBoxSelectorWnd *mParent;
     CMachine mMachine;
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxSelectorWnd.cpp

@@ -570 +570 @@
     mTrayShowWindowAction->setText (tr ("Sun xVM VirtualBox"));
 
-    mTrayExitAction = new QAction (this);
-    Assert (mTrayExitAction);
-    mTrayExitAction->setMenuRole (QAction::QuitRole);
-    mTrayExitAction->setIcon (VBoxGlobal::iconSet (":/exit_16px.png"));
-
     if (QSystemTrayIcon::isSystemTrayAvailable())
     {
@@ -903 +898 @@
     AssertMsgReturnVoid (item, ("Item must be always selected here"));
 
-    /* We always get here when mVMListView emits the activated() signal,
-     * so we must explicitly check if the action is enabled or not. */
-   if (aUuid.isNull())  /* If Uuid is NULL, this function is called from the mVMListView activated() signal. */
-   {
-       if (!vmStartAction->isEnabled())
-           return;
-   }
+    /* Are we called from the mVMListView's activated() signal? */
+    if (aUuid.isNull())
+    {
+        /* We always get here when mVMListView emits the activated() signal,
+         * so we must explicitly check if the action is enabled or not. */
+        if (!vmStartAction->isEnabled())
+            return;
+    }
 
 #if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
@@ -1074 +1070 @@
     for (CMachineVector::ConstIterator m = vec.begin();
          m != vec.end(); ++ m)
-        mVMModel->addItem (new VBoxVMItem (*m, this));
+        mVMModel->addItem (new VBoxVMItem (*m));
     mVMModel->sort();
 
     vmListViewCurrentChanged();
+
 #ifdef VBOX_GUI_WITH_SYSTRAY
     mTrayIcon->refresh();
@@ -1332 +1329 @@
 
         KMachineState state = item->state();
-        bool bRunning = item->running();
-        bool bModifyEnabled = !bRunning && state != KMachineState_Saved;
+        bool running = item->sessionState() != KSessionState_Closed;
+        bool modifyEnabled = !running && state != KMachineState_Saved;
 
         if (aRefreshDetails)
@@ -1339 +1336 @@
             vmDetailsView->setDetailsText (
                 vboxGlobal().detailsReport (m, false /* isNewVM */,
-                                            bModifyEnabled /* withLinks */));
+                                            modifyEnabled /* withLinks */));
         }
         if (aRefreshSnapshots)
@@ -1367 +1364 @@
 
         /* enable/disable modify actions */
-        vmConfigAction->setEnabled (bModifyEnabled);
-        vmDeleteAction->setEnabled (bModifyEnabled);
-        vmDiscardAction->setEnabled (state == KMachineState_Saved && !bRunning);
+        vmConfigAction->setEnabled (modifyEnabled);
+        vmDeleteAction->setEnabled (modifyEnabled);
+        vmDiscardAction->setEnabled (state == KMachineState_Saved && !running);
         vmPauseAction->setEnabled (state == KMachineState_Running ||
                                    state == KMachineState_Paused);
@@ -1388 +1385 @@
                 tr ("Start the selected virtual machine"));
 
-            vmStartAction->setEnabled (!bRunning);
+            vmStartAction->setEnabled (!running);
         }
 
@@ -1554 +1551 @@
         if (!m.isNull())
         {
-            mVMModel->addItem (new VBoxVMItem (m, this));
+            mVMModel->addItem (new VBoxVMItem (m));
             mVMModel->sort();
             /* Make sure the description, ... pages are properly updated.
@@ -1686 +1683 @@
     if (pItem && pItem->accessible())
     {
+        /* look at vmListViewCurrentChanged() */
         CMachine m = pItem->machine();
         KMachineState s = pItem->state();
-        bool bRunning = pItem->running();
+        bool bRunning = pItem->sessionState() != KSessionState_Closed;
         bool bModifyEnabled = !bRunning && s != KMachineState_Saved;
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMListView.cpp

@@ -135 +135 @@
 #endif
 
-VBoxVMItem::VBoxVMItem (const CMachine &aMachine, VBoxSelectorWnd *pParent)
-    : mParent (pParent), mMachine (aMachine)
+VBoxVMItem::VBoxVMItem (const CMachine &aMachine)
+    : mMachine (aMachine)
 {
     recache();
@@ -201 +201 @@
     {
         QString name = mMachine.GetName();
-        setObjectName (name);
+
         CSnapshot snp = mMachine.GetCurrentSnapshot();
         mSnapshotName = snp.isNull() ? QString::null : snp.GetName();