Changeset 6383 in vbox

Timestamp:

Jan 18, 2008 6:52:53 PM (17 years ago)

Author:

vboxsync

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

27329

Message:

FE/Qt: Please do it like this.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMNetworkSettings.ui (modified) (1 diff)
• VBoxVMNetworkSettings.ui.h (modified) (3 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui

@@ -628 +628 @@
 </includes>
 <variables>
-    <variable access="public">enum CheckPageResult { NoErrors, IncorrectInterface, MissedNetworkName };</variable>
+    <variable access="public">enum CheckPageResult { CheckPage_Ok, CheckPage_InvalidInterface, CheckPage_NoNetworkName };</variable>
     <variable access="private">CNetworkAdapter cadapter;</variable>
     <variable access="private">QIWidgetValidator *mWalidator;</variable>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMNetworkSettings.ui.h

@@ -73 +73 @@
 }
 
-VBoxVMNetworkSettings::CheckPageResult VBoxVMNetworkSettings::checkPage (const QStringList &aList)
+VBoxVMNetworkSettings::CheckPageResult
+VBoxVMNetworkSettings::checkPage (const QStringList &aList)
 {
     CEnums::NetworkAttachmentType type =
@@ -80 +81 @@
     if (type == CEnums::HostInterfaceNetworkAttachment &&
         isInterfaceInvalid (aList, cbHostInterfaceName->currentText()))
-        return IncorrectInterface;
+        return CheckPage_InvalidInterface;
     else
 #else
@@ -87 +88 @@
     if (type == CEnums::InternalNetworkAttachment &&
         cbInternalNetworkName->currentText().isEmpty())
-        return MissedNetworkName;
+        return CheckPage_NoNetworkName;
     else
-        return NoErrors;
+        return CheckPage_Ok;
 }
 

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1518 +1518 @@
     {
         QWidget *tab = NULL;
-        int error = 0;
+        VBoxVMNetworkSettings::CheckPageResult error =
+                VBoxVMNetworkSettings::CheckPage_Ok;
         for (int index = 0; index < tbwNetwork->count(); ++ index)
         {
@@ -1531 +1532 @@
         {
             Assert (tab);
-            warningText = error == VBoxVMNetworkSettings::IncorrectInterface ?
-                tr ("Incorrect host network interface is selected") :
-                error == VBoxVMNetworkSettings::MissedNetworkName ?
-                tr ("Internal network name is not set") : QString::null;
+            warningText =
+                error == VBoxVMNetworkSettings::CheckPage_InvalidInterface ?
+                    tr ("Incorrect host network interface is selected") :
+                error == VBoxVMNetworkSettings::CheckPage_NoNetworkName ?
+                    tr ("Internal network name is not set") :
+                QString::null;
             pageTitle += ": " + tbwNetwork->tabLabel (tab);
         }