kicad-developers team mailing list archive

[Andrew Zonenberg <azonenberg@xxxxxxxxxxxxxxx>]

Hmm, yes that should do the conversion inline.

Updated patch attached, tested on Debian wx 2.8.

> static inline const wxChar* GetChars( const wxString& s )
> {
> #if wxCHECK_VERSION( 2, 9, 0 )
>     return (const wxChar*) s.c_str();
> #else
>     return s.GetData();
> #endif
> }
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp

-- 
Andrew Zonenberg
PhD student, security group
Computer Science Department
Rensselaer Polytechnic Institute
http://colossus.cs.rpi.edu/~azonenberg/

=== modified file 'pcbnew/netlist.cpp'
--- pcbnew/netlist.cpp	2014-06-05 07:54:47 +0000
+++ pcbnew/netlist.cpp	2014-08-13 18:08:57 +0000
@@ -242,8 +242,8 @@
             {
                 msg.Printf( _( "* Warning: component '%s' has footprint '%s' and should be '%s'\n" ),
                             GetChars( component->GetReference() ),
-                            fpOnBoard->GetFPID().GetFootprintName().c_str(),
-                            component->GetFPID().GetFootprintName().c_str() );
+                            GetChars( fpOnBoard->GetFPID().GetFootprintName() ),
+                            GetChars( component->GetFPID().GetFootprintName() ) );
                 aReporter->Report( msg );
             }
 
@@ -272,7 +272,7 @@
                     msg.Printf( _( "*** Warning: Component '%s' footprint ID '%s' is not "
                                    "valid. ***\n" ),
                                 GetChars( component->GetReference() ),
-                                component->GetFPID().GetFootprintName().c_str() );
+                                GetChars( component->GetFPID().GetFootprintName() ) );
                     aReporter->Report( msg );
                 }
 
@@ -294,7 +294,7 @@
                     msg.Printf( _( "*** Warning: component '%s' footprint '%s' was not found in "
                                    "any libraries in the footprint library table. ***\n" ),
                                 GetChars( component->GetReference() ),
-                                component->GetFPID().GetFootprintName().c_str() );
+                                GetChars( component->GetFPID().GetFootprintName() ) );
                     aReporter->Report( msg );
                 }

Attachment: signature.asc
Description: This is a digitally signed message part