use qint16 where applicable

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/scripts/genmap.py b/scripts/genmap.py
index 258e73b..887a4f2 100755 (executable)
--- a/scripts/genmap.py
+++ b/scripts/genmap.py
@@ -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:

diff --git a/src/core/tools/qlocale.cpp b/src/core/tools/qlocale.cpp
index d0ea374..92d791f 100644 (file)
--- a/src/core/tools/qlocale.cpp
+++ b/src/core/tools/qlocale.cpp
@@ -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
 

diff --git a/src/shared/qclass_lib_map.h b/src/shared/qclass_lib_map.h
index d73c351..1918436 100644 (file)
--- a/src/shared/qclass_lib_map.h
+++ b/src/shared/qclass_lib_map.h
@@ -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

diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index c45cc36..40cea7d 100644 (file)
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -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);