Changeset 76059 in vbox

Timestamp:

Dec 7, 2018 2:03:35 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9012: Small style fixes for r127272 and r127295.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (1 diff)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -263 +263 @@
 template<> SHARED_LIBRARY_STUFF UISettingsDefs::RecordingMode fromString<UISettingsDefs::RecordingMode>(const QString &enmRecordingMode);
 
-
 /* Declare COM conversion specializations: */
 template<> SHARED_LIBRARY_STUFF QColor toColor(const KMachineState &state);

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -2511 +2511 @@
     {
         case UISettingsDefs::RecordingMode_VideoAudio: strResult = QApplication::translate("VBoxGlobal", "Video/Audio", "UISettingsDefs::RecordingMode"); break;
-        case UISettingsDefs::RecordingMode_VideoOnly:  strResult = QApplication::translate("VBoxGlobal", "Video Only", "UISettingsDefs::RecordingMode"); break;
-        case UISettingsDefs::RecordingMode_AudioOnly:  strResult = QApplication::translate("VBoxGlobal", "Audio Only", "UISettingsDefs::RecordingMode"); break;
+        case UISettingsDefs::RecordingMode_VideoOnly:  strResult = QApplication::translate("VBoxGlobal", "Video Only",  "UISettingsDefs::RecordingMode"); break;
+        case UISettingsDefs::RecordingMode_AudioOnly:  strResult = QApplication::translate("VBoxGlobal", "Audio Only",  "UISettingsDefs::RecordingMode"); break;
         default:
         {
@@ -2527 +2527 @@
     /* Here we have some fancy stuff allowing us
      * to search through the keys using 'case-insensitive' rule: */
-    QStringList keys;       QList<UISettingsDefs::RecordingMode> values;
-    keys << "Video/Audio";  values << UISettingsDefs::RecordingMode_VideoAudio;
-    keys << "Video Only";    values << UISettingsDefs::RecordingMode_VideoOnly;
-    keys << "Audio Only";    values << UISettingsDefs::RecordingMode_AudioOnly;
+    QStringList keys;      QList<UISettingsDefs::RecordingMode> values;
+    keys << "Video/Audio"; values << UISettingsDefs::RecordingMode_VideoAudio;
+    keys << "Video Only";  values << UISettingsDefs::RecordingMode_VideoOnly;
+    keys << "Audio Only";  values << UISettingsDefs::RecordingMode_AudioOnly;
     /* Video/Audio for unknown words: */
     if (!keys.contains(strRecordingMode, Qt::CaseInsensitive))

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -511 +511 @@
 
     /* Update recording options */
-    UISettingsDefs::RecordingMode enmRecordingMode =
+    const UISettingsDefs::RecordingMode enmRecordingMode =
         gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
     QStringList optionValues;
     /* Option value for video recording: */
-    optionValues.push_back((enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio) ||
-                           (enmRecordingMode == UISettingsDefs::RecordingMode_VideoOnly) ? "true" : "false");
+    optionValues.push_back(     (enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio)
+                             || (enmRecordingMode == UISettingsDefs::RecordingMode_VideoOnly)
+                           ? "true" : "false");
     /* Option value for audio recording: */
-    optionValues.push_back((enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio) ||
-                           (enmRecordingMode == UISettingsDefs::RecordingMode_AudioOnly) ? "true" : "false");
+    optionValues.push_back(     (enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio)
+                             || (enmRecordingMode == UISettingsDefs::RecordingMode_AudioOnly)
+                           ? "true" : "false");
 
     if (m_pSliderAudioCaptureQuality->value() == 1)
@@ -1732 +1734 @@
                                              (isMachineOnline() && !m_pCache->base().m_fRecordingEnabled && m_pCheckboxVideoCapture->isChecked());
 
-    UISettingsDefs::RecordingMode enmRecordingMode =
-        gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
-
     /* Video Capture Screens option should be enabled only if:
      * Machine is in *any* valid state and check-box is checked. */
     const bool fIsVideoCaptureScreenOptionEnabled = isMachineInValidMode() && m_pCheckboxVideoCapture->isChecked();
-
-    bool fRecordVideo = enmRecordingMode == UISettingsDefs::RecordingMode_VideoOnly ||
-        enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio;
-    bool fRecordAudio = enmRecordingMode == UISettingsDefs::RecordingMode_AudioOnly ||
-        enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio;
+    const UISettingsDefs::RecordingMode enmRecordingMode =
+        gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
+    const bool fRecordVideo =    enmRecordingMode == UISettingsDefs::RecordingMode_VideoOnly
+                              || enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio;
+    const bool fRecordAudio =    enmRecordingMode == UISettingsDefs::RecordingMode_AudioOnly
+                              || enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio;
 
     m_pLabelVideoCaptureSize->setEnabled(fIsRecordingOptionsEnabled && fRecordVideo);