diff --git a/common/common.cpp b/common/common.cpp index 8a5023a4b2..a806b042dd 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -23,7 +23,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include #include #include @@ -39,8 +38,6 @@ #include #include -using KIGFX::COLOR4D; - // Create only once, as seeding is *very* expensive static boost::uuids::random_generator randomGenerator; diff --git a/common/plugins/cadstar/cadstar_archive_parser.h b/common/plugins/cadstar/cadstar_archive_parser.h index 76db8f563e..5ccb1c2e6e 100644 --- a/common/plugins/cadstar/cadstar_archive_parser.h +++ b/common/plugins/cadstar/cadstar_archive_parser.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -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 ); diff --git a/eeschema/dialogs/dialog_plot_schematic.h b/eeschema/dialogs/dialog_plot_schematic.h index dea1fb1f05..857f569ecf 100644 --- a/eeschema/dialogs/dialog_plot_schematic.h +++ b/eeschema/dialogs/dialog_plot_schematic.h @@ -27,7 +27,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include #include #include #include diff --git a/include/common.h b/include/common.h index 7e951c7119..053597e270 100644 --- a/include/common.h +++ b/include/common.h @@ -41,7 +41,6 @@ #include #include -#include #include #include diff --git a/include/eda_base_frame.h b/include/eda_base_frame.h index e4ddb219a3..669012c67e 100644 --- a/include/eda_base_frame.h +++ b/include/eda_base_frame.h @@ -41,8 +41,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/include/tool/tools_holder.h b/include/tool/tools_holder.h index 3431f54a83..9b739c82ea 100644 --- a/include/tool/tools_holder.h +++ b/include/tool/tools_holder.h @@ -25,8 +25,6 @@ #define TOOL_HOLDER_H #include -#include -#include #include #include #include diff --git a/pcbnew/board_stackup_manager/stackup_predefined_prms.h b/pcbnew/board_stackup_manager/stackup_predefined_prms.h index 3a98690860..e375c49a0f 100644 --- a/pcbnew/board_stackup_manager/stackup_predefined_prms.h +++ b/pcbnew/board_stackup_manager/stackup_predefined_prms.h @@ -31,6 +31,9 @@ #include +#include +#include + #include #include // For _HKI definition diff --git a/pcbnew/drc/drc_test_provider_matched_length.cpp b/pcbnew/drc/drc_test_provider_matched_length.cpp index fb5fcb8245..76619ea044 100644 --- a/pcbnew/drc/drc_test_provider_matched_length.cpp +++ b/pcbnew/drc/drc_test_provider_matched_length.cpp @@ -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() ) { diff --git a/pcbnew/netlist_reader/netlist_reader.h b/pcbnew/netlist_reader/netlist_reader.h index b2d5a051a5..8669875895 100644 --- a/pcbnew/netlist_reader/netlist_reader.h +++ b/pcbnew/netlist_reader/netlist_reader.h @@ -32,7 +32,6 @@ #include -#include #include #include diff --git a/qa/pcbnew/test_libeval_compiler.cpp b/qa/pcbnew/test_libeval_compiler.cpp index 86fe1ce094..9f62d912ee 100644 --- a/qa/pcbnew/test_libeval_compiler.cpp +++ b/qa/pcbnew/test_libeval_compiler.cpp @@ -21,6 +21,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + #include #include @@ -40,11 +42,11 @@ struct EXPR_TO_TEST using VAL = LIBEVAL::VALUE; -const static std::vector simpleExpressions = { +const static std::vector 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) },