use qint16 where applicable

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-07-09 17:07:15 +00:00
parent 07d7e75c1c
commit eb724a167d
4 changed files with 4 additions and 4 deletions

View file

@ -49,7 +49,7 @@ for component in components:
mapdata += exportscan('src/%s' % component.lower(), pattern, 'Qt%s' % component)
mapdata += '};\n'
mapdata += 'static const int qclass_lib_count = %d;\n\n' % classcount
mapdata += 'static const qint16 qclass_lib_count = %d;\n\n' % classcount
mapdata += '#endif\n'
with open(mapoutput, 'wb') as f:

View file

@ -388,7 +388,7 @@ int qt_repeatCount(const QString &s, int i)
}
static const QLocalePrivate *default_lp = 0;
static uint default_number_options = 0;
static quint16 default_number_options = 0;
#ifndef QT_NO_SYSTEMLOCALE

View file

@ -692,6 +692,6 @@ static const ClassInfoEntry qclass_lib_map[] = {
{ "QFormBuilder", "QtUiTools/formbuilder.h"},
{ "QUiLoader", "QtUiTools/quiloader.h"},
};
static const int qclass_lib_count = 686;
static const qint16 qclass_lib_count = 686;
#endif

View file

@ -69,7 +69,7 @@ namespace CPP {
WriteIncludes::WriteIncludes(Uic *uic)
: m_uic(uic), m_output(uic->output()), m_scriptsActivated(false), m_laidOut(false)
{
for(int i = 0; i != qclass_lib_count; i++) {
for(qint16 i = 0; i != qclass_lib_count; i++) {
const QLatin1String klass = QLatin1String(qclass_lib_map[i].klass);
const QLatin1String header = QLatin1String(qclass_lib_map[i].header);
m_classToHeader.insert(klass, header);