"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp" between
QGIS-final-3_10_5.tar.gz and QGIS-final-3_10_6.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgsvaluemapconfigdlg.cpp  (QGIS-final-3_10_5):qgsvaluemapconfigdlg.cpp  (QGIS-final-3_10_6)
skipping to change at line 182 skipping to change at line 182
setRow( row, QgsValueMapFieldFormatter::NULL_VALUE, QStringLiteral( "<NULL>" ) ); setRow( row, QgsValueMapFieldFormatter::NULL_VALUE, QStringLiteral( "<NULL>" ) );
++row; ++row;
} }
for ( const auto &pair : qgis::as_const( list ) ) for ( const auto &pair : qgis::as_const( list ) )
{ {
if ( pair.second.isNull() ) if ( pair.second.isNull() )
setRow( row, pair.first, QString() ); setRow( row, pair.first, QString() );
else else
setRow( row, pair.first, pair.second.toString() ); setRow( row, pair.first, pair.second.toString() );
++row;
} }
} }
void QgsValueMapConfigDlg::populateComboBox( QComboBox *comboBox, const QVariant Map &config, bool skipNull ) void QgsValueMapConfigDlg::populateComboBox( QComboBox *comboBox, const QVariant Map &config, bool skipNull )
{ {
const QList<QVariant> valueList = config.value( QStringLiteral( "map" ) ).toLi st(); const QList<QVariant> valueList = config.value( QStringLiteral( "map" ) ).toLi st();
if ( !valueList.empty() ) if ( !valueList.empty() )
{ {
for ( const QVariant &value : valueList ) for ( const QVariant &value : valueList )
skipping to change at line 323 skipping to change at line 324
QTextStream s( &f ); QTextStream s( &f );
s.setAutoDetectUnicode( true ); s.setAutoDetectUnicode( true );
QRegExp re0( "^([^;]*);(.*)$" ); QRegExp re0( "^([^;]*);(.*)$" );
re0.setMinimal( true ); re0.setMinimal( true );
QRegExp re1( "^([^,]*),(.*)$" ); QRegExp re1( "^([^,]*),(.*)$" );
re1.setMinimal( true ); re1.setMinimal( true );
QList<QPair<QString, QVariant>> map; QList<QPair<QString, QVariant>> map;
s.readLine();
while ( !s.atEnd() ) while ( !s.atEnd() )
{ {
QString l = s.readLine().trimmed(); QString l = s.readLine().trimmed();
QString key; QString key;
QString val; QString val;
if ( re0.indexIn( l ) >= 0 && re0.captureCount() == 2 ) if ( re0.indexIn( l ) >= 0 && re0.captureCount() == 2 )
{ {
key = re0.cap( 1 ).trimmed(); key = re0.cap( 1 ).trimmed();
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)