Changeset 90881 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 25, 2021 1:28:50 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Some improvements in translation event handling

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxTranslator.h (modified) (2 diffs)
• src-all/VirtualBoxTranslator.cpp (modified) (3 diffs)
• src-client/VirtualBoxClientImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/VirtualBoxTranslator.h

@@ -38 +38 @@
 
     static VirtualBoxTranslator *instance();
+    /* Returns instance if exists, returns NULL otherwise. */
+    static VirtualBoxTranslator *tryInstance();
     void release();
 
@@ -90 +92 @@
                             const int   aNum = -1);
 
-    /* Returns instance if exists, returns NULL otherwise. */
-    static VirtualBoxTranslator *i_instance();
 };
 

trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp

@@ -143 +143 @@
 
 /* static */
-VirtualBoxTranslator *VirtualBoxTranslator::i_instance()
+VirtualBoxTranslator *VirtualBoxTranslator::tryInstance()
 {
     int rc = RTOnce(&g_Once, initLock, NULL);
@@ -322 +322 @@
                                             const int   aNum)
 {
-    VirtualBoxTranslator *pCurrInstance = VirtualBoxTranslator::i_instance();
+    VirtualBoxTranslator *pCurrInstance = VirtualBoxTranslator::tryInstance();
     const char *pszTranslation = aSourceText;
     if (pCurrInstance != NULL)
@@ -384 +384 @@
 {
     const char *pszSource = aTranslation;
-    VirtualBoxTranslator *pCurInstance = VirtualBoxTranslator::i_instance(); /* paranoia */
+    VirtualBoxTranslator *pCurInstance = VirtualBoxTranslator::tryInstance(); /* paranoia */
     if (pCurInstance != NULL)
     {

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -84 +84 @@
             case VBoxEventType_OnLanguageChanged:
             {
-                VirtualBoxTranslator *pTranslator = VirtualBoxTranslator::instance();
+                VirtualBoxTranslator *pTranslator = VirtualBoxTranslator::tryInstance();
                 if (pTranslator)
                 {