Nomenclature change: country -> territory

In line with the recent change in QLocale's nomenclature, do the same
in Linguist. In the process, obtain a list of territory enum values
sorted by territory name a little more efficiently, bypassing an
intermediary unsorted list of territory enum values.

Change-Id: I18fed74499312f0b502bc8a93fbb2a69c65bca05
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

12 files changed, 93 insertions, 93 deletions

diff --git a/src/linguist/linguist/batchtranslationdialog.cpp b/src/linguist/linguist/batchtranslationdialog.cpp
index cedd0d796..0bc7431fa 100644
--- a/src/linguist/linguist/batchtranslationdialog.cpp
+++ b/src/linguist/linguist/batchtranslationdialog.cpp
@@ -58,8 +58,8 @@ void BatchTranslationDialog::setPhraseBooks(const QList<PhraseBook *> &phraseboo
             if (phrasebooks[i]->language() != m_dataModel->language(m_modelIndex))
                 sortOrder = 3;
             else
-                sortOrder = (phrasebooks[i]->country()
-                             == m_dataModel->model(m_modelIndex)->country()) ? 0 : 1;
+                sortOrder = (phrasebooks[i]->territory()
+                             == m_dataModel->model(m_modelIndex)->territory()) ? 0 : 1;
         } else {
             sortOrder = 2;
         }
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp
index 17b8d46e8..c874ff795 100644
--- a/src/linguist/linguist/mainwindow.cpp
+++ b/src/linguist/linguist/mainwindow.cpp
@@ -1264,7 +1264,7 @@ void MainWindow::addToPhraseBook()
         if (pb->language() != QLocale::C && m_dataModel->language(m_currentIndex.model()) != QLocale::C) {
             if (pb->language() != m_dataModel->language(m_currentIndex.model()))
                 continue;
-            if (pb->country() == m_dataModel->model(m_currentIndex.model())->country())
+            if (pb->territory() == m_dataModel->model(m_currentIndex.model())->territory())
                 phraseBookList.prepend(pb->friendlyPhraseBookName());
             else
                 phraseBookList.append(pb->friendlyPhraseBookName());
@@ -2400,7 +2400,7 @@ void MainWindow::updatePhraseDictInternal(int model)
         if (pb->language() != QLocale::C && m_dataModel->language(model) != QLocale::C) {
             if (pb->language() != m_dataModel->language(model))
                 continue;
-            before = (pb->country() == m_dataModel->model(model)->country());
+            before = (pb->territory() == m_dataModel->model(model)->territory());
         } else {
             before = false;
         }
diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp
index 4c201facc..4a485a703 100644
--- a/src/linguist/linguist/messagemodel.cpp
+++ b/src/linguist/linguist/messagemodel.cpp
@@ -95,8 +95,8 @@ DataModel::DataModel(QObject *parent)
     m_srcCharsSpc(0),
     m_language(QLocale::Language(-1)),
     m_sourceLanguage(QLocale::Language(-1)),
-    m_country(QLocale::Territory(-1)),
-    m_sourceCountry(QLocale::Territory(-1))
+    m_territory(QLocale::Territory(-1)),
+    m_sourceTerritory(QLocale::Territory(-1))
 {}
 
 QStringList DataModel::normalizedTranslations(const MessageItem &m) const
@@ -259,14 +259,14 @@ bool DataModel::load(const QString &fileName, bool *langGuessed, QWidget *parent
     }
     QLocale::Language l;
     QLocale::Territory c;
-    Translator::languageAndCountry(lang, &l, &c);
+    Translator::languageAndTerritory(lang, &l, &c);
     if (l == QLocale::C) {
         QLocale sys;
         l = sys.language();
         c = sys.territory();
         *langGuessed = true;
     }
-    if (!setLanguageAndCountry(l, c))
+    if (!setLanguageAndTerritory(l, c))
         QMessageBox::warning(parent, QObject::tr("Qt Linguist"),
                              tr("Linguist does not know the plural rules for '%1'.\n"
                                 "Will assume a single universal form.")
@@ -280,9 +280,9 @@ bool DataModel::load(const QString &fileName, bool *langGuessed, QWidget *parent
         l = QLocale::C;
         c = QLocale::AnyTerritory;
     } else {
-        Translator::languageAndCountry(lang, &l, &c);
+        Translator::languageAndTerritory(lang, &l, &c);
     }
-    setSourceLanguageAndCountry(l, c);
+    setSourceLanguageAndTerritory(l, c);
 
     setModified(false);
 
@@ -295,8 +295,8 @@ bool DataModel::save(const QString &fileName, QWidget *parent)
     for (DataModelIterator it(this); it.isValid(); ++it)
         tor.append(it.current()->message());
 
-    tor.setLanguageCode(Translator::makeLanguageCode(m_language, m_country));
-    tor.setSourceLanguageCode(Translator::makeLanguageCode(m_sourceLanguage, m_sourceCountry));
+    tor.setLanguageCode(Translator::makeLanguageCode(m_language, m_territory));
+    tor.setSourceLanguageCode(Translator::makeLanguageCode(m_sourceLanguage, m_sourceTerritory));
     tor.setLocationsType(m_relativeLocations ? Translator::RelativeLocations
                                              : Translator::AbsoluteLocations);
     tor.setExtras(m_extra);
@@ -328,7 +328,7 @@ bool DataModel::release(const QString &fileName, bool verbose, bool ignoreUnfini
         return false;
     }
     Translator tor;
-    QLocale locale(m_language, m_country);
+    QLocale locale(m_language, m_territory);
     tor.setLanguageCode(locale.name());
     for (DataModelIterator it(this); it.isValid(); ++it)
         tor.append(it.current()->message());
@@ -363,29 +363,29 @@ void DataModel::doCharCounting(const QString &text, int &trW, int &trC, int &trC
     }
 }
 
-bool DataModel::setLanguageAndCountry(QLocale::Language lang, QLocale::Territory country)
+bool DataModel::setLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory)
 {
-    if (m_language == lang && m_country == country)
+    if (m_language == lang && m_territory == territory)
         return true;
     m_language = lang;
-    m_country = country;
+    m_territory = territory;
 
     if (lang == QLocale::C || uint(lang) > uint(QLocale::LastLanguage)) // XXX does this make any sense?
         lang = QLocale::English;
     QByteArray rules;
-    bool ok = getNumerusInfo(lang, country, &rules, &m_numerusForms, 0);
-    QLocale loc(lang, country);
-    // Add territory name if we couldn't match the (lang, country) combination,
-    // or if the language is used in more than one country.
-    const bool mentionTerritory = (loc.territory() != country) || [lang, country]() {
+    bool ok = getNumerusInfo(lang, territory, &rules, &m_numerusForms, 0);
+    QLocale loc(lang, territory);
+    // Add territory name if we couldn't match the (lang, territory) combination,
+    // or if the language is used in more than one territory.
+    const bool mentionTerritory = (loc.territory() != territory) || [lang, territory]() {
         const auto locales = QLocale::matchingLocales(lang, QLocale::AnyScript,
                                                       QLocale::AnyTerritory);
-        return std::any_of(locales.cbegin(), locales.cend(), [country](const QLocale &locale) {
-            return locale.territory() != country;
+        return std::any_of(locales.cbegin(), locales.cend(), [territory](const QLocale &locale) {
+            return locale.territory() != territory;
         });
     }();
     m_localizedLanguage = mentionTerritory
-            //: <language> (<country>)
+            //: <language> (<territory>)
             ? tr("%1 (%2)").arg(loc.nativeLanguageName(), loc.nativeTerritoryName())
             : loc.nativeLanguageName();
     m_countRefNeeds.clear();
@@ -403,12 +403,12 @@ bool DataModel::setLanguageAndCountry(QLocale::Language lang, QLocale::Territory
     return ok;
 }
 
-void DataModel::setSourceLanguageAndCountry(QLocale::Language lang, QLocale::Territory country)
+void DataModel::setSourceLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory)
 {
-    if (m_sourceLanguage == lang && m_sourceCountry == country)
+    if (m_sourceLanguage == lang && m_sourceTerritory == territory)
         return;
     m_sourceLanguage = lang;
-    m_sourceCountry = country;
+    m_sourceTerritory = territory;
     setModified(true);
 }
 
diff --git a/src/linguist/linguist/messagemodel.h b/src/linguist/linguist/messagemodel.h
index 0dc5f0777..487ef9dc2 100644
--- a/src/linguist/linguist/messagemodel.h
+++ b/src/linguist/linguist/messagemodel.h
@@ -174,12 +174,12 @@ public:
     static QString prettifyPlainFileName(const QString &fn);
     static QString prettifyFileName(const QString &fn);
 
-    bool setLanguageAndCountry(QLocale::Language lang, QLocale::Country country);
+    bool setLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory);
     QLocale::Language language() const { return m_language; }
-    QLocale::Country country() const { return m_country; }
-    void setSourceLanguageAndCountry(QLocale::Language lang, QLocale::Country country);
+    QLocale::Territory territory() const { return m_territory; }
+    void setSourceLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory);
     QLocale::Language sourceLanguage() const { return m_sourceLanguage; }
-    QLocale::Country sourceCountry() const { return m_sourceCountry; }
+    QLocale::Territory sourceTerritory() const { return m_sourceTerritory; }
 
     const QString &localizedLanguage() const { return m_localizedLanguage; }
     const QStringList &numerusForms() const { return m_numerusForms; }
@@ -219,8 +219,8 @@ private:
     QString m_srcFileName;
     QLocale::Language m_language;
     QLocale::Language m_sourceLanguage;
-    QLocale::Country m_country;
-    QLocale::Country m_sourceCountry;
+    QLocale::Territory m_territory;
+    QLocale::Territory m_sourceTerritory;
     bool m_relativeLocations;
     Translator::ExtraData m_extra;
 
diff --git a/src/linguist/linguist/phrase.cpp b/src/linguist/linguist/phrase.cpp
index ac9153f07..154dde5a6 100644
--- a/src/linguist/linguist/phrase.cpp
+++ b/src/linguist/linguist/phrase.cpp
@@ -164,8 +164,8 @@ PhraseBook::PhraseBook() :
     m_changed(false),
     m_language(QLocale::C),
     m_sourceLanguage(QLocale::C),
-    m_country(QLocale::AnyTerritory),
-    m_sourceCountry(QLocale::AnyTerritory)
+    m_territory(QLocale::AnyTerritory),
+    m_sourceTerritory(QLocale::AnyTerritory)
 {
 }
 
@@ -174,21 +174,21 @@ PhraseBook::~PhraseBook()
     qDeleteAll(m_phrases);
 }
 
-void PhraseBook::setLanguageAndCountry(QLocale::Language lang, QLocale::Territory country)
+void PhraseBook::setLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory)
 {
-    if (m_language == lang && m_country == country)
+    if (m_language == lang && m_territory == territory)
         return;
     m_language = lang;
-    m_country = country;
+    m_territory = territory;
     setModified(true);
 }
 
-void PhraseBook::setSourceLanguageAndCountry(QLocale::Language lang, QLocale::Territory country)
+void PhraseBook::setSourceLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory)
 {
-    if (m_sourceLanguage == lang && m_sourceCountry == country)
+    if (m_sourceLanguage == lang && m_sourceTerritory == territory)
         return;
     m_sourceLanguage = lang;
-    m_sourceCountry = country;
+    m_sourceTerritory = territory;
     setModified(true);
 }
 
@@ -205,21 +205,21 @@ bool PhraseBook::load(const QString &fileName, bool *langGuessed)
     reader.setNamespaceProcessing(false);
     bool ok = hand->parse();
 
-    Translator::languageAndCountry(hand->language(), &m_language, &m_country);
+    Translator::languageAndTerritory(hand->language(), &m_language, &m_territory);
     *langGuessed = false;
     if (m_language == QLocale::C) {
         QLocale sys;
         m_language = sys.language();
-        m_country = sys.territory();
+        m_territory = sys.territory();
         *langGuessed = true;
     }
 
     QString lang = hand->sourceLanguage();
     if (lang.isEmpty()) {
         m_sourceLanguage = QLocale::C;
-        m_sourceCountry = QLocale::AnyTerritory;
+        m_sourceTerritory = QLocale::AnyTerritory;
     } else {
-        Translator::languageAndCountry(lang, &m_sourceLanguage, &m_sourceCountry);
+        Translator::languageAndTerritory(lang, &m_sourceLanguage, &m_sourceTerritory);
     }
 
     delete hand;
@@ -247,9 +247,9 @@ bool PhraseBook::save(const QString &fileName)
     t << "<!DOCTYPE QPH>\n<QPH";
     if (sourceLanguage() != QLocale::C)
         t << " sourcelanguage=\""
-          << Translator::makeLanguageCode(sourceLanguage(), sourceCountry()) << '"';
+          << Translator::makeLanguageCode(sourceLanguage(), sourceTerritory()) << '"';
     if (language() != QLocale::C)
-        t << " language=\"" << Translator::makeLanguageCode(language(), country()) << '"';
+        t << " language=\"" << Translator::makeLanguageCode(language(), territory()) << '"';
     t << ">\n";
     for (Phrase *p : std::as_const(m_phrases)) {
         t << "<phrase>\n";
diff --git a/src/linguist/linguist/phrase.h b/src/linguist/linguist/phrase.h
index 72e305328..9744ae670 100644
--- a/src/linguist/linguist/phrase.h
+++ b/src/linguist/linguist/phrase.h
@@ -67,12 +67,12 @@ public:
     QString friendlyPhraseBookName() const;
     bool isModified() const { return m_changed; }
 
-    void setLanguageAndCountry(QLocale::Language lang, QLocale::Country country);
+    void setLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory);
     QLocale::Language language() const { return m_language; }
-    QLocale::Country country() const { return m_country; }
-    void setSourceLanguageAndCountry(QLocale::Language lang, QLocale::Country country);
+    QLocale::Territory territory() const { return m_territory; }
+    void setSourceLanguageAndTerritory(QLocale::Language lang, QLocale::Territory territory);
     QLocale::Language sourceLanguage() const { return m_sourceLanguage; }
-    QLocale::Country sourceCountry() const { return m_sourceCountry; }
+    QLocale::Territory sourceTerritory() const { return m_sourceTerritory; }
 
 signals:
     void modifiedChanged(bool changed);
@@ -92,8 +92,8 @@ private:
 
     QLocale::Language m_language;
     QLocale::Language m_sourceLanguage;
-    QLocale::Country m_country;
-    QLocale::Country m_sourceCountry;
+    QLocale::Territory m_territory;
+    QLocale::Territory m_sourceTerritory;
 
     friend class QphHandler;
     friend class Phrase;
diff --git a/src/linguist/linguist/translationsettingsdialog.cpp b/src/linguist/linguist/translationsettingsdialog.cpp
index 72aaa3e21..b75c8c4ac 100644
--- a/src/linguist/linguist/translationsettingsdialog.cpp
+++ b/src/linguist/linguist/translationsettingsdialog.cpp
@@ -51,7 +51,7 @@ void TranslationSettingsDialog::setPhraseBook(PhraseBook *phraseBook)
     setWindowTitle(tr("Settings for '%1' - Qt Linguist").arg(fn));
 }
 
-static void fillCountryCombo(const QVariant &lng, QComboBox *combo)
+static void fillTerritoryCombo(const QVariant &lng, QComboBox *combo)
 {
     combo->clear();
     QLocale::Language lang = QLocale::Language(lng.toInt());
@@ -69,19 +69,19 @@ static void fillCountryCombo(const QVariant &lng, QComboBox *combo)
         }
         combo->model()->sort(0, Qt::AscendingOrder);
     }
-    combo->insertItem(0, TranslationSettingsDialog::tr("Any Country"),
+    combo->insertItem(0, TranslationSettingsDialog::tr("Any Territory"),
                       QVariant(QLocale::AnyTerritory));
     combo->setCurrentIndex(0);
 }
 
 void TranslationSettingsDialog::on_srcCbLanguageList_currentIndexChanged(int idx)
 {
-    fillCountryCombo(m_ui.srcCbLanguageList->itemData(idx), m_ui.srcCbCountryList);
+    fillTerritoryCombo(m_ui.srcCbLanguageList->itemData(idx), m_ui.srcCbCountryList);
 }
 
 void TranslationSettingsDialog::on_tgtCbLanguageList_currentIndexChanged(int idx)
 {
-    fillCountryCombo(m_ui.tgtCbLanguageList->itemData(idx), m_ui.tgtCbCountryList);
+    fillTerritoryCombo(m_ui.tgtCbLanguageList->itemData(idx), m_ui.tgtCbCountryList);
 }
 
 void TranslationSettingsDialog::on_buttonBox_accepted()
@@ -92,7 +92,7 @@ void TranslationSettingsDialog::on_buttonBox_accepted()
 
     itemindex = m_ui.tgtCbCountryList->currentIndex();
     var = m_ui.tgtCbCountryList->itemData(itemindex);
-    QLocale::Territory country = QLocale::Territory(var.toInt());
+    QLocale::Territory territory = QLocale::Territory(var.toInt());
 
     itemindex = m_ui.srcCbLanguageList->currentIndex();
     var = m_ui.srcCbLanguageList->itemData(itemindex);
@@ -100,14 +100,14 @@ void TranslationSettingsDialog::on_buttonBox_accepted()
 
     itemindex = m_ui.srcCbCountryList->currentIndex();
     var = m_ui.srcCbCountryList->itemData(itemindex);
-    QLocale::Territory country2 = QLocale::Territory(var.toInt());
+    QLocale::Territory territory2 = QLocale::Territory(var.toInt());
 
     if (m_phraseBook) {
-        m_phraseBook->setLanguageAndCountry(lang, country);
-        m_phraseBook->setSourceLanguageAndCountry(lang2, country2);
+        m_phraseBook->setLanguageAndTerritory(lang, territory);
+        m_phraseBook->setSourceLanguageAndTerritory(lang2, territory2);
     } else {
-        m_dataModel->setLanguageAndCountry(lang, country);
-        m_dataModel->setSourceLanguageAndCountry(lang2, country2);
+        m_dataModel->setLanguageAndTerritory(lang, territory);
+        m_dataModel->setSourceLanguageAndTerritory(lang2, territory2);
     }
 
     accept();
@@ -116,30 +116,30 @@ void TranslationSettingsDialog::on_buttonBox_accepted()
 void TranslationSettingsDialog::showEvent(QShowEvent *)
 {
     QLocale::Language lang, lang2;
-    QLocale::Territory country, country2;
+    QLocale::Territory territory, territory2;
 
     if (m_phraseBook) {
         lang = m_phraseBook->language();
-        country = m_phraseBook->country();
+        territory = m_phraseBook->territory();
         lang2 = m_phraseBook->sourceLanguage();
-        country2 = m_phraseBook->sourceCountry();
+        territory2 = m_phraseBook->sourceTerritory();
     } else {
         lang = m_dataModel->language();
-        country = m_dataModel->country();
+        territory = m_dataModel->territory();
         lang2 = m_dataModel->sourceLanguage();
-        country2 = m_dataModel->sourceCountry();
+        territory2 = m_dataModel->sourceTerritory();
     }
 
     int itemindex = m_ui.tgtCbLanguageList->findData(QVariant(int(lang)));
     m_ui.tgtCbLanguageList->setCurrentIndex(itemindex == -1 ? 0 : itemindex);
 
-    itemindex = m_ui.tgtCbCountryList->findData(QVariant(int(country)));
+    itemindex = m_ui.tgtCbCountryList->findData(QVariant(int(territory)));
     m_ui.tgtCbCountryList->setCurrentIndex(itemindex == -1 ? 0 : itemindex);
 
     itemindex = m_ui.srcCbLanguageList->findData(QVariant(int(lang2)));
     m_ui.srcCbLanguageList->setCurrentIndex(itemindex == -1 ? 0 : itemindex);
 
-    itemindex = m_ui.srcCbCountryList->findData(QVariant(int(country2)));
+    itemindex = m_ui.srcCbCountryList->findData(QVariant(int(territory2)));
     m_ui.srcCbCountryList->setCurrentIndex(itemindex == -1 ? 0 : itemindex);
 }
 
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index b635fc2d7..fe35e2f6a 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -387,7 +387,7 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil
             if (tor.translationsExist()) {
                 QLocale::Language l;
                 QLocale::Territory c;
-                tor.languageAndCountry(tor.languageCode(), &l, &c);
+                tor.languageAndTerritory(tor.languageCode(), &l, &c);
                 QStringList forms;
                 if (!getNumerusInfo(l, c, 0, &forms, 0)) {
                     printErr(QStringLiteral("File %1 won't be updated: it contains translation but the"
diff --git a/src/linguist/shared/po.cpp b/src/linguist/shared/po.cpp
index 3a0742c53..1da8b95d2 100644
--- a/src/linguist/shared/po.cpp
+++ b/src/linguist/shared/po.cpp
@@ -730,7 +730,7 @@ bool savePO(const Translator &translator, QIODevice &dev, ConversionData &)
     if (!translator.languageCode().isEmpty()) {
         QLocale::Language l;
         QLocale::Territory c;
-        Translator::languageAndCountry(translator.languageCode(), &l, &c);
+        Translator::languageAndTerritory(translator.languageCode(), &l, &c);
         const char *gettextRules;
         if (getNumerusInfo(l, c, 0, 0, &gettextRules))
             addPoHeader(headers, hdrOrder, "Plural-Forms", QLatin1String(gettextRules));
diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp
index da051b813..82605f492 100644
--- a/src/linguist/shared/qm.cpp
+++ b/src/linguist/shared/qm.cpp
@@ -499,7 +499,7 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd)
     QString strProN = QLatin1String("%n");
     QLocale::Language l;
     QLocale::Territory c;
-    Translator::languageAndCountry(translator.languageCode(), &l, &c);
+    Translator::languageAndTerritory(translator.languageCode(), &l, &c);
     QStringList numerusForms;
     bool guessPlurals = true;
     if (getNumerusInfo(l, c, 0, &numerusForms, 0))
@@ -621,7 +621,7 @@ bool saveQM(const Translator &translator, QIODevice &dev, ConversionData &cd)
     Releaser releaser(translator.languageCode());
     QLocale::Language l;
     QLocale::Territory c;
-    Translator::languageAndCountry(translator.languageCode(), &l, &c);
+    Translator::languageAndTerritory(translator.languageCode(), &l, &c);
     QByteArray rules;
     if (getNumerusInfo(l, c, &rules, 0, 0))
         releaser.setNumerusRules(rules);
diff --git a/src/linguist/shared/translator.cpp b/src/linguist/shared/translator.cpp
index dba9c84cc..b52b8a253 100644
--- a/src/linguist/shared/translator.cpp
+++ b/src/linguist/shared/translator.cpp
@@ -324,34 +324,34 @@ bool Translator::save(const QString &filename, ConversionData &cd, const QString
     return false;
 }
 
-QString Translator::makeLanguageCode(QLocale::Language language, QLocale::Territory country)
+QString Translator::makeLanguageCode(QLocale::Language language, QLocale::Territory territory)
 {
     QString result = QLocale::languageToCode(language);
-    if (language != QLocale::C && country != QLocale::AnyTerritory) {
+    if (language != QLocale::C && territory != QLocale::AnyTerritory) {
         result.append(QLatin1Char('_'));
-        result.append(QLocale::territoryToCode(country));
+        result.append(QLocale::territoryToCode(territory));
     }
     return result;
 }
 
-void Translator::languageAndCountry(QStringView languageCode, QLocale::Language *langPtr,
-                                    QLocale::Territory *countryPtr)
+void Translator::languageAndTerritory(QStringView languageCode, QLocale::Language *langPtr,
+                                    QLocale::Territory *territoryPtr)
 {
     QLocale::Language language = QLocale::AnyLanguage;
-    QLocale::Territory country = QLocale::AnyTerritory;
+    QLocale::Territory territory = QLocale::AnyTerritory;
     const auto underScore = languageCode.indexOf(u'_'); // "de_DE"
     if (underScore != -1) {
         language = QLocale::codeToLanguage(languageCode.left(underScore));
-        country = QLocale::codeToTerritory(languageCode.mid(underScore + 1));
+        territory = QLocale::codeToTerritory(languageCode.mid(underScore + 1));
     } else {
         language = QLocale::codeToLanguage(languageCode);
-        country = QLocale(language).territory();
+        territory = QLocale(language).territory();
     }
 
     if (langPtr)
         *langPtr = language;
-    if (countryPtr)
-        *countryPtr = country;
+    if (territoryPtr)
+        *territoryPtr = territory;
 }
 
 int Translator::find(const TranslatorMessage &msg) const
@@ -672,7 +672,7 @@ void Translator::normalizeTranslations(ConversionData &cd)
     bool truncated = false;
     QLocale::Language l;
     QLocale::Territory c;
-    languageAndCountry(languageCode(), &l, &c);
+    languageAndTerritory(languageCode(), &l, &c);
     int numPlurals = 1;
     if (l != QLocale::C) {
         QStringList forms;
diff --git a/src/linguist/shared/translator.h b/src/linguist/shared/translator.h
index 4ca4140d1..778491bb4 100644
--- a/src/linguist/shared/translator.h
+++ b/src/linguist/shared/translator.h
@@ -128,9 +128,9 @@ public:
     void setLocationsType(LocationsType lt) { m_locationsType = lt; }
     LocationsType locationsType() const { return m_locationsType; }
 
-    static QString makeLanguageCode(QLocale::Language language, QLocale::Country country);
-    static void languageAndCountry(QStringView languageCode,
-        QLocale::Language *langPtr, QLocale::Country *countryPtr);
+    static QString makeLanguageCode(QLocale::Language language, QLocale::Territory territory);
+    static void languageAndTerritory(QStringView languageCode, QLocale::Language *langPtr,
+                                     QLocale::Territory *territoryPtr);
     void setLanguageCode(const QString &languageCode) { m_language = languageCode; }
     void setSourceLanguageCode(const QString &languageCode) { m_sourceLanguage = languageCode; }
     static QString guessLanguageCodeFromFileName(const QString &fileName);
@@ -192,9 +192,9 @@ private:
     LocationsType m_locationsType;
 
     // A string beginning with a 2 or 3 letter language code (ISO 639-1
-    // or ISO-639-2), followed by the optional country variant to distinguish
-    //  between country-specific variations of the language. The language code
-    // and country code are always separated by '_'
+    // or ISO-639-2), followed by the optional territory variant to distinguish
+    // between territory-specific variations of the language. The language code
+    // and territory code are always separated by '_'
     // Note that the language part can also be a 3-letter ISO 639-2 code.
     // Legal examples:
     // 'pt'         portuguese, assumes portuguese from portugal
@@ -211,8 +211,8 @@ private:
     mutable QHash<TMMKey, int> m_msgIdx;
 };
 
-bool getNumerusInfo(QLocale::Language language, QLocale::Country country,
-                    QByteArray *rules, QStringList *forms, const char **gettextRules);
+bool getNumerusInfo(QLocale::Language language, QLocale::Territory territory, QByteArray *rules,
+                    QStringList *forms, const char **gettextRules);
 
 QString getNumerusInfoString();