diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-04-11 18:12:55 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-12 11:46:01 +0200 |
commit | 47ce14cf74d673aa3d12f055e42f5fd4acc6ba3a (patch) | |
tree | 7b3e37ab9b81eba119691d204350ebd85f462fb8 /src/plugins/platforminputcontexts | |
parent | 8c81b282f8e18897257b93cb3fc149d74441c40e (diff) |
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>
Diffstat (limited to 'src/plugins/platforminputcontexts')
-rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 8 | ||||
-rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 3c61a69480..8fa812eecb 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -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(); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h index 11e7b2b422..cc1db20432 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h @@ -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(); |