Jettison FP_LIB_TABLE::ConvertFromLegacy() into a static function, where it

was used locally.  Then comment it out in favor of a newer strategy for
filling in nicknames in cvpcb. 

Add MODULE* FootprintLoadWithOptionalNickname( const FPID& aFootprintId )
        throw( IO_ERROR, PARSE_ERROR );
from code found elsewhere.

common/fp_lib_table.cpp

@@ -638,164 +638,41 @@ const wxString FP_LIB_TABLE::ExpandSubstitutions( const wxString& aString )
 
 bool FP_LIB_TABLE::IsEmpty( bool aIncludeFallback )
 {
-    if( !aIncludeFallback || (fallBack == NULL) )
+    if( !aIncludeFallback || !fallBack )
         return rows.empty();
 
-    return fallBack->IsEmpty() && rows.empty();
+    return rows.empty() && fallBack->IsEmpty( true );
 }
 
 
-bool FP_LIB_TABLE::ConvertFromLegacy( SEARCH_STACK& aSStack, NETLIST& aNetList,
-        const wxArrayString& aLibNames, REPORTER* aReporter ) throw( IO_ERROR )
+MODULE* FP_LIB_TABLE::FootprintLoadWithOptionalNickname( const FPID& aFootprintId )
+    throw( IO_ERROR, PARSE_ERROR )
 {
-    wxString   msg;
-    FPID       lastFPID;
-    COMPONENT* component;
-    MODULE*    module = 0;
-    bool       retv = true;
+    wxString   nickname = aFootprintId.GetLibNickname();
+    wxString   fpname   = aFootprintId.GetFootprintName();
 
-    if( aNetList.IsEmpty() )
-        return true;
-
-    aNetList.SortByFPID();
-
-    wxString   libPath;
-
-    PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );
-
-    for( unsigned ii = 0; ii < aNetList.GetCount(); ii++ )
+    if( nickname.size() )
     {
-        component = aNetList.GetComponent( ii );
-
-        // The footprint hasn't been assigned yet so ignore it.
-        if( component->GetFPID().empty() )
-            continue;
-
-        if( component->GetFPID() != lastFPID )
-        {
-            module = NULL;
-
-            for( unsigned ii = 0; ii < aLibNames.GetCount(); ii++ )
-            {
-                wxFileName fn( wxEmptyString, aLibNames[ii], LegacyFootprintLibPathExtension );
-
-                libPath = aSStack.FindValidPath( fn.GetFullPath() );
-
-                if( !libPath )
-                {
-                    if( aReporter )
-                    {
-                        msg.Printf( _( "Cannot find footprint library file '%s' in any of the "
-                                       "KiCad legacy library search paths.\n" ),
-                                    GetChars( fn.GetFullPath() ) );
-                        aReporter->Report( msg );
-                    }
-
-                    retv = false;
-                    continue;
-                }
-
-                module = pi->FootprintLoad( libPath, component->GetFPID().GetFootprintName() );
+        return FootprintLoad( nickname, fpname );
+    }
 
-                if( module )
-                {
-                    lastFPID = component->GetFPID();
-                    break;
-                }
-            }
-        }
+    // nickname is empty, sequentially search (alphabetically) all libs/nicks for first match:
+    else
+    {
+        std::vector<wxString> nicks = GetLogicalLibs();
 
-        if( !module )
+        // Search each library going through libraries alphabetically.
+        for( unsigned i = 0;  i<nicks.size();  ++i )
         {
-            if( aReporter )
-            {
-                msg.Printf( _( "Component `%s` footprint '%s' was not found in any legacy "
-                               "library.\n" ),
-                            GetChars( component->GetReference() ),
-                            GetChars( component->GetFPID().Format() ) );
-                aReporter->Report( msg );
-            }
-
-            // Clear the footprint assignment since the old library lookup method is no
-            // longer valid.
-            FPID emptyFPID;
-
-            component->SetFPID( emptyFPID );
-            retv = false;
-            continue;
+            // FootprintLoad() returns NULL on not found, does not throw exception
+            // unless there's an IO_ERROR.
+            MODULE* ret = FootprintLoad( nicks[i], fpname );
+            if( ret )
+                return ret;
         }
-        else
-        {
-            wxString libNickname;
 
-            FP_LIB_TABLE* cur = this;
-
-            do
-            {
-                cur->ensureIndex();
-
-                for( unsigned i = 0;  i < cur->rows.size();  i++ )
-                {
-                    wxString uri = cur->rows[i].GetFullURI( true );
-
-                    if( wxFileName::GetPathSeparator() == wxChar( '\\' )
-                        && uri.Find( wxChar( '/' ) ) >= 0 )
-                    {
-                        uri.Replace( wxT( "/"), wxT( "\\" ) );
-                    }
-#ifdef __WINDOWS__
-                    if( uri.CmpNoCase( libPath ) )
-#else
-                    if( uri == libPath )
-#endif
-                    {
-                        libNickname = cur->rows[i].GetNickName();
-                        break;
-                    }
-                }
-
-            } while( ( cur = cur->fallBack ) != 0 && libNickname.IsEmpty() );
-
-            if( libNickname.IsEmpty() )
-            {
-                if( aReporter )
-                {
-                    msg.Printf( _( "Component '%s' footprint '%s' legacy library path '%s' "
-                                   "was not found in the footprint library table.\n" ),
-                                GetChars( component->GetReference() ),
-                                GetChars( component->GetFPID().Format() ) );
-                    aReporter->Report( msg );
-                }
-
-                retv = false;
-            }
-            else
-            {
-                FPID newFPID = lastFPID;
-                newFPID.SetLibNickname( libNickname );
-
-                if( !newFPID.IsValid() )
-                {
-                    if( aReporter )
-                    {
-                        msg.Printf( _( "Component '%s' FPID '%s' is not valid.\n" ),
-                                    GetChars( component->GetReference() ),
-                                    GetChars( newFPID.Format() ) );
-                        aReporter->Report( msg );
-                    }
-
-                    retv = false;
-                }
-                else
-                {
-                    // The footprint name should already be set.
-                    component->SetFPID( newFPID );
-                }
-            }
-        }
+        return NULL;
     }
-
-    return retv;
 }
 
 
@@ -827,17 +704,14 @@ bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable ) throw (IO_ERROR, PARS
         // The fallback is to create an empty global footprint table for the user to populate.
         if( fileName.IsEmpty() || !::wxCopyFile( fileName, fn.GetFullPath(), false ) )
         {
-            FP_LIB_TABLE            emptyTable;
-            FILE_OUTPUTFORMATTER    sf( fn.GetFullPath() );
+            FP_LIB_TABLE    emptyTable;
 
-            emptyTable.Format( &sf, 0 );
+            emptyTable.Save( fn.GetFullPath() );
         }
     }
 
-    FILE_LINE_READER    reader( fn.GetFullPath() );
-    FP_LIB_TABLE_LEXER  lexer( &reader );
+    aTable.Load( fn.GetFullPath() );
 
-    aTable.Parse( &lexer );
     return tableExists;
 }
 

common/page_layout/page_layout_reader.cpp

@@ -744,7 +744,7 @@ void WORKSHEET_LAYOUT::SetDefaultLayout()
     {
         lp_parser.Parse( this );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxLogMessage( ioe.errorText );
     }
@@ -765,7 +765,7 @@ void WORKSHEET_LAYOUT::SetPageLayout( const char* aPageLayout, bool Append )
     {
         lp_parser.Parse( this );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxLogMessage( ioe.errorText );
     }
@@ -828,7 +828,7 @@ void WORKSHEET_LAYOUT::SetPageLayout( const wxString& aFullFileName, bool Append
         {
             lp_parser.Parse( this );
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             wxLogMessage( ioe.errorText );
         }

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -490,7 +490,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )
 
         footprint = FootprintLibs()->FootprintLoad( FROM_UTF8( nickname.c_str() ), FROM_UTF8( fpname.c_str() ) );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return NULL;

cvpcb/cvframe.cpp

@@ -846,7 +846,7 @@ int CVPCB_MAINFRAME::ReadSchematicNetlist()
         else
             wxMessageBox( _( "Unknown netlist format." ), wxEmptyString, wxOK | wxICON_ERROR );
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         msg = wxString::Format( _( "Error loading netlist.\n%s" ), ioe.errorText.GetData() );
         wxMessageBox( msg, _( "Netlist Load Error" ), wxOK | wxICON_ERROR );

eeschema/class_libentry.cpp

@@ -136,7 +136,7 @@ bool LIB_ALIAS::SaveDoc( OUTPUTFORMATTER& aFormatter )
 
         aFormatter.Print( 0, "$ENDCMP\n" );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         return false;
     }

eeschema/class_library.cpp

@@ -731,7 +731,7 @@ bool CMP_LIBRARY::Save( OUTPUTFORMATTER& aFormatter )
 
         aFormatter.Print( 0, "#\n#End Library\n" );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         success = false;
     }
@@ -756,7 +756,7 @@ bool CMP_LIBRARY::SaveDocs( OUTPUTFORMATTER& aFormatter )
 
         aFormatter.Print( 0, "#\n#End Doc Library\n" );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         success = false;
     }

eeschema/dialogs/dialog_bom.cpp

@@ -249,7 +249,7 @@ void DIALOG_BOM::installPluginsList()
         {
             cfg_parser.Parse();
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
 //            wxLogMessage( ioe.errorText );
         }

eeschema/eeschema_config.cpp

@@ -668,7 +668,7 @@ void SCH_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg )
         {
             m_TemplateFieldNames.Parse( &lexer );
         }
-        catch( IO_ERROR& e )
+        catch( const IO_ERROR& e )
         {
             // @todo show error msg
             DBG( printf( "templatefieldnames parsing error: '%s'\n",

eeschema/netform.cpp

@@ -1049,7 +1049,7 @@ bool NETLIST_EXPORT_TOOL::WriteKiCadNetList( const wxString& aOutFileName )
 
         xroot->Format( &formatter, 0 );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( NULL, ioe.errorText );
         return false;

eeschema/symbedit.cpp

@@ -225,14 +225,14 @@ void LIB_EDIT_FRAME::SaveOneSymbol()
             formatter.Print( 0, "ENDDRAW\n" );
             formatter.Print( 0, "ENDDEF\n" );
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             msg.Printf( _( "An error occurred attempting to save symbol file '%s'" ),
                         GetChars( fn.GetFullPath() ) );
             DisplayError( this, msg );
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return;

include/fp_lib_table.h

@@ -38,6 +38,7 @@ class wxFileName;
 class OUTPUTFORMATTER;
 class MODULE;
 class FP_LIB_TABLE_LEXER;
+class FPID;
 class NETLIST;
 class REPORTER;
 class SEARCH_STACK;
@@ -455,6 +456,21 @@ public:
 
     //-----</PLUGIN API SUBSET, REBASED ON aNickname>---------------------------
 
+    /**
+     * Function FootprintLoadWithOptionalNickname
+     * loads a footprint having @a aFootprintId with possibly an empty nickname.
+     *
+     * @param aFootprintId the [nickname] & fooprint name of the footprint to load.
+     *
+     * @return  MODULE* - if found caller owns it, else NULL if not found.
+     *
+     * @throw   IO_ERROR if the library cannot be found or read.  No exception
+     *          is thrown in the case where aFootprintName cannot be found.
+     * @throw   PARSE_ERROR if @a aFootprintId is not parsed OK.
+     */
+    MODULE* FootprintLoadWithOptionalNickname( const FPID& aFootprintId )
+        throw( IO_ERROR, PARSE_ERROR );
+
     /**
      * Function GetDescription
      * returns the library desicription from @a aNickname, or an empty string
@@ -499,19 +515,6 @@ public:
      */
     bool IsEmpty( bool aIncludeFallback = true );
 
-    /**
-     * Function ConvertFromLegacy
-     * converts the footprint names in \a aNetList from the legacy format to the #FPID format.
-     *
-     * @param aNetList is the #NETLIST object to convert.
-     * @param aLibNames is the list of legacy footprint library names from the currently loaded
-     *                  project.
-     * @param aReporter is the #REPORTER object to dump messages into.
-     * @return true if all footprint names were successfully converted to a valid FPID.
-     */
-    bool ConvertFromLegacy( SEARCH_STACK& aSStack, NETLIST& aNetList,
-            const wxArrayString& aLibNames, REPORTER* aReporter = NULL ) throw( IO_ERROR );
-
     /**
      * Function ExpandSubstitutions
      * replaces any environment variable references with their values and is

include/fpid.h

@@ -153,7 +153,6 @@ public:
      */
     bool IsValid() const { return !nickname.empty() && !footprint.empty(); }
 
-
     /**
      * Function IsLegacy
      * @return true if the #FPID only has the #footprint name defined.

include/ptree.h

@@ -78,7 +78,7 @@ typedef const PTREE                     CPTREE;
  *     PTREE   doc;
  *     Scan( &doc, &lexer );
  * }
- * catch( IO_ERROR ioe )
+ * catch( const IO_ERROR& ioe )
  * {
  *     fprintf( stderr, "%s\n", TO_UTF8( ioe.errorText ) );
  * }

new/sch_dir_lib_source.cpp

@@ -716,7 +716,7 @@ void DIR_LIB_SOURCE::Test( int argc, char** argv )
         printf( "std::exception\n" );
     }
 
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         printf( "exception: %s\n", (const char*) ioe.errorText.ToUTF8() ) );
     }

new/test_sch_lib_table.cpp

@@ -118,7 +118,7 @@ int main( int argc, char** argv )
 
         printf( "%*s^\n", ioe.byteIndex>=1 ? ioe.byteIndex-1 : 0, "" );
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         printf( "%s\n", (const char*) ioe.errorText.ToUTF8() );
     }

pagelayout_editor/page_layout_writer.cpp

@@ -98,7 +98,7 @@ public:
             m_fileout = new FILE_OUTPUTFORMATTER( aFilename );
             m_out = m_fileout;
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             wxMessageBox( ioe.errorText, _("Error writing page layout descr file" ) );
         }
@@ -125,7 +125,7 @@ public:
             m_writer = new STRING_FORMATTER();
             m_out = m_writer;
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             wxMessageBox( ioe.errorText, _("Error writing page layout descr file" ) );
         }

pcb_calculator/datafile_read_write.cpp

@@ -66,13 +66,16 @@ bool PCB_CALCULATOR_FRAME::ReadDataFile()
     {
         datafile_parser.Parse( datafile );
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         delete datafile;
-        ioe.errorText += '\n';
-        ioe.errorText += _("Data file error.");
 
-        wxMessageBox( ioe.errorText );
+        wxString msg = ioe.errorText;
+
+        msg += wxChar('\n');
+        msg += _("Data file error.");
+
+        wxMessageBox( msg );
         return false;
     }
 
@@ -99,7 +102,7 @@ bool PCB_CALCULATOR_FRAME::WriteDataFile()
         while( nestlevel-- )
             formatter.Print( nestlevel, ")\n" );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         return false;
     }

pcbnew/dialogs/dialog_netlist.cpp

@@ -426,7 +426,7 @@ bool DIALOG_NETLIST::verifyFootprints( const wxString&         aNetlistFilename,
         std::auto_ptr< NETLIST_READER > nlr( netlistReader );
         netlistReader->LoadNetlist();
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         msg.Printf( _( "Error loading netlist file:\n%s" ), ioe.errorText.GetData() );
         wxMessageBox( msg, _( "Netlist Load Error" ), wxOK | wxICON_ERROR );

pcbnew/exporters/export_idf.cpp

@@ -403,7 +403,7 @@ bool Export_IDF3( BOARD* aPcb, const wxString& aFullFileName, double aUseThou )
 
         idfBoard.Finish();
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxLogDebug( wxT( "An error occurred attemping export to IDFv3.\n\nError: %s" ),
                     GetChars( ioe.errorText ) );

pcbnew/exporters/gen_modules_placefile.cpp

@@ -713,7 +713,7 @@ bool PCB_EDIT_FRAME::DoGenFootprintsReport( const wxString& aFullFilename, bool
             fprintf( rptfile, "$EndMODULE  %s\n\n", TO_UTF8 (Module->GetReference() ) );
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( NULL, ioe.errorText );
     }

pcbnew/files.cpp

@@ -404,7 +404,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
             SetBoard( loadedBoard );
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxString msg = wxString::Format( _( "Error loading board.\n%s" ),
                                          ioe.errorText.GetData() );
@@ -692,7 +692,7 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF
 
         pi->Save( pcbFileName.GetFullPath(), GetBoard(), NULL );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxString msg = wxString::Format( _( "Error saving board.\n%s" ),
                                          ioe.errorText.GetData() );

pcbnew/github/github_plugin.cpp

@@ -570,7 +570,7 @@ int main( int argc, char** argv )
             printf("[%d]:%s\n", i, TO_UTF8( fps[i] ) );
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         printf( "%s\n", TO_UTF8(ioe.errorText) );
     }

pcbnew/io_mgr.h

@@ -204,7 +204,7 @@ public:
  *   or
  *        IO_MGR::Save(...);
  *   }
- *   catch( IO_ERROR ioe )
+ *   catch( const IO_ERROR& ioe )
  *   {
  *        // grab text from ioe, show in error window.
  *   }

pcbnew/librairi.cpp

@@ -199,7 +199,7 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
                 return NULL;
             }
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             DisplayError( this, ioe.errorText );
             return NULL;
@@ -222,7 +222,7 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
                 return NULL;
             }
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             DisplayError( this, ioe.errorText );
             return NULL;
@@ -259,7 +259,7 @@ MODULE* FOOTPRINT_EDIT_FRAME::Import_Module()
                 return NULL;
             }
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             DisplayError( this, ioe.errorText );
             return NULL;
@@ -334,7 +334,7 @@ void FOOTPRINT_EDIT_FRAME::Export_Module( MODULE* aModule )
         fprintf( fp, "%s", pcb_io.GetStringOutput( false ).c_str() );
         fclose( fp );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return;
@@ -357,7 +357,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveCurrentModule( const wxString* aLibPath )
 
         pi->FootprintSave( libPath, GetBoard()->m_Modules );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return false;
@@ -429,7 +429,7 @@ wxString FOOTPRINT_EDIT_FRAME::CreateNewLibrary()
             writable = pi->IsFootprintLibWritable( libPath );
             exists   = true;    // no exception was thrown, lib must exist.
         }
-        catch( IO_ERROR )
+        catch( const IO_ERROR& )
         {
             // ignore, original values of 'writable' and 'exists' are accurate.
         }
@@ -455,7 +455,7 @@ wxString FOOTPRINT_EDIT_FRAME::CreateNewLibrary()
 
         pi->FootprintLibCreate( libPath );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return wxEmptyString;
@@ -499,7 +499,7 @@ bool FOOTPRINT_EDIT_FRAME::DeleteModuleFromCurrentLibrary()
     {
         FootprintLibs()->FootprintDelete( nickname, fpname );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return false;
@@ -568,7 +568,7 @@ void PCB_EDIT_FRAME::ArchiveModulesOnBoard( bool aNewModulesOnly )
             }
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
     }
@@ -655,7 +655,7 @@ bool PCB_BASE_FRAME::Save_Module_In_Library( const wxString& aLibrary,
         // own if the library or footprint is not writable.
         FootprintLibs()->FootprintSave( aLibrary, aModule );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return false;

pcbnew/loadcmp.cpp

@@ -220,7 +220,7 @@ MODULE* PCB_BASE_FRAME::LoadModuleFromLibrary( const wxString& aLibrary,
     {
         module = loadFootprint( fpid );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxLogDebug( wxT( "An error occurred attemping to load footprint '%s'.\n\nError: %s" ),
                     fpid.Format().c_str(), GetChars( ioe.errorText ) );
@@ -252,7 +252,7 @@ MODULE* PCB_BASE_FRAME::LoadModuleFromLibrary( const wxString& aLibrary,
             {
                 module = loadFootprint( fpid );
             }
-            catch( IO_ERROR ioe )
+            catch( const IO_ERROR& ioe )
             {
                 wxLogDebug( wxT( "An error occurred attemping to load footprint '%s'.\n\nError: %s" ),
                             fpid.Format().c_str(), GetChars( ioe.errorText ) );
@@ -304,7 +304,7 @@ MODULE* PCB_BASE_FRAME::LoadFootprint( const FPID& aFootprintId )
     {
         module = loadFootprint( aFootprintId );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         wxLogDebug( wxT( "An error occurred attemping to load footprint '%s'.\n\nError: %s" ),
                     aFootprintId.Format().c_str(), GetChars( ioe.errorText ) );
@@ -321,31 +321,7 @@ MODULE* PCB_BASE_FRAME::loadFootprint( const FPID& aFootprintId )
 
     wxCHECK_MSG( fptbl, NULL, wxT( "Cannot look up FPID in NULL FP_LIB_TABLE." ) );
 
-    wxString   nickname = aFootprintId.GetLibNickname();
-    wxString   fpname   = aFootprintId.GetFootprintName();
-
-    if( nickname.size() )
-    {
-        return fptbl->FootprintLoad( nickname, fpname );
-    }
-
-    // user did not enter a nickname, just a footprint name, help him out a little:
-    else
-    {
-        std::vector<wxString> nicks = fptbl->GetLogicalLibs();
-
-        // Search each library going through libraries alphabetically.
-        for( unsigned i = 0;  i<nicks.size();  ++i )
-        {
-            // FootprintLoad() returns NULL on not found, does not throw exception
-            // unless there's an IO_ERROR.
-            MODULE* ret = fptbl->FootprintLoad( nicks[i], fpname );
-            if( ret )
-                return ret;
-        }
-
-        return NULL;
-    }
+    return fptbl->FootprintLoadWithOptionalNickname( aFootprintId );
 }
 
 
@@ -557,7 +533,7 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
             // m is deleted here by auto_ptr.
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         DisplayError( this, ioe.errorText );
         return;

pcbnew/moduleframe.cpp

@@ -279,7 +279,7 @@ wxString FOOTPRINT_EDIT_FRAME::getLibPath()
 
         return row->GetFullURI( true );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         return wxEmptyString;
     }
@@ -639,7 +639,7 @@ void FOOTPRINT_EDIT_FRAME::updateTitle()
             if( !writable )
                 title += _( " [Read Only]" );
         }
-        catch( IO_ERROR ioe )
+        catch( const IO_ERROR& ioe )
         {
             // user may be bewildered as to why after selecting a library it is not showing up
             // in the title, we could show an error message, but that should have been done at time

pcbnew/netlist.cpp

@@ -82,7 +82,7 @@ void PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFileName,
         netlistReader->LoadNetlist();
         loadFootprints( netlist, aReporter );
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         msg.Printf( _( "Error loading netlist.\n%s" ), ioe.errorText.GetData() );
         wxMessageBox( msg, _( "Netlist Load Error" ), wxOK | wxICON_ERROR );

pcbnew/specctra_export.cpp

@@ -162,7 +162,7 @@ bool PCB_EDIT_FRAME::ExportSpecctraFile( const wxString& aFullFilename )
         // if an exception is thrown by FromBOARD or ExportPCB(), then
         // ~SPECCTRA_DB() will close the file.
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
         ok = false;
 
@@ -1322,7 +1322,7 @@ bool SPECCTRA_DB::GetBoardPolygonOutlines( BOARD* aBoard,
             aHoles.CloseLastContour();
         }
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         // Creates a valid polygon outline is not possible.
         // So uses the board edge cuts bounding box to create a

pcbnew/specctra_import.cpp

@@ -102,14 +102,15 @@ void PCB_EDIT_FRAME::ImportSpecctraSession( wxCommandEvent& event )
         db.LoadSESSION( fullFileName );
         db.FromSESSION( GetBoard() );
     }
-    catch( IO_ERROR& ioe )
+    catch( const IO_ERROR& ioe )
     {
-        ioe.errorText += '\n';
-        ioe.errorText += _("BOARD may be corrupted, do not save it.");
-        ioe.errorText += '\n';
-        ioe.errorText += _("Fix problem and try again.");
+        wxString msg = ioe.errorText;
+        msg += '\n';
+        msg += _("BOARD may be corrupted, do not save it.");
+        msg += '\n';
+        msg += _("Fix problem and try again.");
 
-        DisplayError( this, ioe.errorText );
+        DisplayError( this, msg );
         return;
     }
 

pcbnew/specctra_test.cpp

@@ -63,7 +63,7 @@ int main( int argc, char** argv )
 //        db.LoadPCB( filename );
         db.LoadSESSION( filename );
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         fprintf( stderr, "%s\n", TO_UTF8(ioe.errorText) );
         failed = true;

tools/property_tree.cpp

@@ -83,7 +83,7 @@ int main( int argc, char** argv )
 #endif
 
     }
-    catch( IO_ERROR ioe )
+    catch( const IO_ERROR& ioe )
     {
         fprintf( stderr, "%s\n", TO_UTF8( ioe.errorText ) );
     }