Code cleaning: Remove EDA_BASE_FRAME::m_FrameName member which is a duplicate of wxFrame name. (c7d04c3d) · Commits · Elphel / kicad-source-mirror

common/basicframe.cpp

+18 −14

Original line number	Original line	Diff line number	Diff line
	@@ -226,24 +226,26 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
	{		{
	int maximized = 0;		int maximized = 0;

	wxString text = m_FrameName + wxT( "Pos_x" );		wxString baseCfgName = GetName();

			wxString text = baseCfgName + wxT( "Pos_x" );
	aCfg->Read( text, &m_FramePos.x );		aCfg->Read( text, &m_FramePos.x );

	text = m_FrameName + wxT( "Pos_y" );		text = baseCfgName + wxT( "Pos_y" );
	aCfg->Read( text, &m_FramePos.y );		aCfg->Read( text, &m_FramePos.y );

	text = m_FrameName + wxT( "Size_x" );		text = baseCfgName + wxT( "Size_x" );
	aCfg->Read( text, &m_FrameSize.x, 600 );		aCfg->Read( text, &m_FrameSize.x, 600 );

	text = m_FrameName + wxT( "Size_y" );		text = baseCfgName + wxT( "Size_y" );
	aCfg->Read( text, &m_FrameSize.y, 400 );		aCfg->Read( text, &m_FrameSize.y, 400 );

	text = m_FrameName + wxT( "Maximized" );		text = baseCfgName + wxT( "Maximized" );
	aCfg->Read( text, &maximized, 0 );		aCfg->Read( text, &maximized, 0 );

	if( m_hasAutoSave )		if( m_hasAutoSave )
	{		{
	text = m_FrameName + entryAutoSaveInterval;		text = baseCfgName + entryAutoSaveInterval;
	aCfg->Read( text, &m_autoSaveInterval, DEFAULT_AUTO_SAVE_INTERVAL );		aCfg->Read( text, &m_autoSaveInterval, DEFAULT_AUTO_SAVE_INTERVAL );
	}		}

	@@ -261,7 +263,7 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
	if( maximized )		if( maximized )
	Maximize();		Maximize();

	aCfg->Read( m_FrameName + entryPerspective, &m_perspective );		aCfg->Read( baseCfgName + entryPerspective, &m_perspective );
	}		}


	@@ -272,27 +274,29 @@ void EDA_BASE_FRAME::SaveSettings( wxConfigBase* aCfg )
	if( IsIconized() )		if( IsIconized() )
	return;		return;

			wxString baseCfgName = GetName();

	m_FrameSize = GetSize();		m_FrameSize = GetSize();
	m_FramePos = GetPosition();		m_FramePos = GetPosition();

	text = m_FrameName + wxT( "Pos_x" );		text = baseCfgName + wxT( "Pos_x" );
	aCfg->Write( text, (long) m_FramePos.x );		aCfg->Write( text, (long) m_FramePos.x );

	text = m_FrameName + wxT( "Pos_y" );		text = baseCfgName + wxT( "Pos_y" );
	aCfg->Write( text, (long) m_FramePos.y );		aCfg->Write( text, (long) m_FramePos.y );

	text = m_FrameName + wxT( "Size_x" );		text = baseCfgName + wxT( "Size_x" );
	aCfg->Write( text, (long) m_FrameSize.x );		aCfg->Write( text, (long) m_FrameSize.x );

	text = m_FrameName + wxT( "Size_y" );		text = baseCfgName + wxT( "Size_y" );
	aCfg->Write( text, (long) m_FrameSize.y );		aCfg->Write( text, (long) m_FrameSize.y );

	text = m_FrameName + wxT( "Maximized" );		text = baseCfgName + wxT( "Maximized" );
	aCfg->Write( text, IsMaximized() );		aCfg->Write( text, IsMaximized() );

	if( m_hasAutoSave )		if( m_hasAutoSave )
	{		{
	text = m_FrameName + entryAutoSaveInterval;		text = baseCfgName + entryAutoSaveInterval;
	aCfg->Write( text, m_autoSaveInterval );		aCfg->Write( text, m_autoSaveInterval );
	}		}

	@@ -303,7 +307,7 @@ void EDA_BASE_FRAME::SaveSettings( wxConfigBase* aCfg )

	// printf( "perspective(%s): %s\n",		// printf( "perspective(%s): %s\n",
	// TO_UTF8( m_FrameName + entryPerspective ), TO_UTF8( perspective ) );		// TO_UTF8( m_FrameName + entryPerspective ), TO_UTF8( perspective ) );
	aCfg->Write( m_FrameName + entryPerspective, perspective );		aCfg->Write( baseCfgName + entryPerspective, perspective );
	}		}

common/draw_frame.cpp

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -642,17 +642,19 @@ void EDA_DRAW_FRAME::LoadSettings( wxConfigBase* aCfg )
	{		{
	EDA_BASE_FRAME::LoadSettings( aCfg );		EDA_BASE_FRAME::LoadSettings( aCfg );

	aCfg->Read( m_FrameName + CursorShapeEntryKeyword, &m_cursorShape, ( long )0 );		wxString baseCfgName = GetName();

			aCfg->Read( baseCfgName + CursorShapeEntryKeyword, &m_cursorShape, ( long )0 );

	bool btmp;		bool btmp;
	if( aCfg->Read( m_FrameName + ShowGridEntryKeyword, &btmp ) )		if( aCfg->Read( baseCfgName + ShowGridEntryKeyword, &btmp ) )
	SetGridVisibility( btmp );		SetGridVisibility( btmp );

	int itmp;		int itmp;
	if( aCfg->Read( m_FrameName + GridColorEntryKeyword, &itmp ) )		if( aCfg->Read( baseCfgName + GridColorEntryKeyword, &itmp ) )
	SetGridColor( ColorFromInt( itmp ) );		SetGridColor( ColorFromInt( itmp ) );

	aCfg->Read( m_FrameName + LastGridSizeIdKeyword, &m_LastGridSizeId, 0L );		aCfg->Read( baseCfgName + LastGridSizeIdKeyword, &m_LastGridSizeId, 0L );

	// m_LastGridSizeId is an offset, expected to be >= 0		// m_LastGridSizeId is an offset, expected to be >= 0
	if( m_LastGridSizeId < 0 )		if( m_LastGridSizeId < 0 )
	@@ -664,10 +666,12 @@ void EDA_DRAW_FRAME::SaveSettings( wxConfigBase* aCfg )
	{		{
	EDA_BASE_FRAME::SaveSettings( aCfg );		EDA_BASE_FRAME::SaveSettings( aCfg );

	aCfg->Write( m_FrameName + CursorShapeEntryKeyword, m_cursorShape );		wxString baseCfgName = GetName();
	aCfg->Write( m_FrameName + ShowGridEntryKeyword, IsGridVisible() );
	aCfg->Write( m_FrameName + GridColorEntryKeyword, ( long ) GetGridColor() );		aCfg->Write( baseCfgName + CursorShapeEntryKeyword, m_cursorShape );
	aCfg->Write( m_FrameName + LastGridSizeIdKeyword, ( long ) m_LastGridSizeId );		aCfg->Write( baseCfgName + ShowGridEntryKeyword, IsGridVisible() );
			aCfg->Write( baseCfgName + GridColorEntryKeyword, ( long ) GetGridColor() );
			aCfg->Write( baseCfgName + LastGridSizeIdKeyword, ( long ) m_LastGridSizeId );
	}		}

common/hotkeys_basic.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -534,7 +534,7 @@ int EDA_BASE_FRAME::WriteHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList,
	}		}
	else		else
	{		{
	wxFileName fn( m_FrameName );		wxFileName fn( GetName() );
	fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );		fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
	wxConfigBase* config = GetNewConfig( fn.GetFullPath() );		wxConfigBase* config = GetNewConfig( fn.GetFullPath() );
	config->Write( HOTKEYS_CONFIG_KEY, msg );		config->Write( HOTKEYS_CONFIG_KEY, msg );
	@@ -604,7 +604,7 @@ void ReadHotkeyConfig( const wxString& Appname, struct EDA_HOTKEY_CONFIG* aDescL
	*/		*/
	int EDA_BASE_FRAME::ReadHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList )		int EDA_BASE_FRAME::ReadHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList )
	{		{
	::ReadHotkeyConfig( m_FrameName, aDescList );		::ReadHotkeyConfig( GetName(), aDescList );
	return 1;		return 1;
	}		}

cvpcb/class_DisplayFootprintsFrame.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,6 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( KIWAY* aKiway, CVPCB_MAINFRA
	wxDefaultPosition, wxDefaultSize,		wxDefaultPosition, wxDefaultSize,
	KICAD_DEFAULT_DRAWFRAME_STYLE, FOOTPRINTVIEWER_FRAME_NAME )		KICAD_DEFAULT_DRAWFRAME_STYLE, FOOTPRINTVIEWER_FRAME_NAME )
	{		{
	m_FrameName = FOOTPRINTVIEWER_FRAME_NAME;
	m_showAxis = true; // true to draw axis.		m_showAxis = true; // true to draw axis.

	// Give an icon		// Give an icon

cvpcb/cvframe.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,6 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
	KIWAY_PLAYER( aKiway, aParent, FRAME_CVPCB, wxT( "CvPCB" ), wxDefaultPosition,		KIWAY_PLAYER( aKiway, aParent, FRAME_CVPCB, wxT( "CvPCB" ), wxDefaultPosition,
	wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, CVPCB_MAINFRAME_NAME )		wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, CVPCB_MAINFRAME_NAME )
	{		{
	m_FrameName = CVPCB_MAINFRAME_NAME;
	m_compListBox = NULL;		m_compListBox = NULL;
	m_footprintListBox = NULL;		m_footprintListBox = NULL;
	m_libListBox = NULL;		m_libListBox = NULL;