From 2ed19668cd5d852a60115f00f4d5494a5a7cf31f Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Mon, 13 Nov 2017 18:38:51 +0100 Subject: [PATCH] Eeschema: removed protos.h Contained duplicated function declarations with invalid comments. --- eeschema/block.cpp | 2 +- eeschema/eeredraw.cpp | 2 +- eeschema/list_operations.h | 10 ++++- eeschema/operations_on_items_lists.cpp | 2 +- eeschema/protos.h | 56 -------------------------- eeschema/sch_line.cpp | 2 +- eeschema/sch_text.cpp | 2 +- eeschema/schedit.cpp | 2 +- eeschema/schematic_undo_redo.cpp | 2 +- 9 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 eeschema/protos.h diff --git a/eeschema/block.cpp b/eeschema/block.cpp index cc2e7236b2..b6d0d7824c 100644 --- a/eeschema/block.cpp +++ b/eeschema/block.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp index c2c25b96ee..ddcc6910d0 100644 --- a/eeschema/eeredraw.cpp +++ b/eeschema/eeredraw.cpp @@ -34,7 +34,7 @@ #include -void DrawDanglingSymbol( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& pos, COLOR4D Color ) +void DrawDanglingSymbol( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& pos, const COLOR4D& Color ) { BASE_SCREEN* screen = panel->GetScreen(); diff --git a/eeschema/list_operations.h b/eeschema/list_operations.h index f4584fc915..f421e861bf 100644 --- a/eeschema/list_operations.h +++ b/eeschema/list_operations.h @@ -24,7 +24,12 @@ #ifndef LIST_OPERATIONS_H #define LIST_OPERATIONS_H +namespace KIGFX { +class COLOR4D; +} + class wxPoint; +class wxDC; class EDA_DRAW_PANEL; class SCH_ITEM; class SCH_SCREEN; @@ -68,6 +73,9 @@ void DuplicateItemsInList( SCH_SCREEN* screen, PICKED_ITEMS_LIST& aItemsList, * (timestamp and sheet name) * aClone must be false. use true only is undo/redo duplications */ -SCH_ITEM* DuplicateStruct( SCH_ITEM* aDrawStruct, bool aClone ); +SCH_ITEM* DuplicateStruct( SCH_ITEM* aDrawStruct, bool aClone = false ); + +void DrawDanglingSymbol( EDA_DRAW_PANEL* panel, wxDC* DC, + const wxPoint& pos, const KIGFX::COLOR4D& Color ); #endif /* LIST_OPERATIONS_H */ diff --git a/eeschema/operations_on_items_lists.cpp b/eeschema/operations_on_items_lists.cpp index 8c1d934166..a470c5d6f7 100644 --- a/eeschema/operations_on_items_lists.cpp +++ b/eeschema/operations_on_items_lists.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/protos.h b/eeschema/protos.h deleted file mode 100644 index 441c36d16c..0000000000 --- a/eeschema/protos.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2007 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2014 KiCad Developers, see CHANGELOG.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 - */ - - -#ifndef __PROTOS_H__ -#define __PROTOS_H__ - -class EDA_DRAW_PANEL; -class PICKED_ITEMS_LIST; -class SCH_ITEM; - - -// operations_on_item_lists.cpp -void DeleteItemsInList( EDA_DRAW_PANEL* panel, PICKED_ITEMS_LIST& aItemsList ); - -/** - * Function DuplicateStruct - * creates a new copy of given struct. - * @param aDrawStruct = the SCH_ITEM to duplicate - * @param aClone (defualt = true) - * if true duplicate also some parameters that must be unique - * (timestamp and sheet name) - * aClone must be false. use true only is undo/redo duplications - */ -SCH_ITEM* DuplicateStruct( SCH_ITEM* DrawStruct, bool aClone = false ); - - -/****************/ -/* EEREDRAW.CPP */ -/****************/ -void DrawDanglingSymbol( EDA_DRAW_PANEL* panel, wxDC* DC, - const wxPoint& pos, COLOR4D Color ); - - -#endif /* __PROTOS_H__ */ diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index cac70ec01e..4e3246c2ab 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index b38400fa68..e94a183a35 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp index e33743b325..102f1fcbe7 100644 --- a/eeschema/schedit.cpp +++ b/eeschema/schedit.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp index ecc288bfb2..09a83a6bce 100644 --- a/eeschema/schematic_undo_redo.cpp +++ b/eeschema/schematic_undo_redo.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include