haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More work on arbitrary characters in references, etc.

This commit is contained in:
Jeff Young 2018-09-27 13:49:38 +01:00
parent 1685af8425
commit f10635e8be
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/string.cpp
View File

@ -487,8 +487,12 @@ bool ApplyModifier( double& value, const wxString& aString )
//
// TODO: case (d) unimplemented !!!
//
int ValueStringCompare( const wxString& strFWord, const wxString& strSWord )
int ValueStringCompare( wxString strFWord, wxString strSWord )
{
// Compare unescaped text
strFWord = UnescapeString( strFWord );
strSWord = UnescapeString( strSWord );
// The different sections of the two strings
wxString strFWordBeg, strFWordMid, strFWordEnd;
wxString strSWordBeg, strSWordMid, strSWordEnd;
@ -531,8 +535,12 @@ int ValueStringCompare( const wxString& strFWord, const wxString& strSWord )
}
int RefDesStringCompare( const wxString& strFWord, const wxString& strSWord )
int RefDesStringCompare( wxString strFWord, wxString strSWord )
{
// Compare unescaped text
strFWord = UnescapeString( strFWord );
strSWord = UnescapeString( strSWord );
// The different sections of the two strings
wxString strFWordBeg, strFWordMid, strFWordEnd;
wxString strSWordBeg, strSWordMid, strSWordEnd;

4
include/kicad_string.h
View File

@ -146,7 +146,7 @@ bool WildCompareString( const wxString& pattern,
* return 0 if the strings are equal
* return 1 if the first string is greater than the second
*/
int ValueStringCompare( const wxString& strFWord, const wxString& strSWord );
int ValueStringCompare( wxString strFWord, wxString strSWord );
/**
* Function RefDesStringCompare
@ -156,7 +156,7 @@ int ValueStringCompare( const wxString& strFWord, const wxString& strSWord );
* return 0 if the strings are equal
* return 1 if the first string is greater than the second
*/
int RefDesStringCompare( const wxString& lhs, const wxString& rhs );
int RefDesStringCompare( wxString lhs, wxString rhs );
/**
* Function SplitString