From 859435cabefec27c350d3bc50912e3e2ead31ad4 Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Mon, 8 Jun 2015 10:37:45 -0400 Subject: [PATCH] Fix clang build error due to ambiguous function GetSheet() in SCH_SHEET_PATH. --- eeschema/find.cpp | 6 +++--- eeschema/sch_sheet_path.cpp | 2 +- eeschema/sch_sheet_path.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eeschema/find.cpp b/eeschema/find.cpp index 74801bff5e..2d4b55cbcb 100644 --- a/eeschema/find.cpp +++ b/eeschema/find.cpp @@ -366,7 +366,7 @@ void SCH_EDIT_FRAME::OnFindReplace( wxFindDialogEvent& aEvent ) SetUndoItem( undoItem ); - sheet = schematic.GetSheet( data.GetSheetPath() ); + sheet = schematic.GetSheetByPath( data.GetSheetPath() ); wxCHECK_RET( sheet != NULL, wxT( "Could not find sheet path " ) + data.GetSheetPath() ); @@ -396,7 +396,7 @@ void SCH_EDIT_FRAME::OnFindReplace( wxFindDialogEvent& aEvent ) SetUndoItem( undoItem ); - sheet = schematic.GetSheet( data.GetSheetPath() ); + sheet = schematic.GetSheetByPath( data.GetSheetPath() ); wxCHECK_RET( sheet != NULL, wxT( "Could not find sheet path " ) + data.GetSheetPath() ); @@ -429,7 +429,7 @@ void SCH_EDIT_FRAME::updateFindReplaceView( wxFindDialogEvent& aEvent ) { wxLogTrace( traceFindReplace, wxT( "Found " ) + m_foundItems.GetText() ); - SCH_SHEET_PATH* sheet = schematic.GetSheet( data.GetSheetPath() ); + SCH_SHEET_PATH* sheet = schematic.GetSheetByPath( data.GetSheetPath() ); wxCHECK_RET( sheet != NULL, wxT( "Could not find sheet path " ) + data.GetSheetPath() ); diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp index 3fa59f3e05..52027e3361 100644 --- a/eeschema/sch_sheet_path.cpp +++ b/eeschema/sch_sheet_path.cpp @@ -624,7 +624,7 @@ SCH_SHEET_PATH* SCH_SHEET_LIST::GetSheet( int aIndex ) const } -SCH_SHEET_PATH* SCH_SHEET_LIST::GetSheet( const wxString aPath, bool aHumanReadable ) +SCH_SHEET_PATH* SCH_SHEET_LIST::GetSheetByPath( const wxString aPath, bool aHumanReadable ) { SCH_SHEET_PATH* sheet = GetFirst(); wxString sheetPath; diff --git a/eeschema/sch_sheet_path.h b/eeschema/sch_sheet_path.h index 0afdc6a4eb..5cd60bce05 100644 --- a/eeschema/sch_sheet_path.h +++ b/eeschema/sch_sheet_path.h @@ -423,7 +423,7 @@ public: SCH_SHEET_PATH* GetSheet( int aIndex ) const; /** - * Function GetSheet + * Function GetSheetByPath * returns a sheet matching the path name in \a aPath. * * @param aPath A wxString object containing path of the sheet to get. @@ -432,7 +432,7 @@ public: * @return The sheet that matches \a aPath or NULL if no sheet matching * \a aPath is found. */ - SCH_SHEET_PATH* GetSheet( const wxString aPath, bool aHumanReadable = true ); + SCH_SHEET_PATH* GetSheetByPath( const wxString aPath, bool aHumanReadable = true ); /** * Function IsModified