From 68353e99d1cdaa1c57b101c0ff15a047fac71b02 Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Mon, 3 Apr 2023 13:12:13 -0400 Subject: [PATCH] Symbol Fields Table: more MSVC fixes --- eeschema/fields_data_model.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eeschema/fields_data_model.cpp b/eeschema/fields_data_model.cpp index 0251a644d8..459462d9b0 100644 --- a/eeschema/fields_data_model.cpp +++ b/eeschema/fields_data_model.cpp @@ -16,7 +16,7 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::AddColumn( const wxString& aFieldName, const if( GetFieldNameCol( aFieldName ) != -1 ) return; - m_cols.push_back( ( struct DATA_MODEL_COL ){ aFieldName, aLabel, aAddedByUser, false, false } ); + m_cols.push_back( { aFieldName, aLabel, aAddedByUser, false, false } ); for( unsigned i = 0; i < m_symbolsList.GetCount(); ++i ) { @@ -80,8 +80,7 @@ const std::vector FIELDS_EDITOR_GRID_DATA_MODEL::GetFieldsOrdered() std::vector fields; for( auto col : m_cols ) - fields.emplace_back( - ( struct BOM_FIELD ){ col.m_fieldName, col.m_label, col.m_show, col.m_group } ); + fields.push_back( { col.m_fieldName, col.m_label, col.m_show, col.m_group } ); return fields; } @@ -691,7 +690,7 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::Export( const BOM_FMT_PRESET& settings ) settings.stringDelimiter + settings.stringDelimiter ); return settings.stringDelimiter + field + settings.stringDelimiter - + wxString( last ? wxS( "\r\n" ) : settings.fieldDelimiter ); + + ( last ? wxString( wxS( "\r\n" ) ) : settings.fieldDelimiter ); }; // Column names