OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor and rename QIconProvider -> IconProvider (#5893)

Browse Source 
* Refactor and rename QIconProvider -> IconProvider
* Generate icons on demand as unique_ptrs
This commit is contained in:
Gaute Lindkvist
2020-05-09 11:25:11 +02:00
committed by GitHub
parent b84e868564
commit 2e79cf614f
42 changed files with 383 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/FlowCommands/RicSelectViewUI.cpp
View File

@@ -104,8 +104,8 @@ QList<caf::PdmOptionItemInfo> RicSelectViewUI::calculateValueOptions( const caf:
{
for ( Rim3dView* v : m_currentCase->views() )
{
caf::QIconProvider iconProvider = v->uiCapability()->uiIconProvider();
QString displayName = v->name();
caf::IconProvider iconProvider = v->uiCapability()->uiIconProvider();
QString displayName = v->name();
options.push_back( caf::PdmOptionItemInfo( displayName, v, false, iconProvider ) );
}

7
ApplicationCode/Commands/ViewLink/RicCompareTo3dViewFeature.cpp
View File

@@ -65,10 +65,13 @@ void RicCompareTo3dViewFeature::setupActionLook( QAction* actionToSetup )
auto view = static_cast<Rim3dView*>( userData.value<void*>() );
if ( view )
{
actionToSetup->setIcon( view->uiIconProvider().icon() );
auto icon = view->uiIconProvider().icon();
if ( icon ) actionToSetup->setIcon( *icon );
}
else
{
actionToSetup->setIcon( QIcon( ":/ComparisonView16x16.png" ) );
caf::IconProvider iconProvider( ":/ComparisonView16x16.png" );
auto icon = iconProvider.icon();
if ( icon ) actionToSetup->setIcon( *icon );
}
}