1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-02 20:28:14 +02:00

Add explicit narrowing cast for C++11 support

This reflects the existing behaviour but in C++11 the implicit cast is
no longer allowed.
This commit is contained in:
Uwe L. Korn
2014-09-14 20:16:41 +01:00
parent e614f2ae42
commit 6afbdaef25

View File

@@ -21,12 +21,12 @@ 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;
} }