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

Fix linker error (doubly defined symbol).

This commit is contained in:
Jeff Young 2022-09-10 10:26:10 +01:00
parent fdc00ed22d
commit fdf71ba005
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qa/schematic_utils/schematic_file_util.cpp
View File

@ -18,8 +18,6 @@
* http://www.gnu.org/licenses/
*/
#include <schematic_file_util.h>
#include <settings/settings_manager.h>
@ -28,7 +26,6 @@
#include <lib_textbox.h>
#include <schematic.h>
#include <sch_screen.h>
#include <sch_io_mgr.h>
// For SCH parsing
#include <sch_plugins/kicad/sch_sexpr_plugin.h>
@ -44,7 +41,7 @@ namespace KI_TEST
#define QA_EESCHEMA_DATA_LOCATION "???"
#endif
std::string GetEeschemaTestDataDir()
std::string getEeschemaTestDataDir()
{
const char* env = std::getenv( "KICAD_TEST_EESCHEMA_DATA_DIR" );
std::string fn;
@ -95,7 +92,6 @@ std::unique_ptr<SCHEMATIC> ReadSchematicFromStream( std::istream& aStream, PROJE
{
}
return schematic;
}
@ -123,7 +119,7 @@ void LoadSchematic( SETTINGS_MANAGER& aSettingsManager, const wxString& aRelPath
aSchematic->Reset();
}
std::string absPath = GetEeschemaTestDataDir() + aRelPath.ToStdString();
std::string absPath = getEeschemaTestDataDir() + aRelPath.ToStdString();
wxFileName projectFile( absPath + ".kicad_pro" );
wxFileName legacyProject( absPath + ".pro" );
std::string schematicPath = absPath + ".kicad_sch";
@ -163,7 +159,6 @@ void LoadSchematic( SETTINGS_MANAGER& aSettingsManager, const wxString& aRelPath
// SchematicCleanUp must be freed from its UI dependencies.
aSchematic->ConnectionGraph()->Recalculate( sheets, true );
}
} // namespace KI_TEST

9
qa/schematic_utils/schematic_file_util.h
View File

@ -31,14 +31,13 @@ class wxString;
namespace KI_TEST
{
std::string GetEeschemaTestDataDir();
void DumpSchematicToFile( SCHEMATIC& aSchematic, SCH_SHEET& aSheet, const std::string& aFilename );
void DumpSchematicToFile( SCHEMATIC& aSchematic, SCH_SHEET& aSheet,
const std::string& aFilename );
std::unique_ptr<SCHEMATIC> ReadSchematicFromStream( std::istream& aStream, PROJECT* aProject );
std::unique_ptr<SCHEMATIC> ReadSchematicFromFile( const std::string& aFilename, PROJECT* aProject );
std::unique_ptr<SCHEMATIC> ReadSchematicFromFile( const std::string& aFilename,
PROJECT* aProject );
void LoadSchematic( SETTINGS_MANAGER& aSettingsManager, const wxString& aRelPath,
std::unique_ptr<SCHEMATIC>& aSchematic );