Return unsigned int from nplurals()

Fix type mismatch warnings with MSVC in some places after 87127df.

Author: vslavik

src/catalog_po.cpp

@@ -1466,7 +1466,7 @@ bool POCatalog::DoSaveOnly(wxTextBuffer& f, wxTextFileType crlf)
     SaveMultiLines(f, pohdr);
     f.AddLine(wxEmptyString);
 
-    auto pluralsCount = std::max((int)GetPluralFormsCountPresentInItems(), GetPluralForms().nplurals());
+    auto pluralsCount = std::max(GetPluralFormsCountPresentInItems(), GetPluralForms().nplurals());
 
     for (auto& data_: m_items)
     {

src/editing_area.cpp

@@ -764,9 +764,9 @@ void EditingArea::RecreatePluralTextCtrls(CatalogPtr catalog)
     m_textTransSingularForm = NULL;
 
     auto plurals = catalog->GetPluralForms();
-    int formsCount = plurals.nplurals();
+    unsigned formsCount = plurals.nplurals();
 
-    for (int form = 0; form < formsCount; form++)
+    for (unsigned form = 0; form < formsCount; form++)
     {
         // find example number that would use this plural form:
         static const int maxExamplesCnt = 5;

src/language.cpp

@@ -563,7 +563,7 @@ PluralFormsExpr Language::DefaultPluralFormsExpr() const
 }
 
 
-int Language::nplurals() const
+unsigned Language::nplurals() const
 {
     return DefaultPluralFormsExpr().nplurals();
 }
@@ -776,7 +776,7 @@ PluralFormsExpr::~PluralFormsExpr()
 {
 }
 
-int PluralFormsExpr::nplurals() const
+unsigned PluralFormsExpr::nplurals() const
 {
     if (m_nplurals != -1)
         return m_nplurals;
@@ -863,10 +863,10 @@ bool PluralFormsExpr::operator==(const PluralFormsExpr& other) const
     return true;
 }
 
-int PluralFormsExpr::evaluate_for_n(int n) const
+unsigned PluralFormsExpr::evaluate_for_n(int n) const
 {
     auto c = calc();
-    return c ? c->evaluate(n) : 0;
+    return c ? (unsigned)c->evaluate(n) : 0;
 }
 
 PluralFormsExpr PluralFormsExpr::English()

src/language.h

@@ -106,7 +106,7 @@ class Language
     PluralFormsExpr DefaultPluralFormsExpr() const;
 
     /// Count of plural forms for this language
-    int nplurals() const;
+    unsigned nplurals() const;
 
     /// Returns language's text writing direction
     TextDirection Direction() const { return m_direction; }
@@ -228,9 +228,9 @@ class PluralFormsExpr
     bool operator!=(const PluralFormsExpr& other) const { return !(*this == other); }
     explicit operator bool() const { return !m_expr.empty() && calc() != nullptr; }
 
-    int nplurals() const;
+    unsigned nplurals() const;
 
-    int evaluate_for_n(int n) const;
+    unsigned evaluate_for_n(int n) const;
 
 private:
     std::shared_ptr<PluralFormsCalculator> calc() const;