QtTools utils: port away from deprecated QLocale calls

That is required to propagate deprecation warnings to internal tools

Also change QLocale::{Any}Country to QLocale::{Any}Territory.

Task-number: QTBUG-105102
Change-Id: I3396d832cf4a98722ee9a10ed64dab263ba4eb0f
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/linguist/linguist/phrase.cpp b/src/linguist/linguist/phrase.cpp
index d67d701b3..d10fc8bb2 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::AnyCountry),
-    m_sourceCountry(QLocale::AnyCountry)
+    m_country(QLocale::AnyTerritory),
+    m_sourceCountry(QLocale::AnyTerritory)
 {
 }
 
@@ -174,7 +174,7 @@ PhraseBook::~PhraseBook()
     qDeleteAll(m_phrases);
 }
 
-void PhraseBook::setLanguageAndCountry(QLocale::Language lang, QLocale::Country country)
+void PhraseBook::setLanguageAndCountry(QLocale::Language lang, QLocale::Territory country)
 {
     if (m_language == lang && m_country == country)
         return;
@@ -183,7 +183,7 @@ void PhraseBook::setLanguageAndCountry(QLocale::Language lang, QLocale::Country
     setModified(true);
 }
 
-void PhraseBook::setSourceLanguageAndCountry(QLocale::Language lang, QLocale::Country country)
+void PhraseBook::setSourceLanguageAndCountry(QLocale::Language lang, QLocale::Territory country)
 {
     if (m_sourceLanguage == lang && m_sourceCountry == country)
         return;
@@ -210,14 +210,14 @@ bool PhraseBook::load(const QString &fileName, bool *langGuessed)
     if (m_language == QLocale::C) {
         QLocale sys;
         m_language = sys.language();
-        m_country = sys.country();
+        m_country = sys.territory();
         *langGuessed = true;
     }
 
     QString lang = hand->sourceLanguage();
     if (lang.isEmpty()) {
         m_sourceLanguage = QLocale::C;
-        m_sourceCountry = QLocale::AnyCountry;
+        m_sourceCountry = QLocale::AnyTerritory;
     } else {
         Translator::languageAndCountry(lang, &m_sourceLanguage, &m_sourceCountry);
     }