Skip to content
Permalink
Browse files

QChar(int) constructor is ambiguous

  • Loading branch information
m-kuhn authored and nyalldawson committed Mar 31, 2021
1 parent 52177cb commit a135aee0ab30e27b4b24d249de48d109bb9b07c0
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/core/auth/qgsauthmanager.cpp
  2. +2 −2 src/core/expression/qgsexpressionfunction.cpp
@@ -876,14 +876,14 @@ const QString QgsAuthManager::uniqueConfigId() const
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
id += ( '0' + qrand() % 10 );
#else
id += ( '0' + QRandomGenerator::system()->generate() % 10 );
id += static_cast<char>( '0' + QRandomGenerator::system()->generate() % 10 );
#endif
break;
case 1:
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
id += ( 'a' + qrand() % 26 );
#else
id += ( 'a' + QRandomGenerator::system()->generate() % 26 );
id += static_cast<char>( 'a' + QRandomGenerator::system()->generate() % 26 );
#endif
break;
}
@@ -669,7 +669,7 @@ static QVariant fcnAggregate( const QVariantList &values, const QgsExpressionCon
if ( !isStatic )
{
cacheKey = QStringLiteral( "aggfcn:%1:%2:%3:%4:%5%6:%7" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter,
QString::number( context->feature().id() ), QString( qHash( context->feature() ) ), orderBy );
QString::number( context->feature().id() ), QString::number( qHash( context->feature() ) ), orderBy );
}
else
{
@@ -914,7 +914,7 @@ static QVariant fcnAggregateGeneric( QgsAggregateCalculator::Aggregate aggregate
if ( !isStatic )
{
cacheKey = QStringLiteral( "agg:%1:%2:%3:%4:%5%6:%7" ).arg( vl->id(), QString::number( aggregate ), subExpression, parameters.filter,
QString::number( context->feature().id() ), QString( qHash( context->feature() ) ), orderBy );
QString::number( context->feature().id() ), QString::number( qHash( context->feature() ) ), orderBy );
}
else
{

0 comments on commit a135aee

Please sign in to comment.