Eeschema: code cleaning, remove dead code and not used #define or#include in some cpp files. (11e2bdf1) · Commits · Elphel / kicad-source-mirror

eeschema/CMakeLists.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,6 @@ set( EESCHEMA_SRCS
		component_references_lister.cpp
		controle.cpp
		cross-probing.cpp
		database.cpp
		${EESCHEMA_DLGS}
		edit_component_in_schematic.cpp
		edit_bitmap.cpp

eeschema/database.cpp

deleted100644 → 0

+0 −132

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
		* Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version 2
		* of the License, or (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, you may find one here:
		* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
		* or you may search the http://www.gnu.org website for the version 2 license,
		* or you may write to the Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
		*/

		/**
		* @file database.cpp
		*/

		#include <fctsys.h>
		#include <confirm.h>
		#include <eda_doc.h>
		#include <kicad_string.h>
		#include <draw_frame.h>
		#include <macros.h>
		#include <protos.h>
		#include <class_library.h>
		#include <dialog_helpers.h>

		#include <boost/foreach.hpp>


		// Used in DataBaseGetName: this is a callback function for EDA_LIST_DIALOG
		// to display keywords and description of a component
		void DisplayCmpDocAndKeywords( wxString& aName, void* aData )
		{
		PART_LIBS* libs = (PART_LIBS*) aData;

		wxASSERT( libs );

		LIB_ALIAS* part = libs->FindLibraryEntry( aName );

		if( !part )
		return;

		aName = wxT( "Description: " ) + part->GetDescription();
		aName += wxT( "\nKey Words: " ) + part->GetKeyWords();
		}


		#if 0 // not used, should be wxFrame member for KIWAY and PROJECT access.

		/*
		* Displays a list of filtered components found in libraries for selection,
		* Keys is a list of keywords to filter components which do not match these keywords
		* If Keys is empty, list components that match BufName mask (with * and?)
		*
		* Returns the name of the selected component, or an empty string
		*/
		wxString DataBaseGetName( EDA_DRAW_FRAME* frame, wxString& Keys, wxString& BufName )
		{
		std::vector<wxArrayString> nameList;
		wxString msg;

		// BufName.MakeUpper();
		Keys.MakeUpper();

		/* Review the list of libraries for counting. */
		BOOST_FOREACH( PART_LIB& lib, PART_LIB::GetLibraryList() )
		{
		lib.SearchEntryNames( nameList, BufName, Keys );
		}

		if( nameList.empty() )
		{
		if( !BufName.IsEmpty() )
		{
		if( !Keys.IsEmpty() )
		{
		msg.Printf( _( "No components found matching name search criteria '%s' and key search criteria '%s'" ),
		GetChars( BufName ), GetChars( Keys ) );
		}
		else
		{
		msg.Printf( _( "No components found matching name search criteria '%s'" ),
		GetChars( BufName ) );
		}
		}
		else
		{
		if( !Keys.IsEmpty() )
		{
		msg.Printf( _( "No components found matching key search criteria '%s'" ),
		GetChars( Keys ) );
		}
		else
		{
		msg = _( "No components found matching" );
		}
		}

		DisplayInfoMessage( frame, msg );

		return wxEmptyString;
		}

		wxArrayString headers;
		headers.Add( _( "Component" ) );
		headers.Add( _( "Library" ) );

		// Show candidate list:
		wxString cmpname;

		EDA_LIST_DIALOG dlg( frame, _( "Select Component" ), headers, nameList, cmpname,
		DisplayCmpDocAndKeywords, true );

		if( dlg.ShowModal() != wxID_OK )
		return wxEmptyString;

		cmpname = dlg.GetTextSelection();
		return cmpname;
		}
		#endif

eeschema/find.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@
		#include <base_units.h>

		#include <general.h>
		#include <protos.h>
		#include <class_library.h>
		#include <lib_pin.h>
		#include <sch_marker.h>

eeschema/libedit.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@

		#include <eeschema_id.h>
		#include <general.h>
		#include <protos.h>
		#include <libeditframe.h>
		#include <class_library.h>
		#include <template_fieldnames.h>
		@@ -73,7 +72,7 @@ void LIB_EDIT_FRAME::DisplayLibInfos()
		void LIB_EDIT_FRAME::SelectActiveLibrary( PART_LIB* aLibrary )
		{
		if( !aLibrary )
		aLibrary = SelectLibraryFromList( this );
		aLibrary = SelectLibraryFromList();

		if( aLibrary )
		{

eeschema/libeditframe.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@
		#include <msgpanel.h>

		#include <general.h>
		#include <protos.h>
		#include <eeschema_id.h>
		#include <libeditframe.h>
		#include <class_library.h>

Admin message