1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark QLocale's Language, Country and Script enums as ushort

Browse Source 
The code pervasively presumes their values can be held in a ushort, so
make sure the compiler knows we expect that to work (and doesn't
complain about narrowing when we do convert them to ushort).

Change-Id: Idde7be6cceee8a6dae333c5b1d5a0120fec32e4a
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2020-10-09 12:26:19 +02:00
parent 71ad83529e
commit 8b0e068847
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/text/qlocale.h
View File

@ -74,7 +74,7 @@ class Q_CORE_EXPORT QLocale
public: public:
// see qlocale_data_p.h for more info on generated data // see qlocale_data_p.h for more info on generated data
// GENERATED PART STARTS HERE // GENERATED PART STARTS HERE
enum Language { enum Language : ushort {
AnyLanguage = 0, AnyLanguage = 0,
C = 1, C = 1,
Abkhazian = 2, Abkhazian = 2,
@ -464,7 +464,7 @@ public:
LastLanguage = Silesian LastLanguage = Silesian
}; };
enum Script { enum Script : ushort {
AnyScript = 0, AnyScript = 0,
ArabicScript = 1, ArabicScript = 1,
CyrillicScript = 2, CyrillicScript = 2,
@ -614,7 +614,7 @@ public:
LastScript = JamoScript LastScript = JamoScript
}; };
enum Country { enum Country : ushort {
AnyCountry = 0, AnyCountry = 0,
Afghanistan = 1, Afghanistan = 1,
Albania = 2, Albania = 2,

2
util/locale_database/qlocalexml2cpp.py
View File

@ -468,7 +468,7 @@ class LocaleHeaderWriter (SourceFileEditor):
def __enum(self, name, book, alias): def __enum(self, name, book, alias):
assert book assert book
out, dupes = self.writer.write, self.__dupes out, dupes = self.writer.write, self.__dupes
out(' enum {} {{\n'.format(name)) out(' enum {} : ushort {{\n'.format(name))
for key, value in book.items(): for key, value in book.items():
member = value[0] member = value[0]
if name == 'Script': if name == 'Script':