applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-26 08:58:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix -Wnarrowing warnings in KDSingleApplicationGuard

Browse source
This commit is contained in:
Teo Mrnjavac 2014-06-19 11:13:02 +02:00
parent 3dd9578b95
commit ab5c818f4f
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libcalamares/kdsingleapplicationguard/kdtoolsglobal.cpp
View file

@ -21,12 +21,16 @@ namespace {
static Version kdParseQtVersion( const char * const version ) { static Version kdParseQtVersion( const char * const version ) {
if ( !version || qstrlen( version ) < 5 || version[1] != '.' || version[3] != '.' || ( version[5] != 0 && version[5] != '.' && version[5] != '-' ) ) if ( !version || qstrlen( version ) < 5 || version[1] != '.' || version[3] != '.' || ( version[5] != 0 && version[5] != '.' && version[5] != '-' ) )
return Version(); // parse error return Version(); // parse error
const Version result = { { version[0] - '0', version[2] - '0', version[4] - '0' } }; const Version result = { { static_cast< unsigned char >( version[0] - '0' ),
static_cast< unsigned char >( version[2] - '0' ),
static_cast< unsigned char >( version[4] - '0' ) } };
return result; return result;
} }
bool _kdCheckQtVersion_impl( int major, int minor, int patchlevel ) { bool _kdCheckQtVersion_impl( int major, int minor, int patchlevel ) {
static const Version actual = kdParseQtVersion( qVersion() ); // do this only once each run... static const Version actual = kdParseQtVersion( qVersion() ); // do this only once each run...
const Version requested = { { major, minor, patchlevel } }; const Version requested = { { static_cast< unsigned char >( major ),
static_cast< unsigned char >( minor ),
static_cast< unsigned char >( patchlevel ) } };
return actual >= requested; return actual >= requested;
} }