diff options
Diffstat (limited to 'src/corelib/text/qlocale.qdoc')
-rw-r--r-- | src/corelib/text/qlocale.qdoc | 733 |
1 files changed, 383 insertions, 350 deletions
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index eb497d9386..0cdacfd8e5 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \class QLocale @@ -31,15 +7,15 @@ \brief The QLocale class converts between numbers and their string representations in various languages. + \compares equality \reentrant \ingroup i18n \ingroup string-processing \ingroup shared - - QLocale is initialized with a language/country pair in its - constructor and offers number-to-string and string-to-number - conversion functions similar to those in QString. + QLocale is constructed for a specified language, optional script and + territory. It offers various facilities for formatting data as text, + localized appropriately, and for reading data out of localized text. Example: @@ -54,9 +30,6 @@ \list \li If a QLocale object is constructed with the default constructor, it will use the default locale's settings. - \li QString::toInt(), QString::toDouble(), etc., interpret the - string according to the default locale. If this fails, it - falls back on the "C" locale. \li QString::arg() uses the default locale to format a number when its position specifier in the format string contains an 'L', e.g. "%L1". @@ -66,36 +39,47 @@ \snippet code/src_corelib_text_qlocale.cpp 1 - When a language/country pair is specified in the constructor, one - of three things can happen: - - \list - \li If the language/country pair is found in the database, it is used. - \li If the language is found but the country is not, or if the country - is \c AnyCountry, the language is used with the most - appropriate available country (for example, Germany for German), - \li If neither the language nor the country are found, QLocale - defaults to the default locale (see setDefault()). - \endlist - - Use language() and country() to determine the actual language and - country values used. - An alternative method for constructing a QLocale object is by specifying the locale name. \snippet code/src_corelib_text_qlocale.cpp 2 - This constructor converts the locale name to a language/country - pair; it does not use the system locale database. + This constructor reads the language, script and/or territory from the given + name, accepting either uderscore or dash as separator (and ignoring any + trailing \c{.codeset} or \c{@variant} suffix). \note For the current keyboard input locale take a look at QInputMethod::locale(). - QLocale's data is based on Common Locale Data Repository v36. + QLocale's data is based on Common Locale Data Repository v44.1. + + \section1 Matching combinations of language, script and territory + + QLocale has data, derived from CLDR, for many combinations of language, + script and territory, but not all. If it is constructed with all three of + these key values specified (treating \c AnyLanguage, \c AnyScript or \c + AnyTerritory as unspecified) and QLocale has data for the given combination, + this data is used. Otherwise, QLocale does its best to find a sensible + combination of language, script and territory, for which it does have data, + that matches those that were specified. + + The CLDR provides tables of likely combinations, which are used to fill in + any unspecified key or keys; if QLocale has data for the result of such a + likely combination, that is used. If no language is specified, and none can + be determined from script and territory, or if QLocale has no data for the + language, the "C" locale (when reading the keys from a string) or default + locale (otherwise) is used. + + When QLocale has no data for the keys specified, with likely keys filled in + where unspecified, but does have data for the resulting language, a + fall-back is sought, based on ignoring either territory, script or both (in + that order). This results in a QLocale which may not match what was asked + for, but provides localization that's as suitable as the available data + permits, for the keys specified. + + Use language(), script() and territory() to determine the actual keys used. - \sa QString::arg(), QString::toInt(), QString::toDouble(), - QInputMethod::locale() + \sa QString::arg(), QInputMethod::locale() */ /*! @@ -111,20 +95,18 @@ \value Afar \value Afrikaans \value Aghem - \value Ahom Since Qt 5.7 \value Akan - \value Akkadian Since Qt 5.1 - \value Akoose Since Qt 5.3 + \value [since 5.1] Akkadian + \value [since 5.3] Akoose \value Albanian - \value AmericanSignLanguage Since Qt 5.7 + \value [since 5.7] AmericanSignLanguage \value Amharic - \value AncientEgyptian Since Qt 5.1 - \value AncientGreek Since Qt 5.1 - \value AncientNorthArabian Since Qt 5.5 + \value [since 5.1] AncientEgyptian + \value [since 5.1] AncientGreek + \value [since 6.7] Anii \value Arabic - \value Aragonese Since Qt 5.1 - \value Aramaic Since Qt 5.1 - \value ArdhamagadhiPrakrit Since Qt 5.7 + \value [since 5.1] Aragonese + \value [since 5.1] Aramaic \value Armenian \value Assamese \value Asturian @@ -135,52 +117,49 @@ \value Aymara \value Azerbaijani \value Bafia - \value Balinese Since Qt 5.1 + \value [since 5.1] Balinese + \value [since 6.6] Baluchi \value Bambara - \value Bamun Since Qt 5.1 + \value [since 5.1] Bamun + \value [since 6.0] Bangla \value Basaa \value Bashkir \value Basque - \value Bassa Since Qt 5.5 - \value BatakToba Since Qt 5.1 + \value [since 5.1] BatakToba \value Belarusian \value Bemba \value Bena - \value Bengali - \value Bhojpuri Since Qt 5.7 + \value Bengali Obsolete, please use Bangla + \value [since 5.7] Bhojpuri \value Bhutani Obsolete, please use Dzongkha - \value Bihari \value Bislama \value Blin \value Bodo \value Bosnian \value Breton - \value Buginese Since Qt 5.1 - \value Buhid Since Qt 5.1 + \value [since 5.1] Buginese \value Bulgarian \value Burmese \value Byelorussian Obsolete, please use Belarusian \value Cambodian Obsolete, please use Khmer - \value Cantonese Since Qt 5.7 - \value Carian Since Qt 5.1 + \value [since 5.7] Cantonese \value Catalan - \value Cebuano Since Qt 5.14 - \value CentralKurdish Since Qt 5.5 - \value CentralMoroccoTamazight - \value Chakma Since Qt 5.1 + \value [since 5.14] Cebuano + \value [since 6.0] CentralAtlasTamazight + \value [since 5.5] CentralKurdish + \value CentralMoroccoTamazight Obsolete, please use CentralAtlasTamazight + \value [since 5.1] Chakma \value Chamorro \value Chechen \value Cherokee \value Chewa Obsolete, please use Nyanja - \value Chickasaw Since Qt 5.14 + \value [since 5.14] Chickasaw \value Chiga \value Chinese (Mandarin) \value Church \value Chuvash - \value ClassicalMandaic Since Qt 5.1 \value Colognian - \value CongoSwahili - \value Coptic Since Qt 5.1 + \value [since 5.1] Coptic \value Cornish \value Corsican \value Cree @@ -188,18 +167,15 @@ \value Czech \value Danish \value Divehi - \value Dogri Since Qt 5.1 + \value [since 5.1] Dogri \value Duala \value Dutch \value Dzongkha - \value EasternCham Since Qt 5.1 - \value EasternKayah Since Qt 5.1 \value Embu \value English - \value Erzya Since Qt 5.14 + \value [since 5.14] Erzya \value Esperanto \value Estonian - \value Etruscan Since Qt 5.1 \value Ewe \value Ewondo \value Faroese @@ -217,34 +193,32 @@ \value Geez \value Georgian \value German - \value Gothic Since Qt 5.1 + \value [since 5.1] Gothic \value Greek - \value Greenlandic + \value Greenlandic Obsolete, please use Kalaallisut \value Guarani \value Gujarati \value Gusii \value Haitian - \value Hanunoo Since Qt 5.1 + \value [since 6.5] Haryanvi \value Hausa \value Hawaiian \value Hebrew \value Herero - \value HieroglyphicLuwian Since Qt 5.7 \value Hindi \value HiriMotu - \value HmongNjua Since Qt 5.5 - \value Ho Since Qt 5.5 \value Hungarian \value Icelandic - \value Ido Since Qt 5.12 + \value [since 5.12] Ido \value Igbo - \value InariSami Since Qt 5.5 + \value [since 5.5] InariSami \value Indonesian - \value Ingush Since Qt 5.1 + \value [since 5.1] Ingush \value Interlingua \value Interlingue \value Inuktitut - \value Inupiak + \value Inupiak Obsolete, please use Inupiaq + \value [since 6.0] Inupiaq \value Irish \value Italian \value Japanese @@ -253,19 +227,22 @@ \value JolaFonyi \value Kabuverdianu \value Kabyle + \value [since 6.3] Kaingang \value Kako + \value [since 6.0] Kalaallisut \value Kalenjin \value Kamba + \value [since 6.7] Kangri \value Kannada \value Kanuri \value Kashmiri \value Kazakh - \value Kenyang Since Qt 5.5 + \value [since 5.5] Kenyang \value Khmer - \value Kiche Since Qt 5.5 + \value [since 5.5] Kiche \value Kikuyu \value Kinyarwanda - \value Kirghiz + \value Kirghiz Obsolete, please use Kyrgyz \value Komi \value Kongo \value Konkani @@ -274,212 +251,198 @@ \value KoyraboroSenni \value KoyraChiini \value Kpelle + \value [since 6.0] Kuanyama \value Kurdish \value Kurundi Obsolete, please use Rundi - \value Kwanyama + \value Kwanyama Obsolete, please use Kuanyama \value Kwasio - \value Lakota Since Qt 5.3 + \value [since 6.0] Kyrgyz + \value [since 5.3] Lakota \value Langi \value Lao - \value LargeFloweryMiao Since Qt 5.1 \value Latin \value Latvian - \value Lepcha Since Qt 5.1 - \value Lezghian Since Qt 5.5 + \value [since 5.5] Lezghian \value Limburgish - \value Limbu Since Qt 5.1 - \value LinearA Since Qt 5.5 \value Lingala - \value Lisu Since Qt 5.1 - \value LiteraryChinese Since Qt 5.7 + \value [since 6.6] Ligurian + \value [since 5.7] LiteraryChinese \value Lithuanian - \value Lojban Since Qt 5.12 - \value LowerSorbian Since Qt 5.5 + \value [since 5.12] Lojban + \value [since 5.5] LowerSorbian \value LowGerman \value LubaKatanga - \value LuleSami Since Qt 5.5 + \value [since 5.5] LuleSami \value Luo - \value Lu Since Qt 5.1 \value Luxembourgish \value Luyia - \value Lycian Since Qt 5.1 - \value Lydian Since Qt 5.1 \value Macedonian \value Machame - \value Maithili Since Qt 5.5 + \value [since 5.5] Maithili \value MakhuwaMeetto \value Makonde \value Malagasy \value Malay \value Malayalam \value Maltese - \value Mandingo Since Qt 5.1 - \value ManichaeanMiddlePersian Since Qt 5.5 - \value Manipuri Since Qt 5.1 + \value [since 5.1] Mandingo + \value [since 5.1] Manipuri \value Manx \value Maori - \value Mapuche Since Qt 5.5 + \value [since 5.5] Mapuche \value Marathi \value Marshallese \value Masai - \value Mazanderani Since Qt 5.7 - \value Mende Since Qt 5.5 - \value Meroitic Since Qt 5.1 + \value [since 5.7] Mazanderani + \value [since 5.5] Mende \value Meru \value Meta - \value Mohawk Since Qt 5.5 - \value Moldavian Obsolete, please use Romanian + \value [since 5.5] Mohawk + \value [since 6.5] Moksha \value Mongolian - \value Mono Since Qt 5.5 \value Morisyen - \value Mru Since Qt 5.7 \value Mundang - \value Muscogee Since Qt 5.14 + \value [since 5.14] Muscogee \value Nama \value NauruLanguage - \value Navaho + \value Navaho Obsolete, please use Navajo + \value [since 6.0] Navajo \value Ndonga \value Nepali - \value Newari Since Qt 5.7 + \value [since 5.7] Newari \value Ngiemboon + \value [since 6.3] Nheengatu + \value [since 6.0] NigerianPidgin \value Ngomba - \value Nko Since Qt 5.5 - \value NorthernLuri Since Qt 5.7 + \value [since 5.5] Nko + \value [since 6.5] NorthernFrisian + \value [since 5.7] NorthernLuri \value NorthernSami \value NorthernSotho - \value NorthernThai Since Qt 5.1 \value NorthNdebele - \value NorwegianBokmal same as Norwegian + \value NorwegianBokmal \value NorwegianNynorsk - \value Norwegian same as NorwegianBokmal \value Nuer \value Nyanja \value Nyankole + \value [since 6.5] Obolo \value Occitan + \value [since 6.0] Odia \value Ojibwa - \value OldIrish Since Qt 5.1 - \value OldNorse Since Qt 5.1 - \value OldPersian Since Qt 5.1 - \value OldTurkish Since Qt 5.1 - \value Oriya + \value [since 5.1] OldIrish + \value [since 5.1] OldNorse + \value [since 5.1] OldPersian + \value Oriya Obsolete, please use Odia \value Oromo - \value Osage Since Qt 5.7 + \value [since 5.7] Osage \value Ossetic - \value Pahlavi Since Qt 5.1 - \value Palauan Since Qt 5.7 + \value [since 5.1] Pahlavi + \value [since 5.7] Palauan \value Pali - \value Papiamento Since Qt 5.7 - \value Parthian Since Qt 5.1 + \value [since 5.7] Papiamento \value Pashto \value Persian - \value Phoenician Since Qt 5.1 + \value [since 5.1] Phoenician + \value [since 6.5] Pijin \value Polish \value Portuguese - \value PrakritLanguage Since Qt 5.1 - \value Prussian Since Qt 5.5 + \value [since 5.5] Prussian \value Punjabi \value Quechua - \value Rejang Since Qt 5.1 + \value [since 6.5] Rajasthani \value RhaetoRomance Obsolete, please use Romansh + \value [since 6.6] Rohingya \value Romanian \value Romansh \value Rombo \value Rundi \value Russian \value Rwa - \value Sabaean Since Qt 5.1 \value Saho \value Sakha - \value Samaritan Since Qt 5.1 \value Samburu \value Samoan \value Sango \value Sangu \value Sanskrit - \value Santali Since Qt 5.1 - \value Saraiki Since Qt 5.7 + \value [since 5.1] Santali \value Sardinian - \value Saurashtra Since Qt 5.1 + \value [since 5.1] Saurashtra \value Sena \value Serbian - \value SerboCroatian Obsolete, please use Serbian \value Shambala \value Shona \value SichuanYi - \value Sicilian Since Qt 5.12 + \value [since 5.12] Sicilian \value Sidamo - \value Silesian Since Qt 5.14 + \value [since 5.14] Silesian \value Sindhi \value Sinhala - \value SkoltSami Since Qt 5.5 + \value [since 5.5] SkoltSami \value Slovak \value Slovenian \value Soga \value Somali - \value Sora Since Qt 5.1 - \value SouthernKurdish Since Qt 5.12 - \value SouthernSami Since Qt 5.5 + \value [since 5.12] SouthernKurdish + \value [since 5.5] SouthernSami \value SouthernSotho \value SouthNdebele \value Spanish - \value StandardMoroccanTamazight Since Qt 5.3 + \value [since 5.3] StandardMoroccanTamazight \value Sundanese \value Swahili \value Swati \value Swedish \value SwissGerman - \value Sylheti Since Qt 5.1 \value Syriac \value Tachelhit - \value Tagalog Obsolete, please use Filipino - \value Tagbanwa Since Qt 5.1 \value Tahitian - \value TaiDam Since Qt 5.1 - \value TaiNua Since Qt 5.1 + \value [since 5.1] TaiDam \value Taita \value Tajik \value Tamil - \value Tangut Since Qt 5.7 \value Taroko \value Tasawaq \value Tatar - \value TedimChin Since Qt 5.5 \value Telugu \value Teso \value Thai \value Tibetan \value Tigre \value Tigrinya - \value TokelauLanguage Since Qt 5.7 - \value TokPisin Since Qt 5.7 + \value [since 5.7] TokelauLanguage + \value [since 6.5] TokiPona + \value [since 5.7] TokPisin \value Tongan + \value [since 6.6] Torwali \value Tsonga \value Tswana \value Turkish \value Turkmen - \value TuvaluLanguage Since Qt 5.7 - \value Twi Obsolete, please use Akan + \value [since 5.7] TuvaluLanguage \value Tyap - \value Ugaritic Since Qt 5.1 - \value Uighur - \value Uigur Obsolete, please use Uighur + \value [since 5.1] Ugaritic + \value Uighur Obsolete, please use Uyghur + \value Uigur Obsolete, please use Uyghur \value Ukrainian - \value UncodedLanguages Since Qt 5.7 - \value UpperSorbian Since Qt 5.5 + \value [since 5.5] UpperSorbian \value Urdu + \value [since 6.0] Uyghur \value Uzbek \value Vai \value Venda + \value [since 6.7] Venetian \value Vietnamese \value Volapuk \value Vunjo - \value Walamo + \value Walamo Obsolete, please use Wolaytta \value Walloon \value Walser - \value Warlpiri Since Qt 5.5 + \value [since 5.5] Warlpiri \value Welsh - \value WesternBalochi Since Qt 5.12 + \value [since 5.12] WesternBalochi \value WesternFrisian same as Frisian + \value [since 6.0] Wolaytta \value Wolof \value Xhosa \value Yangben @@ -495,11 +458,25 @@ */ /*! + \typealias QLocale::Territory + + This enumeration type is an alias for \l Country, + which shall be renamed to Territory at a future release. + + \sa territory(), territoryToString() +*/ + +/*! \enum QLocale::Country - This enumerated type is used to specify a country. + This enumerated type is used to identify a territory. + + An individual territory may be a province of a country, a country (by far the + most common case) or a larger geographic entity, to which some localization + details are specific. - \value AnyCountry + \value AnyCountry Osbolete alias for \c AnyTerritory + \value [since 6.2] AnyTerritory \value Afghanistan \value AlandIslands @@ -530,7 +507,8 @@ \value Bhutan \value Bolivia \value Bonaire - \value BosniaAndHerzegowina + \value BosniaAndHerzegowina Obsolete, use \c BosniaAndHerzegovina instead + \value [since 6.0] BosniaAndHerzegovina \value Botswana \value BouvetIsland \value Brazil @@ -544,6 +522,7 @@ \value Cameroon \value Canada \value CanaryIslands + \value CaribbeanNetherlands \value CapeVerde \value CaymanIslands \value CentralAfricanRepublic @@ -562,11 +541,13 @@ \value CostaRica \value Croatia \value Cuba - \value CuraSao + \value [since 6.0] Curacao + \value CuraSao Obsolete, use \c Curacao instead \value Cyprus - \value CzechRepublic - \value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa - \value DemocraticRepublicOfKorea Obsolete, please use NorthKorea + \value [since 6.0] Czechia + \value CzechRepublic Obsolete, use \c Czechia instead + \value DemocraticRepublicOfCongo Obsolete, use \c CongoKinshasa instead + \value DemocraticRepublicOfKorea Obsolete, use \c NorthKorea instead \value Denmark \value DiegoGarcia \value Djibouti @@ -579,9 +560,10 @@ \value EquatorialGuinea \value Eritrea \value Estonia + \value Eswatini \value Ethiopia - \value EuropeanUnion Since Qt 5.7 - \value Europe Since Qt 5.12 + \value [since 5.7] EuropeanUnion + \value [since 5.12] Europe \value FalklandIslands \value FaroeIslands \value Fiji @@ -628,12 +610,12 @@ \value Kazakhstan \value Kenya \value Kiribati - \value Kosovo Since Qt 5.2 + \value [since 5.2] Kosovo \value Kuwait \value Kyrgyzstan \value Laos \value LatinAmerica - \value LatinAmericaAndTheCaribbean Obsolete, please use LatinAmerica + \value LatinAmericaAndTheCaribbean Obsolete, use \c LatinAmerica instead \value Latvia \value Lebanon \value Lesotho @@ -642,6 +624,7 @@ \value Liechtenstein \value Lithuania \value Luxembourg + \value Macao \value Macau \value Macedonia \value Madagascar @@ -666,7 +649,8 @@ \value Mozambique \value Myanmar \value Namibia - \value NauruCountry + \value NauruCountry Osbolete alias for \c NauruTerritory + \value [since 6.2] NauruTerritory \value Nepal \value Netherlands \value NewCaledonia @@ -680,14 +664,14 @@ \value NorthKorea \value Norway \value Oman - \value OutlyingOceania Since Qt 5.7 + \value [since 5.7] OutlyingOceania \value Pakistan \value Palau \value PalestinianTerritories \value Panama \value PapuaNewGuinea \value Paraguay - \value PeoplesRepublicOfCongo Obsolete, please use CongoBrazzaville + \value PeoplesRepublicOfCongo Obsolete, use \c CongoBrazzaville instead \value Peru \value Philippines \value Pitcairn @@ -695,11 +679,11 @@ \value Portugal \value PuertoRico \value Qatar - \value RepublicOfKorea Obsolete, please use SouthKorea + \value RepublicOfKorea Obsolete, use \c SouthKorea instead \value Reunion \value Romania - \value RussianFederation same as Russia - \value Russia same as RussianFederation + \value RussianFederation + \value Russia \value Rwanda \value SaintBarthelemy \value SaintHelena @@ -707,6 +691,7 @@ \value SaintLucia \value SaintMartin \value SaintPierreAndMiquelon + \value SaintVincentAndGrenadines \value SaintVincentAndTheGrenadines \value Samoa \value SanMarino @@ -723,6 +708,7 @@ \value SolomonIslands \value Somalia \value SouthAfrica + \value SouthGeorgiaAndSouthSandwichIslands \value SouthGeorgiaAndTheSouthSandwichIslands \value SouthKorea \value SouthSudan @@ -730,19 +716,21 @@ \value SriLanka \value Sudan \value Suriname + \value SvalbardAndJanMayen \value SvalbardAndJanMayenIslands \value Swaziland \value Sweden \value Switzerland \value Syria - \value SyrianArabRepublic Obsolete, please use Syria + \value SyrianArabRepublic Obsolete, use \c Syria instead \value Taiwan \value Tajikistan \value Tanzania \value Thailand + \value TimorLeste \value Togo - \value TokelauCountry - \value Tokelau Obsolete, please use TokelauCountry + \value TokelauCountry Osbolete alias for \c TokelauTerritory + \value [since 6.2] TokelauTerritory \value Tonga \value TrinidadAndTobago \value TristanDaCunha @@ -750,31 +738,38 @@ \value Turkey \value Turkmenistan \value TurksAndCaicosIslands - \value TuvaluCountry - \value Tuvalu Obsolete, please use TuvaluCountry + \value TuvaluCountry Osbolete alias for \c TuvaluTerritory + \value [since 6.2] TuvaluTerritory \value Uganda \value Ukraine \value UnitedArabEmirates \value UnitedKingdom \value UnitedStates + \value UnitedStatesOutlyingIslands \value UnitedStatesMinorOutlyingIslands \value UnitedStatesVirginIslands \value Uruguay \value Uzbekistan \value Vanuatu + \value VaticanCity \value VaticanCityState \value Venezuela \value Vietnam + \value WallisAndFutuna \value WallisAndFutunaIslands \value WesternSahara - \value World Since Qt 5.12 + \value [since 5.12] World \value Yemen \value Zambia \value Zimbabwe - \omitvalue LastCountry + \omitvalue LastCountry Osbolete alias for \c LastTerritory + \omitvalue LastTerritory - \sa country(), countryToString() + \note Use the Territory alias for this enumeration where possible. + The Country enum shall be renamed to Territory at a later release. + + \sa territory(), territoryToString(), codeToTerritory(), territoryToCode() */ /*! @@ -784,148 +779,152 @@ \value AnyScript - \value AdlamScript Since Qt 5.7 - \value AhomScript Since Qt 5.7 - \value AnatolianHieroglyphsScript Since Qt 5.7 + \value [since 5.7] AdlamScript + \value [since 5.7] AhomScript + \value [since 5.7] AnatolianHieroglyphsScript \value ArabicScript \value ArmenianScript - \value AvestanScript Since Qt 5.1 - \value BalineseScript Since Qt 5.1 - \value BamumScript Since Qt 5.1 - \value BassaVahScript Since Qt 5.5 - \value BatakScript Since Qt 5.1 - \value BengaliScript - \value BhaiksukiScript Since Qt 5.7 - \value BopomofoScript Since Qt 5.1 - \value BrahmiScript Since Qt 5.1 - \value BrailleScript Since Qt 5.1 - \value BugineseScript Since Qt 5.1 - \value BuhidScript Since Qt 5.1 - \value CanadianAboriginalScript Since Qt 5.1 - \value CarianScript Since Qt 5.1 - \value CaucasianAlbanianScript Since Qt 5.5 - \value ChakmaScript Since Qt 5.1 - \value ChamScript Since Qt 5.1 + \value [since 5.1] AvestanScript + \value [since 5.1] BalineseScript + \value [since 5.1] BamumScript + \value [since 6.0] BanglaScript + \value [since 5.5] BassaVahScript + \value [since 5.1] BatakScript + \value BengaliScript Obsolete, please use BanglaScript + \value [since 5.7] BhaiksukiScript + \value [since 5.1] BopomofoScript + \value [since 5.1] BrahmiScript + \value [since 5.1] BrailleScript + \value [since 5.1] BugineseScript + \value [since 5.1] BuhidScript + \value [since 5.1] CanadianAboriginalScript + \value [since 5.1] CarianScript + \value [since 5.5] CaucasianAlbanianScript + \value [since 5.1] ChakmaScript + \value [since 5.1] ChamScript \value CherokeeScript - \value CopticScript Since Qt 5.1 - \value CuneiformScript Since Qt 5.1 - \value CypriotScript Since Qt 5.1 + \value [since 5.1] CopticScript + \value [since 5.1] CuneiformScript + \value [since 5.1] CypriotScript \value CyrillicScript - \value DeseretScript Since Qt 5.1 + \value [since 5.1] DeseretScript \value DevanagariScript - \value DuployanScript Since Qt 5.5 - \value EgyptianHieroglyphsScript Since Qt 5.1 - \value ElbasanScript Since Qt 5.5 + \value [since 5.5] DuployanScript + \value [since 5.1] EgyptianHieroglyphsScript + \value [since 5.5] ElbasanScript \value EthiopicScript - \value FraserScript Since Qt 5.1 + \value [since 5.1] FraserScript \value GeorgianScript - \value GlagoliticScript Since Qt 5.1 - \value GothicScript Since Qt 5.1 - \value GranthaScript Since Qt 5.5 + \value [since 5.1] GlagoliticScript + \value [since 5.1] GothicScript + \value [since 5.5] GranthaScript \value GreekScript \value GujaratiScript \value GurmukhiScript - \value HangulScript Since Qt 5.1 - \value HanScript Since Qt 5.1 - \value HanunooScript Since Qt 5.1 - \value HanWithBopomofoScript Since Qt 5.7 - \value HatranScript Since Qt 5.7 + \value [since 5.1] HangulScript + \value [since 6.6] HanifiScript + \value [since 5.1] HanScript + \value [since 5.1] HanunooScript + \value [since 5.7] HanWithBopomofoScript + \value [since 5.7] HatranScript \value HebrewScript - \value HiraganaScript Since Qt 5.1 - \value ImperialAramaicScript Since Qt 5.1 - \value InscriptionalPahlaviScript Since Qt 5.1 - \value InscriptionalParthianScript Since Qt 5.1 - \value JamoScript Since Qt 5.7 + \value [since 5.1] HiraganaScript + \value [since 5.1] ImperialAramaicScript + \value [since 5.1] InscriptionalPahlaviScript + \value [since 5.1] InscriptionalParthianScript + \value [since 5.7] JamoScript \value JapaneseScript - \value JavaneseScript Since Qt 5.1 - \value KaithiScript Since Qt 5.1 + \value [since 5.1] JavaneseScript + \value [since 5.1] KaithiScript \value KannadaScript - \value KatakanaScript Since Qt 5.1 - \value KayahLiScript Since Qt 5.1 - \value KharoshthiScript Since Qt 5.1 - \value KhmerScript Since Qt 5.1 - \value KhojkiScript Since Qt 5.5 - \value KhudawadiScript Since Qt 5.5 + \value [since 5.1] KatakanaScript + \value [since 5.1] KayahLiScript + \value [since 5.1] KharoshthiScript + \value [since 5.1] KhmerScript + \value [since 5.5] KhojkiScript + \value [since 5.5] KhudawadiScript \value KoreanScript - \value LannaScript Since Qt 5.1 + \value [since 5.1] LannaScript \value LaoScript \value LatinScript - \value LepchaScript Since Qt 5.1 - \value LimbuScript Since Qt 5.1 - \value LinearAScript Since Qt 5.5 - \value LinearBScript Since Qt 5.1 - \value LycianScript Since Qt 5.1 - \value LydianScript Since Qt 5.1 - \value MahajaniScript Since Qt 5.5 + \value [since 5.1] LepchaScript + \value [since 5.1] LimbuScript + \value [since 5.5] LinearAScript + \value [since 5.1] LinearBScript + \value [since 5.1] LycianScript + \value [since 5.1] LydianScript + \value [since 5.5] MahajaniScript \value MalayalamScript - \value MandaeanScript Since Qt 5.1 - \value ManichaeanScript Since Qt 5.5 - \value MarchenScript Since Qt 5.7 - \value MeiteiMayekScript Since Qt 5.1 - \value MendeKikakuiScript Since Qt 5.5 - \value MeroiticCursiveScript Since Qt 5.1 - \value MeroiticScript Since Qt 5.1 - \value ModiScript Since Qt 5.5 + \value [since 5.1] MandaeanScript + \value [since 5.5] ManichaeanScript + \value [since 5.7] MarchenScript + \value [since 5.1] MeiteiMayekScript + \value [since 6.0] MendeScript + \value MendeKikakuiScript Obsolete, please use MendeScript + \value [since 5.1] MeroiticCursiveScript + \value [since 5.1] MeroiticScript + \value [since 5.5] ModiScript \value MongolianScript - \value MroScript Since Qt 5.5 - \value MultaniScript Since Qt 5.7 + \value [since 5.5] MroScript + \value [since 5.7] MultaniScript \value MyanmarScript - \value NabataeanScript Since Qt 5.5 - \value NewaScript Since Qt 5.7 - \value NewTaiLueScript Since Qt 5.1 - \value NkoScript Since Qt 5.1 - \value OghamScript Since Qt 5.1 - \value OlChikiScript Since Qt 5.1 - \value OldHungarianScript Since Qt 5.7 - \value OldItalicScript Since Qt 5.1 - \value OldNorthArabianScript Since Qt 5.5 - \value OldPermicScript Since Qt 5.5 - \value OldPersianScript Since Qt 5.1 - \value OldSouthArabianScript Since Qt 5.1 - \value OriyaScript - \value OrkhonScript Since Qt 5.1 - \value OsageScript Since Qt 5.7 - \value OsmanyaScript Since Qt 5.1 - \value PahawhHmongScript Since Qt 5.5 - \value PalmyreneScript Since Qt 5.5 - \value PauCinHauScript Since Qt 5.5 - \value PhagsPaScript Since Qt 5.1 - \value PhoenicianScript Since Qt 5.1 - \value PollardPhoneticScript Since Qt 5.1 - \value PsalterPahlaviScript Since Qt 5.5 - \value RejangScript Since Qt 5.1 - \value RunicScript Since Qt 5.1 - \value SamaritanScript Since Qt 5.1 - \value SaurashtraScript Since Qt 5.1 - \value SharadaScript Since Qt 5.1 - \value ShavianScript Since Qt 5.1 - \value SiddhamScript Since Qt 5.5 - \value SignWritingScript Since Qt 5.7 + \value [since 5.5] NabataeanScript + \value [since 5.7] NewaScript + \value [since 5.1] NewTaiLueScript + \value [since 5.1] NkoScript + \value [since 5.1] OghamScript + \value [since 5.1] OlChikiScript + \value [since 5.7] OldHungarianScript + \value [since 5.1] OldItalicScript + \value [since 5.5] OldNorthArabianScript + \value [since 5.5] OldPermicScript + \value [since 5.1] OldPersianScript + \value [since 5.1] OldSouthArabianScript + \value [since 6.0] OdiaScript + \value OriyaScript Obsolete, please use OdiaScript + \value [since 5.1] OrkhonScript + \value [since 5.7] OsageScript + \value [since 5.1] OsmanyaScript + \value [since 5.5] PahawhHmongScript + \value [since 5.5] PalmyreneScript + \value [since 5.5] PauCinHauScript + \value [since 5.1] PhagsPaScript + \value [since 5.1] PhoenicianScript + \value [since 5.1] PollardPhoneticScript + \value [since 5.5] PsalterPahlaviScript + \value [since 5.1] RejangScript + \value [since 5.1] RunicScript + \value [since 5.1] SamaritanScript + \value [since 5.1] SaurashtraScript + \value [since 5.1] SharadaScript + \value [since 5.1] ShavianScript + \value [since 5.5] SiddhamScript + \value [since 5.7] SignWritingScript \value SimplifiedChineseScript same as SimplifiedHanScript \value SimplifiedHanScript same as SimplifiedChineseScript \value SinhalaScript - \value SoraSompengScript Since Qt 5.1 - \value SundaneseScript Since Qt 5.1 - \value SylotiNagriScript Since Qt 5.1 + \value [since 5.1] SoraSompengScript + \value [since 5.1] SundaneseScript + \value [since 5.1] SylotiNagriScript \value SyriacScript - \value TagalogScript Since Qt 5.1 - \value TagbanwaScript Since Qt 5.1 - \value TaiLeScript Since Qt 5.1 - \value TaiVietScript Since Qt 5.1 - \value TakriScript Since Qt 5.1 + \value [since 5.1] TagalogScript + \value [since 5.1] TagbanwaScript + \value [since 5.1] TaiLeScript + \value [since 5.1] TaiVietScript + \value [since 5.1] TakriScript \value TamilScript - \value TangutScript Since Qt 5.7 + \value [since 5.7] TangutScript \value TeluguScript \value ThaanaScript \value ThaiScript \value TibetanScript \value TifinaghScript - \value TirhutaScript Since Qt 5.5 + \value [since 5.5] TirhutaScript \value TraditionalChineseScript same as TraditionalHanScript \value TraditionalHanScript same as TraditionalChineseScript - \value UgariticScript Since Qt 5.1 + \value [since 5.1] UgariticScript \value VaiScript - \value VarangKshitiScript Since Qt 5.5 + \value [since 5.5] VarangKshitiScript \value YiScript \omitvalue LastScript @@ -990,23 +989,23 @@ dot when parsing a number in scientific or decimal representation. The default is to accept trailing zeroes. - \sa setNumberOptions(), numberOptions() + \sa setNumberOptions(), numberOptions(), FloatingPointPrecisionOption */ /*! \enum QLocale::FloatingPointPrecisionOption - This enum defines constants that can be given as precision to QString::number(), + This enum defines a constant that can be given as precision to QString::number(), QByteArray::number(), and QLocale::toString() when converting floats or doubles, in order to express a variable number of digits as precision. \value FloatingPointShortest The conversion algorithm will try to find the - shortest accurate representation for the given number. "Accurate" means - that you get the exact same number back from an inverse conversion on - the generated string representation. - - \sa toString(), QString, QByteArray + shortest accurate representation for the given number. "Accurate" means + that you get the exact same number back from an inverse conversion on + the generated string representation. In particular, trailing zeros are + omitted (from the mantissa, in exponent formats). + \sa toString(), QString::number(), QByteArray::number() \since 5.7 */ @@ -1026,19 +1025,50 @@ \since 4.4 */ +/*! + \enum QLocale::LanguageCodeType + + This enum defines language code types that can be used to restrict set + of language codes considered by \c codeToLanguage and \c languageToCode. + + \value ISO639Part1 ISO 639 Part 1 Alpha 2 code. + \value ISO639Part2B ISO 639 Part 2 bibliographic Alpha 3 code. + \value ISO639Part2T ISO 639 Part 2 terminological Alpha 3 code. + \value ISO639Part3 ISO 639 Part 3 Alpha 3 code. + \value LegacyLanguageCode Codes that are not part of the above set, but that + were supported by Qt in the past. This value can only be used by + codeToLanguage(). It is ignored when passed to languageToCode(). + \value ISO639Part2 Any ISO 639 Part 2 code. + \value ISO639Alpha2 Any ISO-639 2-letter code. + \value ISO639Alpha3 Any ISO-639 3-letter code. + \value ISO639 Any ISO 639 code. + \value AnyLanguageCode Specifies that any code can be used. +*/ /*! - \fn bool QLocale::operator==(const QLocale &other) const + \fn bool QLocale::operator==(const QLocale &lhs, const QLocale &rhs) + + Returns \c true if the two QLocale objects, \a lhs and \a rhs, are the same; + otherwise returns \c false. - Returns \c true if the QLocale object is the same as the \a other - locale specified; otherwise returns \c false. + \note The system locale is not equal to the QLocale object constructed from + its language(), script() and territory(), even if the two agree in all data + fields. Nor are two locales with different number options equal. + + \sa operator!=(), setNumberOptions() */ /*! - \fn bool QLocale::operator!=(const QLocale &other) const + \fn bool QLocale::operator!=(const QLocale &lhs, const QLocale &rhs) + + Returns \c true if the two QLocale objects, \a lhs and \a rhs, differ; + otherwise returns \c false. + + \note The system locale is not equal to the QLocale object constructed from + its language(), script() and territory(), even if the two agree in all data + fields. Nor are two locales with different number options equal. - Returns \c true if the QLocale object is not the same as the \a other - locale specified; otherwise returns \c false. + \sa operator==(), setNumberOptions() */ /*! @@ -1083,7 +1113,7 @@ \value LanguageId a uint specifying the language. \value ScriptId a uint specifying the script. - \value CountryId a uint specifying the country. + \value TerritoryId a uint specifying the territory. \value DecimalPoint a QString specifying the decimal point. \value GroupSeparator a QString specifying the group separator. \value ZeroDigit a QString specifying the zero digit. @@ -1108,7 +1138,7 @@ \value MeasurementSystem a QLocale::MeasurementSystem enum specifying the measurement system \value AMText a string that represents the system AM designator associated with a 12-hour clock. \value PMText a string that represents the system PM designator associated with a 12-hour clock. - \value FirstDayOfWeek a Qt::DayOfWeek enum specifiying the first day of the week + \value FirstDayOfWeek a Qt::DayOfWeek enum specifying the first day of the week \value CurrencySymbol a string that represents a currency in a format QLocale::CurrencyFormat. \value CurrencyToString a localized string representation of a number with a currency symbol. Converts a QSystemLocale::CurrencyToStringArgument stored in the in variant to a QString. \value UILanguages a list of strings representing locale names that could be used for UI translation. @@ -1118,20 +1148,13 @@ \value LocaleChanged this type is queried whenever the system locale is changed. \value ListToSeparatedString a string that represents a join of a given QStringList with a locale-defined separator. \value NativeLanguageName a string that represents the name of the native language. - \value NativeCountryName a string that represents the name of the native country. + \value NativeTerritoryName a string that represents the name of the native territory. \sa FormatType */ /*! - \fn QLocale QSystemLocale::fallbackUiLocale() const - - \since 4.6 - Returns the fallback locale obtained from the system. -*/ - -/*! - \fn QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const + \fn QVariant QSystemLocale::query(QueryType type, QVariant &&in = QVariant()) const Generic query method for locale data. Provides indirection. Denotes the \a type of the query @@ -1141,6 +1164,17 @@ */ /*! + \fn QLocale QSystemLocale::fallbackLocale() const + + \since 4.6 + + Returns the locale used if the system locale is not able to answer a query. + + Must be a QLocale instance based on the built-in CLDR data, and should + match what the system locale is using as closely as that data supports. +*/ + +/*! \class QSystemLocale::CurrencyToStringArgument \inmodule QtCore @@ -1159,7 +1193,7 @@ \variable QSystemLocale::CurrencyToStringArgument::value An input value that should be converted to its string representation. - Contains one of QVariant::LongLong, QVariant::ULongLong or QVariant::Double + Contains one of QMetaType::LongLong, QMetaType::ULongLong or QMetaType::Double types. */ /*! @@ -1235,13 +1269,17 @@ */ /*! -\fn QString QLocale::toString(float i, char f = 'g', int prec = 6) const - +\fn QString QLocale::toString(float f, char format = 'g', int precision = 6) const \overload -\a f and \a prec have the same meaning as in QString::number(double, char, int). +Returns a string representing the floating-point number \a f. -\sa toDouble() +The \a format and \a precision have the same meanings as described in \l +{toString(double, char, int)}. + +\sa toFloat(), toDouble(), numberOptions(), exponential(), decimalPoint(), zeroDigit(), + positiveSign(), percent(), toCurrencyString(), formattedDataSize(), + QLocale::FloatingPointPrecisionOption */ /*! @@ -1267,8 +1305,3 @@ \since 4.8 \overload */ -/*! - \fn QString QLocale::toCurrencyString(float value, const QString &symbol) const - \since 4.8 - \overload -*/ |