Changeset 90935 in vbox

Timestamp:

Aug 27, 2021 7:58:56 AM (4 years ago)

Author:

vboxsync

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

146573

Message:

FE/Qt: bugref:10067: Tiny UIConverter cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

-              r82968
+              r90935
 /*
  * Copyright (C) 2012-2020 Oracle Corporation
+ * Copyright (C) 2012-2021 Oracle Corporation
+ *
  * This file is part of VirtualBox Open Source Edition (OSE), as
 …
 /* static */
 void UIConverter::prepare()
+void UIConverter::create()
+{
+    /* Make sure instance WAS NOT created yet: */
+    if (s_pInstance)
+        return;
+    /* Prepare instance: */
+    s_pInstance = new UIConverter;
+    AssertReturnVoid(!s_pInstance);
+    new UIConverter;
+}
 /* static */
 void UIConverter::cleanup()
+void UIConverter::destroy()
+{
+    /* Make sure instance WAS NOT destroyed yet: */
+    if (!s_pInstance)
+        return;
+    /* Cleanup instance: */
+    AssertPtrReturnVoid(s_pInstance);
     delete s_pInstance;
-    s_pInstance = 0;
+}

-              r82968
+              r90935
 /*
  * Copyright (C) 2012-2020 Oracle Corporation
+ * Copyright (C) 2012-2021 Oracle Corporation
+ *
  * This file is part of VirtualBox Open Source Edition (OSE), as
 …
     static UIConverter *instance() { return s_pInstance; }
     /** Prepares everything. */
     static void prepare();
     /** Cleanups everything. */
     static void cleanup();
+    /** Creates singleton instance. */
+    static void create();
+    /** Destroys singleton instance. */
+    static void destroy();
     /** Converts QColor <= template class. */
 …
     /** Constructs converter. */
+    UIConverter() {}
+    UIConverter() { s_pInstance = this; }
+    /** Destructs converter. */
+    virtual ~UIConverter() /* override final */ { s_pInstance = 0; }
     /** Holds the static instance. */
 …
 #endif /* !FEQT_INCLUDED_SRC_converter_UIConverter_h */

-              r90925
+              r90935
 #endif /* VBOX_WS_MAC */
     /* Prepare converter: */
     UIConverter::prepare();
+    /* Create converter: */
+    UIConverter::create();
     /* Create desktop-widget watchdog: */
 …
     UIExtraDataManager::destroy();
     /* Cleanup converter: */
     UIConverter::cleanup();
+    /* Destroy converter: */
+    UIConverter::destroy();
     /* Cleanup thread-pools: */

Note: See TracChangeset for help on using the changeset viewer.