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

QT_STRICT_ITERATORS enabled for gcc

Browse Source
This commit is contained in:
Uwe Rathmann 2017-10-29 14:01:06 +01:00
parent f04d789233
commit 324ed2f80c
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qskconfig.pri
View File

@ -55,6 +55,7 @@ linux-g++ | linux-g++-64 {
} }
} }
DEFINES += QT_STRICT_ITERATORS
# --- optional debug options # --- optional debug options

2
src/controls/QskShortcut.cpp
View File

@ -103,7 +103,7 @@ bool QskShortcutHandler::event( QEvent* event )
{ {
const QShortcutEvent* se = static_cast< const QShortcutEvent* >( event ); const QShortcutEvent* se = static_cast< const QShortcutEvent* >( event );
const auto it = m_invokeDataMap.find( se->shortcutId() ); const auto it = m_invokeDataMap.constFind( se->shortcutId() );
if ( it != m_invokeDataMap.constEnd() ) if ( it != m_invokeDataMap.constEnd() )
{ {
const InvokeData& data = ( *it ); const InvokeData& data = ( *it );

2
src/controls/QskStatusIndicator.cpp
View File

@ -229,7 +229,7 @@ void QskStatusIndicator::setStatus( int status )
if ( status == m_data->currentStatus ) if ( status == m_data->currentStatus )
return; return;
const auto it = m_data->map.find( status ); const auto it = m_data->map.constFind( status );
if ( it == m_data->map.constEnd() ) if ( it == m_data->map.constEnd() )
{ {
qWarning() << "QskStatusIndicator: invalid status:" << status; qWarning() << "QskStatusIndicator: invalid status:" << status;

6
src/graphic/QskGraphicProviderMap.cpp
View File

@ -50,7 +50,7 @@ void QskGraphicProviderMap::insert(
void QskGraphicProviderMap::remove( const QString& providerId ) void QskGraphicProviderMap::remove( const QString& providerId )
{ {
const auto it = m_data->hashTab.find( qskKey( providerId ) ); const auto it = m_data->hashTab.find( qskKey( providerId ) );
if ( it == m_data->hashTab.constEnd() ) if ( it == m_data->hashTab.end() )
delete it.value(); delete it.value();
m_data->hashTab.erase( it ); m_data->hashTab.erase( it );
@ -61,7 +61,7 @@ QskGraphicProvider* QskGraphicProviderMap::take( const QString& providerId )
QskGraphicProvider* provider = nullptr; QskGraphicProvider* provider = nullptr;
const auto it = m_data->hashTab.find( qskKey( providerId ) ); const auto it = m_data->hashTab.find( qskKey( providerId ) );
if ( it == m_data->hashTab.constEnd() ) if ( it == m_data->hashTab.end() )
provider = it.value(); provider = it.value();
m_data->hashTab.erase( it ); m_data->hashTab.erase( it );
@ -72,7 +72,7 @@ QskGraphicProvider* QskGraphicProviderMap::take( const QString& providerId )
QskGraphicProvider* QskGraphicProviderMap::provider( const QString& providerId ) const QskGraphicProvider* QskGraphicProviderMap::provider( const QString& providerId ) const
{ {
const auto it = m_data->hashTab.find( qskKey( providerId ) ); const auto it = m_data->hashTab.find( qskKey( providerId ) );
if ( it == m_data->hashTab.constEnd() ) if ( it == m_data->hashTab.end() )
return nullptr; return nullptr;
if ( it.value().isNull() ) if ( it.value().isNull() )