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

JSON_SETTINGS: Provide explicit CloneFrom

This commit is contained in:
Jon Evans 2021-07-05 12:26:14 -04:00
parent 515669284a
commit 3f55093bff
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/settings/color_settings.cpp
View File

@ -270,7 +270,7 @@ bool COLOR_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
return false; return false;
} }
#include <iostream>
bool COLOR_SETTINGS::migrateSchema0to1() bool COLOR_SETTINGS::migrateSchema0to1()
{ {
/** /**
@ -298,7 +298,7 @@ bool COLOR_SETTINGS::migrateSchema0to1()
COLOR_SETTINGS* fpsettings = m_manager->AddNewColorSettings( filename ); COLOR_SETTINGS* fpsettings = m_manager->AddNewColorSettings( filename );
// Start out with a clone // Start out with a clone
fpsettings->Set( "", At( "" ) ); fpsettings->m_internals->CloneFrom( *m_internals );
// Footprint editor now just looks at the "board" namespace // Footprint editor now just looks at the "board" namespace
fpsettings->Set( "board", fpsettings->At( "fpedit" ) ); fpsettings->Set( "board", fpsettings->At( "fpedit" ) );

6
include/settings/json_settings_internals.h
View File

@ -62,6 +62,12 @@ public:
{ {
return nlohmann::json::operator[]( PointerFromString( aPath ) ); return nlohmann::json::operator[]( PointerFromString( aPath ) );
} }
void CloneFrom( const JSON_SETTINGS_INTERNALS& aOther )
{
nlohmann::json::json_pointer root( "" );
this->nlohmann::json::operator[]( root ) = aOther.nlohmann::json::operator[]( root );
}
}; };
#endif // KICAD_JSON_SETTINGS_INTERNALS_H #endif // KICAD_JSON_SETTINGS_INTERNALS_H