Changeset 104926 in vbox

Timestamp:

Jun 14, 2024 3:44:31 PM (11 months ago)

Author:

vboxsync

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

163528

Message:

FE/Qt: bugref:10666, bugref:10669: Cleanup for UIMediumSizeEditor code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMediumSizeEditor.cpp (modified) (9 diffs)
• UIMediumSizeEditor.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -44 +44 @@
 
 
-const qulonglong UIMediumSizeEditor::m_uSectorSize = 512;
+/* static */
+const qulonglong UIMediumSizeEditor::s_uSectorSize = 512;
 
 UIMediumSizeEditor::UIMediumSizeEditor(QWidget *pParent, qulonglong uMinimumSize /* = _4M */)
@@ -57 +58 @@
     , m_pEditor(0)
 {
-    /* Prepare: */
     prepare();
-    QString strRegEx = QString("[^\\d%1]").arg(UITranslator::decimalSep());
-    m_regExNonDigitOrSeparator = QRegularExpression(strRegEx);
 }
 
@@ -110 +108 @@
     QString strSizeString = ensureSizeSuffix(m_pEditor->text());
 
-
     m_pEditor->blockSignals(true);
     int iCursorPosition = m_pEditor->cursorPosition();
@@ -129 +126 @@
 }
 
-QString UIMediumSizeEditor::ensureSizeSuffix(const QString &strSizeString)
-{
-    /* Try to update the m_strSizeSuffix: */
-    if (UITranslator::hasSizeSuffix(strSizeString))
-        m_strSizeSuffix = gpConverter->toString(UITranslator::parseSizeSuffix(strSizeString));
-
-    QString strOnlyDigits(strSizeString);
-    /* Remove any chars from the string except digits and decimal separator and then add a space and size suffix: */
-    return QString("%1 %2").arg(strOnlyDigits.remove(m_regExNonDigitOrSeparator)).arg(m_strSizeSuffix);
-}
-
 void UIMediumSizeEditor::prepare()
 {
+    /* Configure reg-exp: */
+    m_regExNonDigitOrSeparator = QRegularExpression(QString("[^\\d%1]").arg(UITranslator::decimalSep()));
+
     /* Create layout: */
     QGridLayout *pLayout = new QGridLayout(this);
@@ -153 +142 @@
 
         /* Create size slider: */
-        m_pSlider = new QSlider;
+        m_pSlider = new QSlider(this);
         if (m_pSlider)
         {
@@ -262 +251 @@
 int UIMediumSizeEditor::sizeMBToSlider(qulonglong uValue, int iSliderScale)
 {
-    /* Make sure *any* slider value is multiple of m_uSectorSize: */
-    uValue /= m_uSectorSize;
+    /* Make sure *any* slider value is multiple of s_uSectorSize: */
+    uValue /= s_uSectorSize;
 
     /* Calculate result: */
@@ -286 +275 @@
     qulonglong uResult = uTickMB + (uTickMBNext - uTickMB) * iStep / iSliderScale;
 
-    /* Make sure *any* slider value is multiple of m_uSectorSize: */
-    uResult *= m_uSectorSize;
+    /* Make sure *any* slider value is multiple of s_uSectorSize: */
+    uResult *= s_uSectorSize;
 
     /* Return result: */
@@ -302 +291 @@
 qulonglong UIMediumSizeEditor::checkSectorSizeAlignment(qulonglong uSize)
 {
-    if (m_uSectorSize == 0 || uSize % m_uSectorSize == 0)
+    if (s_uSectorSize == 0 || uSize % s_uSectorSize == 0)
         return uSize;
-    qulonglong uNewSize = (uSize / m_uSectorSize) * m_uSectorSize;
-    return uNewSize;
-}
+    return (uSize / s_uSectorSize) * s_uSectorSize;
+}
+
+QString UIMediumSizeEditor::ensureSizeSuffix(const QString &strSizeString)
+{
+    /* Try to update the m_strSizeSuffix: */
+    if (UITranslator::hasSizeSuffix(strSizeString))
+        m_strSizeSuffix = gpConverter->toString(UITranslator::parseSizeSuffix(strSizeString));
+
+    /* Remove any chars from the string except digits and decimal separator and then add a space and size suffix: */
+    QString strOnlyDigits(strSizeString);
+    return QString("%1 %2").arg(strOnlyDigits.remove(m_regExNonDigitOrSeparator)).arg(m_strSizeSuffix);
+}

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -70 +70 @@
     /** Handles translation event. */
     void sltRetranslateUI();
+
     /** Handles size slider change. */
     void sltSizeSliderChanged(int iValue);
@@ -90 +91 @@
     /** Updates slider/editor tool-tips. */
     void updateSizeToolTips(qulonglong uSize);
-    /** Checks if the uSize is divisible by m_uSectorSize */
+    /** Checks if the uSize is divisible by s_uSectorSize */
     qulonglong checkSectorSizeAlignment(qulonglong uSize);
+    /** Ensures there is only proper size-suffix available. */
     QString ensureSizeSuffix(const QString &strSizeString);
 
     /* Holds the block size. We force m_uSize to be multiple of this number. */
-    static const qulonglong m_uSectorSize;
+    static const qulonglong  s_uSectorSize;
     /** Holds the minimum medium size. */
     const qulonglong  m_uSizeMin;