haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor code cleanup, step2: remove more useless include. 

fix also a minor compil warning
This commit is contained in:
jean-pierre charras 2020-10-01 15:39:34 +02:00
parent c7802e7ff8
commit f702da95c7
10 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/common.cpp
View File

@ -23,7 +23,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <fctsys.h>
#include <eda_base_frame.h>
#include <project.h>
#include <common.h>
@ -39,8 +38,6 @@
#include <boost/uuid/uuid_io.hpp>
#include <boost/functional/hash.hpp>
using KIGFX::COLOR4D;
// Create only once, as seeding is *very* expensive
static boost::uuids::random_generator randomGenerator;

46
common/plugins/cadstar/cadstar_archive_parser.h
View File

@ -29,7 +29,7 @@
#include <dsnlexer.h>
#include <macros.h>
#include <vector>
#include <wx/wx.h>
#include <wx/log.h>
#include <wx/xml/xml.h>
#include <xnode.h>
@ -443,7 +443,7 @@ public:
* boundary and defines how the text is displayed.
*
* For example, with an alignment of bottom-right the origin will be positioned at the bottom
* right of the text boundary. This makes it easier to right-align several text items
* right of the text boundary. This makes it easier to right-align several text items
* regardless of the length of text displayed.
*
* Text Alignment applies to all CADSTAR text. [...]
@ -451,7 +451,7 @@ public:
* Note: Unaligned text operates in the way CADSTAR text always has. In most cases this behaves
* as Bottom Left alignment, but there are a few exceptions, e.g. pin names. Also unaligned
* multiline text has an origin Bottom Left of the first line."
*
*
* See also JUSTIFICATION
*/
enum class ALIGNMENT
@ -472,8 +472,8 @@ public:
static ALIGNMENT ParseAlignment( XNODE* aNode );
/**
* @brief From CADSTAR Help: "Multi Line Text can also be justified as Left, Centre or Right.
* This does not affect the text alignment. Note: Justification of single line text has no
* @brief From CADSTAR Help: "Multi Line Text can also be justified as Left, Centre or Right.
* This does not affect the text alignment. Note: Justification of single line text has no
* effect."
*
* This only affects multiline text
@ -684,7 +684,7 @@ public:
* a component outline/area (or an area of component copper, or
* a string of component text) dependent on the current mirror
* status of the component.
*
*
* For example, you may require a string of component text to
* be displayed only when the component is mirrored."
*/
@ -1113,27 +1113,27 @@ public:
/**
* @brief Reads a CADSTAR Archive file (S-parameter format)
* @param aFileName
* @param aFileName
* @param aFileTypeIdentifier Identifier of the first node in the file to check against.
E.g. "CADSTARPCB"
* @return XNODE pointing to the top of the tree for further parsing. Each node has the first
* element as the node's name and subsequent elements as node attributes ("attr0",
* @return XNODE pointing to the top of the tree for further parsing. Each node has the first
* element as the node's name and subsequent elements as node attributes ("attr0",
* "attr1", "attr2", etc.). Caller is responsible for deleting to avoid memory leaks.
* @throws IO_ERROR
*/
static XNODE* LoadArchiveFile( const wxString& aFileName, const wxString& aFileTypeIdentifier );
/**
* @brief
* @param aAttribute
* @return
* @brief
* @param aAttribute
* @return
*/
static bool IsValidAttribute( wxXmlAttribute* aAttribute );
/**
* @brief
* @param aNode
* @param aID
* @brief
* @param aNode
* @param aID
* @param aIsRequired Prevents exception throwing if false.
* @return returns the value (wxString) of attribute "attrX" in aNode where 'X' is aID
* @throws IO_ERROR if attribute does not exist
@ -1142,9 +1142,9 @@ public:
XNODE* aNode, unsigned int aID, bool aIsRequired = true );
/**
* @brief
* @param aNode
* @param aID
* @brief
* @param aNode
* @param aID
* @param aIsRequired Prevents exception throwing if false.
* @return returns the value (long) of attribute "attrX" in aNode where 'X' is aID
* @throws IO_ERROR if attribute does not exist
@ -1152,15 +1152,15 @@ public:
static long GetXmlAttributeIDLong( XNODE* aNode, unsigned int aID, bool aIsRequired = true );
/**
* @brief
* @param aNode
* @brief
* @param aNode
* @throw IO_ERROR if a child node was found
*/
static void CheckNoChildNodes( XNODE* aNode );
/**
* @brief
* @param aNode
* @brief
* @param aNode
* @throw IO_ERROR if a node adjacent to aNode was found
*/
static void CheckNoNextNodes( XNODE* aNode );
@ -1168,7 +1168,7 @@ public:
/**
* @brief
* @param aNode with a child node containing an EVALUE
* @param aValueToParse
* @param aValueToParse
* @throw IO_ERROR if unable to parse or node is not an EVALUE
*/
static void ParseChildEValue( XNODE* aNode, EVALUE& aValueToParse );

1
eeschema/dialogs/dialog_plot_schematic.h
View File

@ -27,7 +27,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <fctsys.h>
#include <plotter.h>
#include <sch_screen.h>
#include <sch_edit_frame.h>

1
include/common.h
View File

@ -41,7 +41,6 @@
#include <wx/dir.h>
#include <richio.h>
#include <gal/color4d.h>
#include <atomic>
#include <limits>

2
include/eda_base_frame.h
View File

@ -41,8 +41,6 @@
#include <wx/aui/aui.h>
#include <wx/docview.h>
#include <wx/event.h>
#include <fctsys.h>
#include <common.h>
#include <layers_id_colors_and_visibility.h>
#include <frame_type.h>
#include <hotkeys_basic.h>

2
include/tool/tools_holder.h
View File

@ -25,8 +25,6 @@
#define TOOL_HOLDER_H
#include <vector>
#include <fctsys.h>
#include <common.h>
#include <tool/action_manager.h>
#include <tool/selection.h>
#include <tool/tool_action.h>

3
pcbnew/board_stackup_manager/stackup_predefined_prms.h
View File

@ -31,6 +31,9 @@
#include <wx/string.h>
#include <wx/arrstr.h>
#include <wx/colour.h>
#include <layers_id_colors_and_visibility.h>
#include <i18n_utility.h> // For _HKI definition

7
pcbnew/drc/drc_test_provider_matched_length.cpp
View File

@ -52,13 +52,13 @@ public:
{
}
virtual ~DRC_TEST_PROVIDER_MATCHED_LENGTH()
virtual ~DRC_TEST_PROVIDER_MATCHED_LENGTH()
{
}
virtual bool Run() override;
virtual const wxString GetName() const override
virtual const wxString GetName() const override
{
return "length";
};
@ -109,7 +109,8 @@ void test::DRC_TEST_PROVIDER_MATCHED_LENGTH::checkLengthViolations(
{
bool minViolation = false;
bool maxViolation = false;
int minLen, maxLen;
int minLen = 0;
int maxLen = 0;
if( aConstraint.GetValue().HasMin() && ent.total < aConstraint.GetValue().Min() )
{

1
pcbnew/netlist_reader/netlist_reader.h
View File

@ -32,7 +32,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <fctsys.h>
#include <macros.h>
#include <lib_id.h>

8
qa/pcbnew/test_libeval_compiler.cpp
View File

@ -21,6 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <wx/wx.h>
#include <unit_test_utils/unit_test_utils.h>
#include <layers_id_colors_and_visibility.h>
@ -40,11 +42,11 @@ struct EXPR_TO_TEST
using VAL = LIBEVAL::VALUE;
const static std::vector<EXPR_TO_TEST> simpleExpressions = {
const static std::vector<EXPR_TO_TEST> simpleExpressions = {
{ "10mm + 20 mm", false, VAL( 30e6 ) },
{ "3*(7+8)", false, VAL( 3 * ( 7 + 8 ) ) },
{ "3*(7+8)", false, VAL( 3 * ( 7 + 8 ) ) },
{ "3*7+8", false, VAL( 3 * 7 + 8 ) },
{ "(3*7)+8", false, VAL( 3 * 7 + 8 ) },
{ "(3*7)+8", false, VAL( 3 * 7 + 8 ) },
{ "10mm + 20)", true, VAL( 0 ) },
{ "1", false, VAL(1) },