Changeset 91391 in vbox for trunk/src/VBox

Timestamp:

Sep 27, 2021 11:50:27 AM (3 years ago)

Author:

vboxsync

Message:

Main/NLS: More on same. Found bug in i_translate. bugref:1909

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxTranslator.h (modified) (2 diffs)
• src-all/VirtualBoxTranslator.cpp (modified) (4 diffs)

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

@@ -43 +43 @@
     HRESULT loadLanguage(ComPtr<IVirtualBox> aVirtualBox);
 
+private:
+    /** Translator component. */
+    struct TranslatorComponent
+    {
+        QMTranslator *pTranslator;
+        /** Path to translation files. It includes file prefix, i.e '/path/to/folder/file_prefix'. */
+        com::Utf8Str  strPath;
+
+        TranslatorComponent() : pTranslator(NULL) {}
+    };
+public:
     /** Pointer to a translator component. */
-    typedef struct TranslatorComponent *PTRCOMPONENT;
+    typedef TranslatorComponent *PTRCOMPONENT;
 
     /**
@@ -102 +113 @@
     uint32_t m_cInstanceRefs;
 
-    /** Translator component. */
-    struct TranslatorComponent
-    {
-        QMTranslator *pTranslator;
-        /** Path to translation files. It includes file prefix, i.e '/path/to/folder/file_prefix'. */
-        com::Utf8Str  strPath;
-
-        TranslatorComponent() : pTranslator(NULL) {}
-    };
     typedef std::list<TranslatorComponent> TranslatorList;
     TranslatorList  m_lTranslators;

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

@@ -408 +408 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    TranslatorComponent *pComponent = (TranslatorComponent *)aComponent;
-
-    if (pComponent == m_pDefaultComponent)
+    if (aComponent == m_pDefaultComponent)
         m_pDefaultComponent = NULL;
 
@@ -417 +415 @@
          ++it)
     {
-        if (&(*it) == pComponent)
-        {
-            delete pComponent->pTranslator;
+        if (&(*it) == aComponent)
+        {
+            delete aComponent->pTranslator;
             m_lTranslators.erase(it);
             return VINF_SUCCESS;
@@ -481 +479 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    TranslatorComponent *pComponent = (TranslatorComponent *)aComponent;
-    if (pComponent == NULL)
-        pComponent = m_pDefaultComponent;
-
-    if (   pComponent == NULL
-        || pComponent->pTranslator == NULL)
+    if (aComponent == NULL)
+        aComponent = m_pDefaultComponent;
+
+    if (   aComponent == NULL
+        || aComponent->pTranslator == NULL)
         return aSourceText;
 
-    const char *pszTranslation = pComponent->pTranslator->translate(aContext, aSourceText, aComment, aNum);
+    const char *pszTranslation = aComponent->pTranslator->translate(aContext, aSourceText, aComment, aNum);
 
     LastTranslation *pEntry = getTlsEntry();
@@ -495 +492 @@
     {
         pEntry->first = pszTranslation;
-        pEntry->second = m_hStrCache != NIL_RTSTRCACHE ?
-                            RTStrCacheEnter(m_hStrCache, aSourceText) :
-                            aSourceText;
+        /** @todo r=bird: This is not technically threadsafe.  Move this down to the
+         *        above translator call. */
+        pEntry->second = m_hStrCache != NIL_RTSTRCACHE ? RTStrCacheEnter(m_hStrCache, aSourceText) : aSourceText;
     }