Changeset 102281 in vbox

Timestamp:

Nov 23, 2023 7:48:16 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: A bit of cleanup for UIGuestOSType.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIGuestOSType.cpp (modified) (3 diffs)
• UIGuestOSType.h (modified) (7 diffs)

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

@@ -34 +34 @@
 
 
-UIGuestOSTypeManager::UIGuestOSTypeManager()
-{
-}
-
 void UIGuestOSTypeManager::reCacheGuestOSTypes(const CGuestOSTypeVector &guestOSTypes)
 {
@@ -43 +39 @@
     m_guestOSTypes.clear();
     m_guestOSFamilies.clear();
-
+    m_guestOSFamilyArch.clear();
+    m_guestOSSubtypeArch.clear();
+
+    /* Enumerate guest OS types: */
     QVector<CGuestOSType> otherOSTypes;
     foreach (const CGuestOSType &comType, guestOSTypes)
     {
+        /* Filter out "other" family types: */
         if (comType.GetFamilyId().contains("other", Qt::CaseInsensitive))
         {
@@ -54 +54 @@
         addGuestOSType(comType);
     }
-    /* Add OS types with family other to the end of the lists: */
+
+    /* Add OS types with family "other" to the end of the lists: */
     foreach (const CGuestOSType &comType, otherOSTypes)
         addGuestOSType(comType);

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

@@ -33 +33 @@
 
 /* Qt includes: */
-#include <QVector>
 #include <QMap>
 #include <QString>
+#include <QVector>
 
 /* COM includes: */
 #include "COMEnums.h"
 #include "CGuestOSType.h"
-
-class UIGuestOSType;
 
 /** A wrapper around CGuestOSType. Some of the properties are cached here for performance. */
@@ -48 +46 @@
 
 public:
-
 
     UIGuestOSType(const CGuestOSType &comGuestOSType);
@@ -97 +94 @@
 class SHARED_LIBRARY_STUFF UIGuestOSTypeManager
 {
-
 public:
-
-    UIGuestOSTypeManager();
-    UIGuestOSTypeManager(const UIGuestOSTypeManager &other) = delete;
 
     /** OS info pair. 'first' is id and 'second' is description. */
@@ -109 +102 @@
     /** A list of all OS type pairs. */
     typedef QVector<UIGuestInfoPair> UIGuestOSTypeInfo;
+
+    /** Constructs guest OS type manager. */
+    UIGuestOSTypeManager() {}
+    /** Prohibits to copy guest OS type manager. */
+    UIGuestOSTypeManager(const UIGuestOSTypeManager &other) = delete;
 
     /** Re-create the guest OS type database. */
@@ -125 +123 @@
                                               KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
 
+    /** Returns whether specified @a strOSTypeId is of DOS type. */
     static bool isDOSType(const QString &strOSTypeId);
 
-    /** @name Getters for UIGuestOSType properties. They utilize a map for faster access to UIGuestOSType instance with @p strTypeId
+    /** @name Getters for UIGuestOSType properties.
+      * They utilize a map for faster access to UIGuestOSType instance with @p strTypeId.
       * @{ */
         QString                 getFamilyId(const QString &strTypeId) const;
@@ -149 +149 @@
 private:
 
+    /** Adds certain @a comType to internal cache. */
     void addGuestOSType(const CGuestOSType &comType);
 
@@ -165 +166 @@
 };
 
-
 #endif /* !FEQT_INCLUDED_SRC_globals_UIGuestOSType_h */