diff --git a/ApplicationLibCode/FileInterface/RifColorLegendData.cpp b/ApplicationLibCode/FileInterface/RifColorLegendData.cpp index 6e3d4d24aa..4713c43bd8 100644 --- a/ApplicationLibCode/FileInterface/RifColorLegendData.cpp +++ b/ApplicationLibCode/FileInterface/RifColorLegendData.cpp @@ -88,7 +88,7 @@ cvf::ref RifColorLegendData::readLyrFormationNameFile( const // extract last word which may contain formation color QString colorWord = RiaTextStringTools::splitSkipEmptyParts( numberString ).last(); - if ( QColor::isValidColor( colorWord ) ) numberString.remove( colorWord ); // remove color if present as last word on line + if ( QColor::isValidColorName( colorWord ) ) numberString.remove( colorWord ); // remove color if present as last word on line // extract words containing formation number(s) QStringList numberWords = RiaTextStringTools::splitSkipEmptyParts( numberString, QRegExp( "-" ) ); @@ -110,7 +110,7 @@ cvf::ref RifColorLegendData::readLyrFormationNameFile( const startK = tmp < endK ? tmp : endK; endK = tmp > endK ? tmp : endK; - if ( QColor::isValidColor( colorWord ) ) // formation color present at end of line + if ( QColor::isValidColorName( colorWord ) ) // formation color present at end of line { cvf::Color3f formationColor; @@ -133,7 +133,7 @@ cvf::ref RifColorLegendData::readLyrFormationNameFile( const continue; } - if ( QColor::isValidColor( colorWord ) ) // formation color present at end of line + if ( QColor::isValidColorName( colorWord ) ) // formation color present at end of line { cvf::Color3f formationColor; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp index 3648b65dab..08aa84b5ae 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafIconProvider.cpp @@ -162,7 +162,7 @@ std::unique_ptr IconProvider::icon( const QSize& size ) const bool validIcon = false; if ( !m_backgroundColorStrings.empty() ) { - if ( m_backgroundColorStrings.size() == 1u && QColor::isValidColor( m_backgroundColorStrings.front() ) ) + if ( m_backgroundColorStrings.size() == 1u && QColor::isValidColorName( m_backgroundColorStrings.front() ) ) { pixmap.fill( QColor( m_backgroundColorStrings.front() ) ); validIcon = true; @@ -176,7 +176,7 @@ std::unique_ptr IconProvider::icon( const QSize& size ) const QLinearGradient gradient( QPointF( 0.0f, 0.0f ), QPoint( size.width(), 0.0f ) ); for ( size_t i = 0; i < m_backgroundColorStrings.size(); ++i ) { - if ( !QColor::isValidColor( m_backgroundColorStrings[i] ) ) + if ( !QColor::isValidColorName( m_backgroundColorStrings[i] ) ) { validIcon = false; break; @@ -303,7 +303,7 @@ bool IconProvider::backgroundColorsAreValid() const bool validBackgroundColors = true; for ( QString colorName : m_backgroundColorStrings ) { - if ( !QColor::isValidColor( colorName ) ) + if ( !QColor::isValidColorName( colorName ) ) { validBackgroundColors = false; break;