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

Timestamp:

Aug 26, 2021 7:56:31 PM (4 years ago)

Author:

vboxsync

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

146566

Message:

Main/QMTranslatorImpl: Just make plural() return size_t instead of casting at the caller site like done in r146553. bugref:1909

File:

• trunk/src/VBox/Main/src-all/QMTranslatorImpl.cpp (modified) (5 diffs)

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

@@ -345 +345 @@
     }
 
-    int plural(int aNum) const
+    size_t plural(int aNum) const
     {
         if (aNum < 1 || m_pluralRules.empty())
             return 0;
 
-        int  iPluralNumber = 0;
+        size_t   uPluralNumber = 0;
         uint32_t iPos = 0;
 
@@ -399 +399 @@
             }
             if (fOr)
-                return iPluralNumber;
+                return uPluralNumber;
 
             /* Qt returns last plural number if none of rules are match. */
-            iPluralNumber++;
+            uPluralNumber++;
 
             if (iPos >= m_pluralRules.size())
-                return iPluralNumber;
+                return uPluralNumber;
 
             iPos++; // Skip Pl_NewRule
@@ -416 +416 @@
                           const int   aNum) const
     {
-        QMHashSetConstIter iter;
         QMHashSetConstIter lowerIter, upperIter;
 
@@ -436 +435 @@
         for (size_t i = 0; i < RT_ELEMENTS(apszCtx); ++i)
         {
-            for (iter = lowerIter; iter != upperIter; ++iter)
+            for (QMHashSetConstIter iter = lowerIter; iter != upperIter; ++iter)
             {
                 const QMMessage &message = m_messageArray[iter->offset];
@@ -444 +443 @@
                 {
                     const std::vector<const char *> &vecTranslations = m_messageArray[iter->offset].vecTranslations;
-                    size_t idxPlural = (size_t)plural(aNum);
+                    size_t const idxPlural = plural(aNum);
                     return vecTranslations[RT_MIN(idxPlural, vecTranslations.size() - 1)];
                 }