Changeset 91390 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

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

Author:

vboxsync

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

147070

Message:

Main/NLS: TRCOMPONENT -> PTRCOMPONENT w/ some added type safety. unregisterTranslation should mostly ignore NULL. Docs. bugref:1909

Location:

trunk/src/VBox/Main/src-all

Files:

• ExtPackManagerImpl.cpp (modified) (1 diff)
• VirtualBoxTranslator.cpp (modified) (7 diffs)

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

@@ -150 +150 @@
 #endif
 #ifdef VBOX_WITH_MAIN_NLS
-    TRCOMPONENT         pTrComponent;
+    PTRCOMPONENT        pTrComponent;
 #endif
 

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

@@ -330 +330 @@
 int VirtualBoxTranslator::registerTranslation(const char *aTranslationPath,
                                               bool aDefault,
-                                              TRCOMPONENT *aComponent)
+                                              PTRCOMPONENT *aComponent)
 {
     VirtualBoxTranslator *pCurrInstance = VirtualBoxTranslator::tryInstance();
@@ -345 +345 @@
 int VirtualBoxTranslator::i_registerTranslation(const char *aTranslationPath,
                                                 bool aDefault,
-                                                TRCOMPONENT *aComponent)
+                                                PTRCOMPONENT *aComponent)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -358 +358 @@
             if (aDefault)
                 m_pDefaultComponent = pComponent;
-            *aComponent = (TRCOMPONENT)pComponent;
+            *aComponent = (PTRCOMPONENT)pComponent;
             return VINF_SUCCESS;
         }
@@ -376 +376 @@
     if (aDefault)
         m_pDefaultComponent = pComponent;
-    *aComponent = (TRCOMPONENT)pComponent;
+    *aComponent = (PTRCOMPONENT)pComponent;
     /* ignore the error during loading because path
      * could contain no translation for current language */
@@ -384 +384 @@
 
 
-int VirtualBoxTranslator::unregisterTranslation(TRCOMPONENT aComponent)
-{
-    VirtualBoxTranslator *pCurrInstance = VirtualBoxTranslator::tryInstance();
-    int rc = VERR_GENERAL_FAILURE;
-    if (pCurrInstance != NULL)
-    {
-        rc = pCurrInstance->i_unregisterTranslation(aComponent);
-        pCurrInstance->release();
-    }
+int VirtualBoxTranslator::unregisterTranslation(PTRCOMPONENT aComponent)
+{
+    int rc;
+    if (aComponent != NULL)
+    {
+        VirtualBoxTranslator *pCurrInstance = VirtualBoxTranslator::tryInstance();
+        if (pCurrInstance != NULL)
+        {
+            rc = pCurrInstance->i_unregisterTranslation(aComponent);
+            pCurrInstance->release();
+        }
+        else
+            rc = VERR_GENERAL_FAILURE;
+    }
+    else
+        rc = VWRN_NOT_FOUND;
     return rc;
 }
 
 
-int VirtualBoxTranslator::i_unregisterTranslation(TRCOMPONENT aComponent)
+int VirtualBoxTranslator::i_unregisterTranslation(PTRCOMPONENT aComponent)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -422 +429 @@
 
 
-const char *VirtualBoxTranslator::translate(TRCOMPONENT aComponent,
+const char *VirtualBoxTranslator::translate(PTRCOMPONENT aComponent,
                                             const char *aContext,
                                             const char *aSourceText,
@@ -466 +473 @@
 
 
-const char *VirtualBoxTranslator::i_translate(TRCOMPONENT aComponent,
+const char *VirtualBoxTranslator::i_translate(PTRCOMPONENT aComponent,
                                               const char *aContext,
                                               const char *aSourceText,