Coverity tweaks.

common/design_block.h

@@ -48,12 +48,8 @@ public:
     const wxString& GetBoardFile() const { return m_boardFile; }
     void            SetBoardFile( const wxString& aFile ) { m_boardFile = aFile; }
 
-    void SetFields( nlohmann::ordered_map<wxString, wxString>& aFields )
-    {
-        m_fields = std::move( aFields );
-    }
-
     const nlohmann::ordered_map<wxString, wxString>& GetFields() const { return m_fields; }
+    nlohmann::ordered_map<wxString, wxString>& GetFields() { return m_fields; }
 
     DESIGN_BLOCK() = default;
 

common/design_block_io.cpp

@@ -325,8 +325,6 @@ DESIGN_BLOCK* DESIGN_BLOCK_IO::DesignBlockLoad( const wxString& aLibraryPath,
             if( dbMetadata.contains( "keywords" ) )
                 newDB->SetKeywords( dbMetadata["keywords"] );
 
-            nlohmann::ordered_map<wxString, wxString> fields;
-
             // Read the "fields" object from the JSON
             if( dbMetadata.contains( "fields" ) )
             {
@@ -335,10 +333,8 @@ DESIGN_BLOCK* DESIGN_BLOCK_IO::DesignBlockLoad( const wxString& aLibraryPath,
                     wxString name = wxString::FromUTF8( item.key() );
                     wxString value = wxString::FromUTF8( item.value().get<std::string>() );
 
-                    fields[name] = value;
+                    newDB->GetFields()[name] = value;
                 }
-
-                newDB->SetFields( fields );
             }
         }
         catch( ... )

common/dialogs/dialog_design_block_properties.cpp

@@ -194,7 +194,7 @@ bool DIALOG_DESIGN_BLOCK_PROPERTIES::TransferDataFromGrid()
     if( !m_fieldsGrid->CommitPendingChanges() )
         return false;
 
-    nlohmann::ordered_map<wxString, wxString> newFields;
+    m_designBlock->GetFields().clear();
 
     for( int row = 0; row < m_fieldsGrid->GetNumberRows(); row++ )
     {
@@ -202,17 +202,15 @@ bool DIALOG_DESIGN_BLOCK_PROPERTIES::TransferDataFromGrid()
         fieldName.Replace( wxT( "\n" ), wxT( "" ), true );  // strip all newlines
         fieldName.Replace( wxT( "  " ), wxT( " " ), true ); // double space to single
 
-        if( newFields.count( fieldName ) )
+        if( m_designBlock->GetFields().count( fieldName ) )
         {
             wxMessageBox( _( "Duplicate fields are not allowed." ) );
             return false;
         }
 
-        newFields[fieldName] = m_fieldsGrid->GetCellValue( row, 1 );
+        m_designBlock->GetFields()[fieldName] = m_fieldsGrid->GetCellValue( row, 1 );
     }
 
-    m_designBlock->SetFields( newFields );
-
     return true;
 }
 

cvpcb/dialogs/dialog_config_equfiles.cpp

@@ -194,10 +194,13 @@ void DIALOG_CONFIG_EQUFILES::OnRemoveFiles( wxCommandEvent& event )
     wxArrayInt selections;
     m_filesListBox->GetSelections( selections );
 
+    if( !selections.empty() )
+    {
         std::sort( selections.begin(), selections.end() );
 
-    for( int ii = selections.GetCount()-1; ii >= 0; ii-- )
+        for( int ii = (int) selections.GetCount() - 1; ii >= 0; ii-- )
             m_filesListBox->Delete( selections[ii] );
+    }
 }
 
 

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -1041,9 +1041,10 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnPageChanging( wxBookCtrlEvent& aEvent )
 void DIALOG_LIB_SYMBOL_PROPERTIES::OnBtnCreateJumperPinGroup( wxCommandEvent& aEvent )
 {
     wxArrayInt selections;
-    int n = m_listAvailablePins->GetSelections( selections );
+    m_listAvailablePins->GetSelections( selections );
-    wxCHECK( n > 0, /* void */ );
 
+    if( !selections.empty() )
+    {
         m_listJumperPinGroups->Freeze();
         m_listAvailablePins->Freeze();
 
@@ -1054,27 +1055,28 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnBtnCreateJumperPinGroup( wxCommandEvent& aE
         {
             group << m_listAvailablePins->GetString( idx );
 
-        if( ++i < n )
+            if( ++i < selections.Count() )
                 group << ", ";
         }
 
-    for( int idx = selections.size() - 1; idx >= 0; --idx )
+        for( int idx = (int) selections.size() - 1; idx >= 0; --idx )
             m_listAvailablePins->Delete( selections[idx] );
 
         m_listJumperPinGroups->AppendString( group );
 
         m_listJumperPinGroups->Thaw();
         m_listAvailablePins->Thaw();
+    }
 }
 
 
 void DIALOG_LIB_SYMBOL_PROPERTIES::OnBtnRemoveJumperPinGroup( wxCommandEvent& aEvent )
 {
     wxArrayInt selections;
+    m_listJumperPinGroups->GetSelections( selections );
 
-    if( m_listJumperPinGroups->GetSelections( selections ) <= 0 )
+    if( !selections.empty() )
-        return;
+    {
-
         m_listJumperPinGroups->Freeze();
         m_listAvailablePins->Freeze();
 
@@ -1089,11 +1091,12 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnBtnRemoveJumperPinGroup( wxCommandEvent& aE
             }
         }
 
-    for( int idx = selections.size() - 1; idx >= 0; --idx )
+        for( int idx = (int) selections.size() - 1; idx >= 0; --idx )
             m_listJumperPinGroups->Delete( selections[idx] );
 
         m_listJumperPinGroups->Thaw();
         m_listAvailablePins->Thaw();
+    }
 }
 
 

eeschema/sch_design_block_utils.cpp

@@ -98,19 +98,14 @@ bool SCH_EDIT_FRAME::SaveSheetAsDesignBlock( const wxString& aLibraryName, SCH_S
     blk.SetLibId( LIB_ID( aLibraryName, fn.GetName() ) );
 
     // Copy all fields from the sheet to the design block
-    std::vector<SCH_FIELD>&                   shFields = aSheetPath.Last()->GetFields();
+    for( SCH_FIELD& field : aSheetPath.Last()->GetFields() )
-    nlohmann::ordered_map<wxString, wxString> dbFields;
-
-    for( SCH_FIELD& f : shFields )
     {
-        if( f.GetId() == FIELD_T::SHEET_NAME || f.GetId() == FIELD_T::SHEET_FILENAME )
+        if( field.GetId() == FIELD_T::SHEET_NAME || field.GetId() == FIELD_T::SHEET_FILENAME )
             continue;
 
-        dbFields[f.GetCanonicalName()] = f.GetText();
+        blk.GetFields()[field.GetCanonicalName()] = field.GetText();
     }
 
-    blk.SetFields( dbFields );
-
     DIALOG_DESIGN_BLOCK_PROPERTIES dlg( this, &blk );
 
     if( dlg.ShowModal() != wxID_OK )
@@ -191,19 +186,14 @@ bool SCH_EDIT_FRAME::SaveSheetToDesignBlock( const LIB_ID& aLibId, SCH_SHEET_PAT
     // Copy all fields from the sheet to the design block.
     // Note: this will overwrite any existing fields in the design block, but
     // will leave extra fields not in this source sheet alone.
-    std::vector<SCH_FIELD>&                   shFields = aSheetPath.Last()->GetFields();
+    for( SCH_FIELD& field : aSheetPath.Last()->GetFields() )
-    nlohmann::ordered_map<wxString, wxString> dbFields = blk->GetFields();
-
-    for( SCH_FIELD& f : shFields )
     {
-        if( f.GetId() == FIELD_T::SHEET_NAME || f.GetId() == FIELD_T::SHEET_FILENAME )
+        if( field.GetId() == FIELD_T::SHEET_NAME || field.GetId() == FIELD_T::SHEET_FILENAME )
             continue;
 
-        dbFields[f.GetCanonicalName()] = f.GetText();
+        blk->GetFields()[field.GetCanonicalName()] = field.GetText();
     }
 
-    blk->SetFields( dbFields );
-
     DIALOG_DESIGN_BLOCK_PROPERTIES dlg( this, blk.get(), true );
 
     if( dlg.ShowModal() != wxID_OK )

eeschema/sync_sheet_pin/sheet_synchronization_model.cpp

@@ -39,11 +39,11 @@ extern wxString getElectricalTypeLabel( LABEL_FLAG_SHAPE aType );
 
 SHEET_SYNCHRONIZATION_MODEL::SHEET_SYNCHRONIZATION_MODEL( SHEET_SYNCHRONIZATION_AGENT& aAgent,
                                                           SCH_SHEET*                   aSheet,
-                                                          SCH_SHEET_PATH&              aPath ) :
+                                                          const SCH_SHEET_PATH&        aPath ) :
         m_selectedIndex( std::optional<unsigned>() ),
         m_agent( aAgent ),
         m_sheet( aSheet ),
-        m_path( std::move( aPath ) )
+        m_path( aPath )
 {
 }
 

eeschema/sync_sheet_pin/sheet_synchronization_model.h

@@ -71,7 +71,7 @@ public:
 
 
     SHEET_SYNCHRONIZATION_MODEL( SHEET_SYNCHRONIZATION_AGENT& aAgent, SCH_SHEET* aSheet,
-                                 SCH_SHEET_PATH& aPath );
+                                 const SCH_SHEET_PATH& aPath );
     ~SHEET_SYNCHRONIZATION_MODEL() override;
 
     void GetValueByRow( wxVariant& variant, unsigned row, unsigned col ) const override;

include/singleton.h

@@ -31,13 +31,17 @@ class thread_pool;
 class KICAD_SINGLETON
 {
 public:
-    KICAD_SINGLETON(){};
+    KICAD_SINGLETON() :
+            m_ThreadPool( nullptr ),
+            m_GLContextManager( nullptr )
+    {};
 
     ~KICAD_SINGLETON();
 
 
     void Init();
 
+public:
     BS::thread_pool*    m_ThreadPool;
     GL_CONTEXT_MANAGER* m_GLContextManager;
 };