Commit 0ba26e1d authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Remove unused EDA_ITEM list from BASE_SCREEN.

parent 3f15b9c0

common/base_screen.cpp

+0 −16
Original line number Diff line number Diff line
@@ -498,22 +498,6 @@ PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromRedoList( ) 
}





void BASE_SCREEN::AddItem( EDA_ITEM* aItem )

{

    wxCHECK_RET( aItem != NULL, wxT( "Attempt to add NULL item pointer to " ) + GetClass() +

                 wxT( "item list" ) );

    m_items.push_back( aItem );

}





void BASE_SCREEN::InsertItem( EDA_ITEMS::iterator aIter, EDA_ITEM* aItem )

{

    wxCHECK_RET( aItem != NULL, wxT( "Attempt to insert NULL item pointer to " ) + GetClass() +

                 wxT( "item list" ) );

    m_items.insert( aIter, aItem );

}





#if defined(DEBUG)



void BASE_SCREEN::Show( int nestLevel, std::ostream& os ) const

include/class_base_screen.h

+1 −13
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ typedef std::vector< GRID_TYPE > GRIDS; 
 */

class BASE_SCREEN : public EDA_ITEM

{

    EDA_ITEMS m_items;          ///< The drawing items associated with this screen.

//    EDA_ITEMS m_items;          ///< The drawing items associated with this screen.

    GRIDS     m_grids;          ///< List of valid grid sizes.

    EDA_ITEM* m_drawList;       ///< Object list for the screen.

    wxString  m_fileName;       ///< File used to load the screen.
@@ -446,18 +446,6 @@ public: 
        return wxT( "BASE_SCREEN" );

    }



    /**

     * Helpers for accessing the draw item list.

     */

    EDA_ITEMS::iterator Begin() { return m_items.begin(); }

    EDA_ITEMS::iterator End() { return m_items.end(); }

    virtual void AddItem( EDA_ITEM* aItem );

    virtual void InsertItem(  EDA_ITEMS::iterator aIter, EDA_ITEM* aItem );



    /**

     * Function IsBlockActive

     * returns true if a block command is in progress.

     */

    inline bool IsBlockActive() const { return !m_BlockLocate.IsIdle(); }



    void ClearBlockCommand() { m_BlockLocate.Clear(); }

include/class_sch_screen.h

+0 −7
Original line number Diff line number Diff line
@@ -449,13 +449,6 @@ public: 
     * @return The number of items in the pick list.

     */

    int UpdatePickList();



    virtual void AddItem( SCH_ITEM* aItem ) { BASE_SCREEN::AddItem( (EDA_ITEM*) aItem ); }



    virtual void InsertItem(  EDA_ITEMS::iterator aIter, SCH_ITEM* aItem )

    {

        BASE_SCREEN::InsertItem( aIter, (EDA_ITEM*) aItem );

    }

};