whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/uint32_t/quint32/ 

uint32_t is in C++11, which we can not rely on being present. It is also
in C99, but some compilers do not support that in C++ mode.

Change-Id: I29bada724f5646a0a0562b3ab133cb49cf928d6d
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
bb10
Tobias Hunger 2013-04-11 18:12:55 +02:00 committed by The Qt Project
parent 8c81b282f8
commit 47ce14cf74
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
View File

@ -252,14 +252,14 @@ void TableGenerator::parseIncludeInstruction(QString line)
processFile(line);
}
ushort TableGenerator::keysymToUtf8(uint32_t sym)
ushort TableGenerator::keysymToUtf8(quint32 sym)
{
QByteArray chars;
int bytes;
chars.resize(8);
if (needWorkaround(sym)) {
uint32_t codepoint;
quint32 codepoint;
if (sym == XKB_KEY_KP_Space)
codepoint = XKB_KEY_space & 0x7f;
else
@ -284,9 +284,9 @@ ushort TableGenerator::keysymToUtf8(uint32_t sym)
return ch->unicode();
}
uint32_t TableGenerator::stringToKeysym(QString keysymName)
quint32 TableGenerator::stringToKeysym(QString keysymName)
{
uint32_t keysym;
quint32 keysym;
QByteArray keysymArray = keysymName.toLatin1();
const char *name = keysymArray.constData();

4
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h
View File

@ -109,8 +109,8 @@ protected:
bool findSystemComposeDir();
QString systemComposeDir();
ushort keysymToUtf8(uint32_t sym);
uint32_t stringToKeysym(QString keysymName);
ushort keysymToUtf8(quint32 sym);
quint32 stringToKeysym(QString keysymName);
void readLocaleMappings();
void initPossibleLocations();