Commit cca97586 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

revert to using quotes around variable text which may be blank

parent 0d41a7a5

pcbnew/gpcb_plugin.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -278,7 +278,7 @@ void GPCB_FPL_CACHE::Remove( const wxString& aFootprintName ) 




    if( it == m_modules.end() )

    if( it == m_modules.end() )

    {

    {

        THROW_IO_ERROR( wxString::Format( _( "library <%s> has no footprint %s to delete" ),

        THROW_IO_ERROR( wxString::Format( _( "library <%s> has no footprint '%s' to delete" ),

                                          m_lib_path.GetPath().GetData(),

                                          m_lib_path.GetPath().GetData(),

                                          aFootprintName.GetData() ) );

                                          aFootprintName.GetData() ) );

    }

    }

pcbnew/kicad_plugin.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ void FP_CACHE::Remove( const wxString& aFootprintName ) 




    if( it == m_modules.end() )

    if( it == m_modules.end() )

    {

    {

        THROW_IO_ERROR( wxString::Format( _( "library <%s> has no footprint %s to delete" ),

        THROW_IO_ERROR( wxString::Format( _( "library <%s> has no footprint '%s' to delete" ),

                                          m_lib_path.GetPath().GetData(),

                                          m_lib_path.GetPath().GetData(),

                                          aFootprintName.GetData() ) );

                                          aFootprintName.GetData() ) );

    }

    }

pcbnew/legacy_plugin.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -4322,7 +4322,7 @@ void LEGACY_PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxStrin 
    if( erasedCount != 1 )

    if( erasedCount != 1 )

    {

    {

        THROW_IO_ERROR( wxString::Format(

        THROW_IO_ERROR( wxString::Format(

            _( "library <%s> has no footprint %s to delete" ),

            _( "library <%s> has no footprint '%s' to delete" ),

            aLibraryPath.GetData(), aFootprintName.GetData() ) );

            aLibraryPath.GetData(), aFootprintName.GetData() ) );

    }

    }

pcbnew/specctra_export.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -549,7 +549,6 @@ IMAGE* SPECCTRA_DB::makeIMAGE( BOARD* aBoard, MODULE* aModule ) 
    TYPE_COLLECTOR  moduleItems;

    TYPE_COLLECTOR  moduleItems;

    wxString        padName;

    wxString        padName;







    // get all the MODULE's pads.

    // get all the MODULE's pads.

    moduleItems.Collect( aModule, scanPADs );

    moduleItems.Collect( aModule, scanPADs );
@@ -964,7 +963,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) 




            if( module->GetReference() == wxEmptyString )

            if( module->GetReference() == wxEmptyString )

            {

            {

                ThrowIOError( _("Component with value of %s has empty reference id."),

                ThrowIOError( _( "Component with value of '%s' has empty reference id." ),

                                GetChars( module->GetValue() ) );

                                GetChars( module->GetValue() ) );

            }

            }
@@ -972,7 +971,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) throw( IO_ERROR ) 
            STRINGSET_PAIR refpair = refs.insert( TO_UTF8( module->GetReference() ) );

            STRINGSET_PAIR refpair = refs.insert( TO_UTF8( module->GetReference() ) );

            if( !refpair.second )      // insert failed

            if( !refpair.second )      // insert failed

            {

            {

                ThrowIOError( _("Multiple components have identical reference IDs of %s."),

                ThrowIOError( _( "Multiple components have identical reference IDs of '%s'." ),

                      GetChars( module->GetReference() ) );

                      GetChars( module->GetReference() ) );

            }

            }

        }

        }