Changeset 83161 in vbox

Timestamp:

Feb 26, 2020 2:37:40 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UICloudMachine: Turn off auto-refresh temporary, it will be done more wise using manual approach; Besides that move simple getter implementations to class header.

Location:

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

Files:

• UICloudMachine.cpp (modified) (4 diffs)
• UICloudMachine.h (modified) (3 diffs)

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

@@ -34 +34 @@
     , m_strId(strId)
     , m_strName(strName)
-    , m_fDataActual(false)
     , m_fAccessible(true)
     , m_strOsType("Other")
@@ -48 +47 @@
     , m_strId(other.m_strId)
     , m_strName(other.m_strName)
-    , m_fDataActual(other.m_fDataActual)
     , m_fAccessible(other.m_fAccessible)
     , m_strOsType(other.m_strOsType)
@@ -62 +60 @@
 }
 
-CCloudClient UICloudMachineData::cloudClient() const
-{
-    return m_comCloudClient;
-}
-
-QString UICloudMachineData::id() const
-{
-    return m_strId;
-}
-
-QString UICloudMachineData::name() const
-{
-    return m_strName;
-}
-
-bool UICloudMachineData::isAccessible() const
-{
-    return m_fAccessible;
-}
-
-QString UICloudMachineData::osType()
-{
-    if (!m_fDataActual)
-        refresh();
-    return m_strOsType;
-}
-
-int UICloudMachineData::memorySize()
-{
-    if (!m_fDataActual)
-        refresh();
-    return m_iMemorySize;
-}
-
-int UICloudMachineData::cpuCount()
-{
-    if (!m_fDataActual)
-        refresh();
-    return m_iCpuCount;
-}
-
 void UICloudMachineData::refresh()
 {
@@ -112 +69 @@
     m_iMemorySize = fetchMemorySize(infoMap);
     m_iCpuCount = fetchCpuCount(infoMap);
-
-    /* Mark data actual: */
-    m_fDataActual = true;
 }
 

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

@@ -50 +50 @@
     virtual ~UICloudMachineData();
 
+    /** Performs data refreshing. */
+    void refresh();
+
     /** Returns cloud client object reference. */
-    CCloudClient cloudClient() const;
+    CCloudClient cloudClient() const { return m_comCloudClient; }
 
     /** Returns cloud VM id. */
-    QString id() const;
+    QString id() const { return m_strId; }
     /** Returns cloud VM name. */
-    QString name() const;
+    QString name() const { return m_strName; }
 
     /** Returns whether cloud VM is accessible. */
-    bool isAccessible() const;
+    bool isAccessible() const { return m_fAccessible; }
 
     /** Returns cloud VM OS type. */
-    QString osType();
+    QString osType() const { return m_strOsType; }
     /** Returns cloud VM memory size. */
-    int memorySize();
+    int memorySize() const { return m_iMemorySize; }
     /** Returns cloud VM CPU count. */
-    int cpuCount();
+    int cpuCount() const { return m_iCpuCount; }
 
 private:
-
-    /** Performs data refreshing. */
-    void refresh();
 
     /** Holds the cloud client object reference. */
@@ -80 +80 @@
     /** Holds the cloud VM name. */
     const QString  m_strName;
-
-    /** Holds whether data is actual. */
-    bool  m_fDataActual;
 
     /** Holds whether cloud VM is accessible. */
@@ -115 +112 @@
     UICloudMachine(const UICloudMachine &other);
 
+    /** Performs data refreshing. */
+    void refresh() { d->refresh(); }
+
     /** Returns whether cloud VM wrapper is null. */
     bool isNull() const { return !d.constData(); }