168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pedantic compiler flags fixed

This commit is contained in:
Uwe Rathmann 2023-04-04 09:27:02 +02:00
parent 658bc71891
commit 084eae3dbc
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/QskMetaInvokable.cpp
View File

@ -152,7 +152,7 @@ QMetaMethod qskNotifySignal( const QMetaObject* metaObject, const char* property
static void qskInvokeMetaCall( static void qskInvokeMetaCall(
QObject* object, const QMetaObject* metaObject, QObject* object, const QMetaObject* metaObject,
QMetaObject::Call call, int offset, int index, void* argv[], QMetaObject::Call call, ushort offset, ushort index, void* argv[],
Qt::ConnectionType connectionType ) Qt::ConnectionType connectionType )
{ {
QPointer< QObject > receiver( object ); QPointer< QObject > receiver( object );
@ -196,6 +196,7 @@ static void qskInvokeMetaCall(
QSemaphore semaphore; QSemaphore semaphore;
Q_ASSERT( metaObject == nullptr || receiver->metaObject() == metaObject );
qskInvokeMetaCallQueued( receiver, call, qskInvokeMetaCallQueued( receiver, call,
offset, index, argv, &semaphore ); offset, index, argv, &semaphore );
@ -256,6 +257,7 @@ static void qskInvokeMetaCall(
return; return;
} }
Q_ASSERT( metaObject == nullptr || receiver->metaObject() == metaObject );
qskInvokeMetaCallQueued( object, call, offset, index, arguments, nullptr ); qskInvokeMetaCallQueued( object, call, offset, index, arguments, nullptr );
break; break;

2
src/controls/QskPopup.cpp
View File

@ -382,7 +382,7 @@ bool QskPopup::hasFaderEffect() const
void QskPopup::setPopupFlags( PopupFlags flags ) void QskPopup::setPopupFlags( PopupFlags flags )
{ {
const auto newFlags = static_cast< int >( m_data->flags ); const auto newFlags = static_cast< int >( flags );
if ( newFlags != m_data->flags ) if ( newFlags != m_data->flags )
{ {

6
src/controls/QskSkinManager.cpp
View File

@ -234,11 +234,11 @@ namespace
void removeFactory( const QString& factoryId ) void removeFactory( const QString& factoryId )
{ {
const auto it = m_factoryMap.find( factoryId ); const auto itFactory = m_factoryMap.find( factoryId );
if ( it == m_factoryMap.end() ) if ( itFactory == m_factoryMap.end() )
return; return;
m_factoryMap.erase( it ); m_factoryMap.erase( itFactory );
if ( m_isValid ) if ( m_isValid )
{ {

24
src/controls/QskSkinnable.cpp
View File

@ -753,10 +753,12 @@ QskColorFilter QskSkinnable::effectiveGraphicFilter(
aspect.setSection( QskAspect::Body ); aspect.setSection( QskAspect::Body );
aspect.setVariation( QskAspect::NoVariation ); aspect.setVariation( QskAspect::NoVariation );
const auto v = animatedHint( aspect, nullptr ); {
const auto v = animatedHint( aspect, nullptr );
if ( v.canConvert< QskColorFilter >() ) if ( v.canConvert< QskColorFilter >() )
return v.value< QskColorFilter >(); return v.value< QskColorFilter >();
}
if ( auto control = owningControl() ) if ( auto control = owningControl() )
{ {
@ -816,16 +818,18 @@ QskAnimationHint QskSkinnable::effectiveAnimation(
QskAnimationHint hint; QskAnimationHint hint;
const auto a = m_data->hintTable.resolvedAnimator( aspect, hint );
if ( a.isAnimator() )
{ {
if ( status ) const auto a = m_data->hintTable.resolvedAnimator( aspect, hint );
if ( a.isAnimator() )
{ {
status->source = QskSkinHintStatus::Skinnable; if ( status )
status->aspect = a; {
} status->source = QskSkinHintStatus::Skinnable;
status->aspect = a;
}
return hint; return hint;
}
} }
if ( auto skin = effectiveSkin() ) if ( auto skin = effectiveSkin() )