Changeset 23562 in vbox

Timestamp:

Oct 5, 2009 1:55:22 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53210

Message:

FE/Qt4: VBoxConsoleWnd & VBoxVMSettingsNetwork: Few coding-style fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (6 diffs)
• include/VBoxVMSettingsNetwork.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -30 +30 @@
 #include "VBoxProblemReporter.h"
 #include "VBoxHelpActions.h"
-#include "VBoxVMSettingsNetwork.h"
 
 /* Qt includes */
@@ -64 +63 @@
 
 class VBoxMiniToolBar;
-
-class VBoxVMSettingsNetworkPage;
 
 /* We want to make the first action highlighted but not
@@ -409 +406 @@
 };
 
-
-class VBoxVMSettingsSF;
-class VBoxSFDialog : public QIWithRetranslateUI<QDialog>
+class VBoxSettingsPage;
+class VBoxNetworkDialog : public QIWithRetranslateUI <QDialog>
 {
     Q_OBJECT;
@@ -417 +413 @@
 public:
 
-    VBoxSFDialog (QWidget*, CSession&);
+    VBoxNetworkDialog (QWidget *aParent, CSession &aSession);
 
 protected:
@@ -429 +425 @@
 protected:
 
-    void showEvent (QShowEvent*);
+    void showEvent (QShowEvent *aEvent);
+
+private:
+
+    VBoxSettingsPage *mSettings;
+    CSession &mSession;
+};
+
+class VBoxVMSettingsSF;
+class VBoxSFDialog : public QIWithRetranslateUI <QDialog>
+{
+    Q_OBJECT;
+
+public:
+
+    VBoxSFDialog (QWidget *aParent, CSession &aSession);
+
+protected:
+
+    void retranslateUi();
+
+protected slots:
+
+    virtual void accept();
+
+protected:
+
+    void showEvent (QShowEvent *aEvent);
 
 private:
@@ -437 +460 @@
 };
 
-
-class VBoxVMSettingsNetworkDialogPage : public VBoxVMSettingsNetworkPage
-{
-    Q_OBJECT;
-
-public:
-
-    VBoxVMSettingsNetworkDialogPage() : VBoxVMSettingsNetworkPage(true) {}
-
-    void getFrom (const CMachine &aMachine) { VBoxVMSettingsNetworkPage::getFrom(aMachine); }
-    void putBackTo() { VBoxVMSettingsNetworkPage::putBackTo(); }
-
-};
-
-class VBoxNetworkDialog : public QIWithRetranslateUI<QDialog>
-{
-    Q_OBJECT;
-
-public:
-
-    VBoxNetworkDialog (QWidget*, CSession&);
-
-protected:
-
-    void retranslateUi();
-
-protected slots:
-
-    virtual void accept();
-
-protected:
-
-    void showEvent (QShowEvent*);
-
-private:
-
-    VBoxVMSettingsNetworkDialogPage *mSettings;
-    CSession &mSession;
-};
-
-
 #endif // __VBoxConsoleWnd_h__

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsNetwork.h

@@ -88 +88 @@
 public:
 
-    VBoxVMSettingsNetworkPage(bool aDisableStaticControls = false);
+    VBoxVMSettingsNetworkPage (bool aDisableStaticControls = false);
 
     QStringList brgList (bool aRefresh = false);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -32 +32 @@
 #include "VBoxTakeSnapshotDlg.h"
 #include "VBoxVMFirstRunWzd.h"
+#include "VBoxVMSettingsNetwork.h"
 #include "VBoxVMSettingsSF.h"
 #include "VBoxVMInformationDlg.h"
@@ -3800 +3801 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
+VBoxNetworkDialog::VBoxNetworkDialog (QWidget *aParent, CSession &aSession)
+    : QIWithRetranslateUI <QDialog> (aParent)
+    , mSettings (0)
+    , mSession (aSession)
+{
+    setModal (true);
+    /* Setup Dialog's options */
+    setWindowIcon (QIcon (":/nw_16px.png"));
+    setSizeGripEnabled (true);
+
+    /* Setup main dialog's layout */
+    QVBoxLayout *mainLayout = new QVBoxLayout (this);
+    VBoxGlobal::setLayoutMargin (mainLayout, 10);
+    mainLayout->setSpacing (10);
+
+    /* Setup settings layout */
+    mSettings = new VBoxVMSettingsNetworkPage (true);
+    mSettings->setOrderAfter (this);
+    VBoxGlobal::setLayoutMargin (mSettings->layout(), 0);
+    mSettings->getFrom (aSession.GetMachine());
+    mainLayout->addWidget (mSettings);
+
+    /* Setup button's layout */
+    QIDialogButtonBox *buttonBox = new QIDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help);
+
+    connect (buttonBox, SIGNAL (helpRequested()), &vboxProblem(), SLOT (showHelpHelpDialog()));
+    connect (buttonBox, SIGNAL (accepted()), this, SLOT (accept()));
+    connect (buttonBox, SIGNAL (rejected()), this, SLOT (reject()));
+    mainLayout->addWidget (buttonBox);
+
+    retranslateUi();
+}
+
+void VBoxNetworkDialog::retranslateUi()
+{
+    setWindowTitle (tr ("Network Adapters"));
+}
+
+void VBoxNetworkDialog::accept()
+{
+    mSettings->putBackTo();
+    CMachine machine = mSession.GetMachine();
+    machine.SaveSettings();
+    if (!machine.isOk())
+        vboxProblem().cannotSaveMachineSettings (machine);
+    QDialog::accept();
+}
+
+void VBoxNetworkDialog::showEvent (QShowEvent *aEvent)
+{
+    resize (450, 300);
+    VBoxGlobal::centerWidget (this, parentWidget());
+    setMinimumWidth (400);
+    QDialog::showEvent (aEvent);
+}
+
 VBoxSFDialog::VBoxSFDialog (QWidget *aParent, CSession &aSession)
-    : QIWithRetranslateUI<QDialog> (aParent)
+    : QIWithRetranslateUI <QDialog> (aParent)
     , mSettings (0)
     , mSession (aSession)
@@ -3857 +3914 @@
 }
 
-
-VBoxNetworkDialog::VBoxNetworkDialog (QWidget *aParent, CSession &aSession)
-    : QIWithRetranslateUI<QDialog> (aParent)
-    , mSettings (0)
-    , mSession (aSession)
-{
-    setModal (true);
-    /* Setup Dialog's options */
-    setWindowIcon (QIcon (":/nw_16px.png"));
-    setSizeGripEnabled (true);
-
-    /* Setup main dialog's layout */
-    QVBoxLayout *mainLayout = new QVBoxLayout (this);
-    VBoxGlobal::setLayoutMargin (mainLayout, 10);
-    mainLayout->setSpacing (10);
-
-    /* Setup settings layout */
-    mSettings = new VBoxVMSettingsNetworkDialogPage();
-    mSettings->setOrderAfter (this);
-    VBoxGlobal::setLayoutMargin (mSettings->layout(), 0);
-    mSettings->getFrom (aSession.GetMachine());
-    mainLayout->addWidget (mSettings);
-
-    /* Setup button's layout */
-    QIDialogButtonBox *buttonBox = new QIDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help);
-
-    connect (buttonBox, SIGNAL (helpRequested()), &vboxProblem(), SLOT (showHelpHelpDialog()));
-    connect (buttonBox, SIGNAL (accepted()), this, SLOT (accept()));
-    connect (buttonBox, SIGNAL (rejected()), this, SLOT (reject()));
-    mainLayout->addWidget (buttonBox);
-
-    retranslateUi();
-}
-
-void VBoxNetworkDialog::retranslateUi()
-{
-    setWindowTitle (tr ("Network Adapters"));
-}
-
-void VBoxNetworkDialog::accept()
-{
-    mSettings->putBackTo();
-    CMachine machine = mSession.GetMachine();
-    machine.SaveSettings();
-    if (!machine.isOk())
-        vboxProblem().cannotSaveMachineSettings (machine);
-    QDialog::accept();
-}
-
-void VBoxNetworkDialog::showEvent (QShowEvent *aEvent)
-{
-    resize (450, 300);
-    VBoxGlobal::centerWidget (this, parentWidget());
-    setMinimumWidth (400);
-    QDialog::showEvent (aEvent);
-}
-
-
 #include "VBoxConsoleWnd.moc"