Changeset 103320 in vbox for trunk/src/VBox

Timestamp:

Feb 12, 2024 4:40:52 PM (12 months ago)

Author:

vboxsync

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

161621

Message:

FE/Qt: UITranslator: Get rid of UIDefs.h dependency; Moving SizeSuffix to appropriate place; Had to rework few places to simplify the dependencies.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/UITranslator.cpp (modified) (1 diff)
• globals/UITranslator.h (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (2 diffs)
• runtime/information/UIInformationRuntime.h (modified) (1 diff)
• runtime/information/UIVMInformationDialog.h (modified) (1 diff)
• settings/UISettingsPageValidator.cpp (modified) (1 diff)
• settings/editors/UISerialSettingsEditor.h (modified) (1 diff)
• widgets/UIMediumSizeEditor.cpp (modified) (4 diffs)
• widgets/UIMediumSizeEditor.h (modified) (2 diffs)

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

@@ -38 +38 @@
 #include "UIIconPool.h"
 #include "UISettingsDefs.h"
+#include "UITranslator.h"
 
 /* COM includes: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -119 +119 @@
 
 
-/** Size suffixes. */
-enum SizeSuffix
-{
-    SizeSuffix_Byte = 0,
-    SizeSuffix_KiloByte,
-    SizeSuffix_MegaByte,
-    SizeSuffix_GigaByte,
-    SizeSuffix_TeraByte,
-    SizeSuffix_PetaByte,
-    SizeSuffix_Max
-};
-
-
 /** VM launch modes. */
 enum UILaunchMode

trunk/src/VBox/Frontends/VirtualBox/src/globals/UITranslator.cpp

@@ -30 +30 @@
 #include <QDir>
 #include <QKeySequence>
+#include <QRegExp>
+#include <QRegularExpression>
 #ifdef Q_OS_UNIX
 # include <QLibraryInfo>
 #endif
-#include <QRegularExpression>
-#include <QRegExp>
 
 /* GUI includes: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UITranslator.h

@@ -36 +36 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
 #include "UILibraryDefs.h"
+
+/** Size suffixes. */
+enum SizeSuffix
+{
+    SizeSuffix_Byte = 0,
+    SizeSuffix_KiloByte,
+    SizeSuffix_MegaByte,
+    SizeSuffix_GigaByte,
+    SizeSuffix_TeraByte,
+    SizeSuffix_PetaByte,
+    SizeSuffix_Max
+};
 
 /** QTranslator subclass for VBox needs. */

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -54 +54 @@
 #include <iprt/err.h>
 
-const ULONG uAllowedFileSize = _4K;
+const qint64 iAllowedFileSize = _4K;
 const char *cRemoveText = ":remove:";
 
@@ -874 +874 @@
     if (!file.exists() || !file.open(QIODevice::ReadOnly | QIODevice::Text))
         return;
-    if (file.size() > uAllowedFileSize)
+    if (file.size() > iAllowedFileSize)
         return;
     QTextStream stream(&file);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.h

@@ -37 +37 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
+
+/* COM includes: */
+#include "COMEnums.h"
 
 /* Forward declarations: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.h

@@ -39 +39 @@
 #include "QIWithRestorableGeometry.h"
 #include "QIWithRetranslateUI.h"
+
+/* COM includes: */
+#include "COMEnums.h"
 
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPageValidator.cpp

@@ -29 +29 @@
 #include "UISettingsPage.h"
 #include "UISettingsPageValidator.h"
+
+/* Other VBox includes: */
+#include <iprt/log.h>
 
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISerialSettingsEditor.h

@@ -34 +34 @@
 /* GUI includes: */
 #include "UIEditor.h"
+
+/* COM includes: */
+#include "COMEnums.h"
 
 /* Forward declarations: */

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

@@ -51 +51 @@
     , m_iSliderScale(calculateSliderScale(m_uSizeMax))
     , m_uSize(0)
-    , m_enmSizeSuffix(SizeSuffix_Byte)
     , m_pSlider(0)
     , m_pLabelMinSize(0)
@@ -74 +73 @@
     m_pEditor->blockSignals(true);
     m_pEditor->setText(UITranslator::formatSize(m_uSize));
-    m_enmSizeSuffix = UITranslator::parseSizeSuffix(m_pEditor->text());
+    m_strSizeSuffix = gpConverter->toString(UITranslator::parseSizeSuffix(m_pEditor->text()));
     m_pEditor->blockSignals(false);
 }
@@ -98 +97 @@
     m_pEditor->blockSignals(true);
     m_pEditor->setText(UITranslator::formatSize(m_uSize));
-    m_enmSizeSuffix = UITranslator::parseSizeSuffix(m_pEditor->text());
+    m_strSizeSuffix = gpConverter->toString(UITranslator::parseSizeSuffix(m_pEditor->text()));
     m_pEditor->blockSignals(false);
     /* Notify the listeners: */
@@ -128 +127 @@
 QString UIMediumSizeEditor::ensureSizeSuffix(const QString &strSizeString)
 {
-    /* Try to update the m_enmSizeSuffix: */
+    /* Try to update the m_strSizeSuffix: */
     if (UITranslator::hasSizeSuffix(strSizeString))
-        m_enmSizeSuffix = UITranslator::parseSizeSuffix(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(gpConverter->toString(m_enmSizeSuffix));
+    return QString("%1 %2").arg(strOnlyDigits.remove(m_regExNonDigitOrSeparator)).arg(m_strSizeSuffix);
 }
 

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

@@ -38 +38 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIDefs.h"
 #include "UILibraryDefs.h"
 
@@ -109 +108 @@
     /** Holds the current medium size. */
     qulonglong        m_uSize;
-    SizeSuffix        m_enmSizeSuffix;
+    /** Holds the size suffix. */
+    QString           m_strSizeSuffix;
 
     /** Holds the size slider. */