Remove redundant performance changes.
(Alex had already moved these to const char, which
avoids wxString's c'tor.)
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20506
(cherry picked from commit 7232a98b65)
This commit is contained in:
@@ -455,10 +455,8 @@ int SCH_ITEM::compare( const SCH_ITEM& aOther, int aCompareFlags ) const
|
||||
|
||||
const wxString& SCH_ITEM::GetDefaultFont() const
|
||||
{
|
||||
static const char eeschema[] = "eeschema";
|
||||
|
||||
SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();
|
||||
EESCHEMA_SETTINGS* cfg = mgr.GetAppSettings<EESCHEMA_SETTINGS>( eeschema );
|
||||
EESCHEMA_SETTINGS* cfg = mgr.GetAppSettings<EESCHEMA_SETTINGS>( "eeschema" );
|
||||
|
||||
return cfg->m_Appearance.default_font;
|
||||
}
|
||||
|
||||
@@ -895,41 +895,35 @@ void PCB_BASE_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
|
||||
|
||||
PCBNEW_SETTINGS* PCB_BASE_FRAME::GetPcbNewSettings() const
|
||||
{
|
||||
static const char pcbnew[] = "pcbnew";
|
||||
return Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( pcbnew );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( "pcbnew" );
|
||||
}
|
||||
|
||||
|
||||
FOOTPRINT_EDITOR_SETTINGS* PCB_BASE_FRAME::GetFootprintEditorSettings() const
|
||||
{
|
||||
static const char fpedit[] = "fpedit";
|
||||
return Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( fpedit );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( "fpedit" );
|
||||
}
|
||||
|
||||
|
||||
PCB_VIEWERS_SETTINGS_BASE* PCB_BASE_FRAME::GetViewerSettingsBase() const
|
||||
{
|
||||
static const char pcbnew[] = "pcbnew";
|
||||
static const char fpedit[] = "fpedit";
|
||||
static const char cvpcb[] = "cvpcb";
|
||||
|
||||
switch( GetFrameType() )
|
||||
{
|
||||
case FRAME_PCB_EDITOR:
|
||||
case FRAME_PCB_DISPLAY3D:
|
||||
default:
|
||||
return Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( pcbnew );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( "pcbnew" );
|
||||
|
||||
case FRAME_FOOTPRINT_EDITOR:
|
||||
case FRAME_FOOTPRINT_WIZARD:
|
||||
return Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( fpedit );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( "fpedit" );
|
||||
|
||||
case FRAME_FOOTPRINT_VIEWER:
|
||||
case FRAME_FOOTPRINT_CHOOSER:
|
||||
case FRAME_FOOTPRINT_PREVIEW:
|
||||
case FRAME_CVPCB:
|
||||
case FRAME_CVPCB_DISPLAY:
|
||||
return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( cvpcb );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -463,8 +463,7 @@ void PCB_DRAW_PANEL_GAL::UpdateColors()
|
||||
}
|
||||
else
|
||||
{
|
||||
static const char pcbnew[] = "pcbnew";
|
||||
PCBNEW_SETTINGS* app = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( pcbnew );
|
||||
auto* app = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( "pcbnew" );
|
||||
|
||||
if( app )
|
||||
cs = Pgm().GetSettingsManager().GetColorSettings( app->m_ColorTheme );
|
||||
|
||||
@@ -83,27 +83,23 @@ PCBNEW_SETTINGS* pcbconfig()
|
||||
// returns the viewer options existing to Cvpcb and Pcbnew
|
||||
PCB_VIEWERS_SETTINGS_BASE* PCB_PAINTER::viewer_settings()
|
||||
{
|
||||
static const char pcbnew[] = "pcbnew";
|
||||
static const char fpedit[] = "fpedit";
|
||||
static const char cvpcb[] = "cvpcb";
|
||||
|
||||
switch( m_frameType )
|
||||
{
|
||||
case FRAME_PCB_EDITOR:
|
||||
case FRAME_PCB_DISPLAY3D:
|
||||
default:
|
||||
return Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( pcbnew );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>( "pcbnew" );
|
||||
|
||||
case FRAME_FOOTPRINT_EDITOR:
|
||||
case FRAME_FOOTPRINT_WIZARD:
|
||||
return Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( fpedit );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>( "fpedit" );
|
||||
|
||||
case FRAME_FOOTPRINT_VIEWER:
|
||||
case FRAME_FOOTPRINT_CHOOSER:
|
||||
case FRAME_FOOTPRINT_PREVIEW:
|
||||
case FRAME_CVPCB:
|
||||
case FRAME_CVPCB_DISPLAY:
|
||||
return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( cvpcb );
|
||||
return Pgm().GetSettingsManager().GetAppSettings<CVPCB_SETTINGS>( "cvpcb" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user