Changeset 92293 in vbox for trunk/src

Timestamp:

Nov 9, 2021 1:58:00 PM (3 years ago)

Author:

vboxsync

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

148139

Message:

FE/Qt: bugref:10067: UINotificationObject: Provide UINotificationObject interface with API to check whether object is done with its service.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

• UINotificationObject.cpp (modified) (11 diffs)
• UINotificationObject.h (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObject.cpp

@@ -67 +67 @@
 }
 
+bool UINotificationSimple::isDone() const
+{
+    return true;
+}
+
 QString UINotificationSimple::name() const
 {
@@ -111 +116 @@
 UINotificationProgress::UINotificationProgress()
     : m_pTask(0)
-    , m_fFinished(false)
     , m_uPercent(0)
+    , m_fDone(false)
 {
 }
@@ -122 +127 @@
 }
 
-bool UINotificationProgress::isFinished() const
-{
-    return m_fFinished;
-}
-
 ulong UINotificationProgress::percent() const
 {
@@ -145 +145 @@
 {
     return true;
+}
+
+bool UINotificationProgress::isDone() const
+{
+    return m_fDone;
 }
 
@@ -192 +197 @@
 void UINotificationProgress::sltHandleProgressFinished()
 {
-    m_fFinished = true;
     m_uPercent = 100;
+    m_fDone = true;
     emit sigProgressFinished();
 
@@ -212 +217 @@
 UINotificationDownloader::UINotificationDownloader()
     : m_pDownloader(0)
+    , m_uPercent(0)
+    , m_fDone(false)
 {
 }
@@ -234 +241 @@
 {
     return true;
+}
+
+bool UINotificationDownloader::isDone() const
+{
+    return m_fDone;
 }
 
@@ -292 +304 @@
     m_pDownloader = 0;
     m_strError = strError;
+    m_fDone = true;
     emit sigProgressFailed();
 }
@@ -299 +312 @@
     delete m_pDownloader;
     m_pDownloader = 0;
+    m_fDone = true;
     emit sigProgressCanceled();
 }
@@ -306 +320 @@
     delete m_pDownloader;
     m_pDownloader = 0;
+    m_fDone = true;
     emit sigProgressFinished();
 }
@@ -326 +341 @@
 }
 
+QString UINotificationNewVersionChecker::error() const
+{
+    return m_strError;
+}
+
+bool UINotificationNewVersionChecker::isCritical() const
+{
+    return m_pChecker ? m_pChecker->isItForcedCall() : true;
+}
+
 bool UINotificationNewVersionChecker::isDone() const
 {
     return m_fDone;
-}
-
-QString UINotificationNewVersionChecker::error() const
-{
-    return m_strError;
-}
-
-bool UINotificationNewVersionChecker::isCritical() const
-{
-    return m_pChecker ? m_pChecker->isItForcedCall() : true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObject.h

@@ -56 +56 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const = 0;
+    /** Returns whether object is done. */
+    virtual bool isDone() const = 0;
     /** Returns object name. */
     virtual QString name() const = 0;
@@ -96 +98 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns whether object is done. */
+    virtual bool isDone() const /* override */;
     /** Returns object name. */
     virtual QString name() const /* override final */;
@@ -149 +153 @@
     virtual CProgress createProgress(COMResult &comResult) = 0;
 
-    /** Returns whether progress is finished. */
-    bool isFinished() const;
     /** Returns current progress percentage value. */
     ulong percent() const;
@@ -160 +162 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns whether object is done. */
+    virtual bool isDone() const /* override */;
     /** Returns object internal name. */
     virtual QString internalName() const /* override final */;
@@ -185 +189 @@
     UINotificationProgressTask *m_pTask;
 
-    /** Holds whether progress is finished. */
-    bool   m_fFinished;
     /** Holds the last cached progress percentage value. */
     ulong  m_uPercent;
+    /** Holds whether current progress is done. */
+    bool   m_fDone;
 };
 
@@ -228 +232 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns whether object is done. */
+    virtual bool isDone() const /* override */;
     /** Returns object internal name. */
     virtual QString internalName() const /* override final */;
@@ -262 +268 @@
     /** Holds the error message is any. */
     QString  m_strError;
+    /** Holds whether current progress is done. */
+    bool     m_fDone;
 };
 
@@ -288 +296 @@
     virtual UINewVersionChecker *createChecker() = 0;
 
-    /** Returns whether current progress is done. */
-    bool isDone() const;
     /** Returns error-message if any. */
     QString error() const;
@@ -295 +301 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns whether object is done. */
+    virtual bool isDone() const /* override */;
     /** Returns object internal name. */
     virtual QString internalName() const /* override final */;
@@ -322 +330 @@
     UINewVersionChecker *m_pChecker;
 
+    /** Holds the error message is any. */
+    QString  m_strError;
     /** Holds whether current progress is done. */
     bool     m_fDone;
-    /** Holds the error message is any. */
-    QString  m_strError;
 };
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */