From b436924380db1ca8a42ab01996f2136084487d0d Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 16 Mar 2014 18:40:23 +0100 Subject: [PATCH] Warning removal, patches from Camille 019 --- include/class_layer_box_selector.h | 2 +- include/hotkeys_basic.h | 7 ++++--- include/richio.h | 2 +- include/wxPcbStruct.h | 4 ++-- pcbnew/exporters/idf.cpp | 4 ++-- pcbnew/exporters/vrml_board.cpp | 2 +- pcbnew/exporters/vrml_board.h | 2 +- pcbnew/router/pns_line_placer.cpp | 2 ++ pcbnew/router/pns_line_placer.h | 2 +- pcbnew/tools/bright_box.cpp | 2 ++ pcbnew/tools/bright_box.h | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/class_layer_box_selector.h b/include/class_layer_box_selector.h index 27d19b8a18..4a130c8654 100644 --- a/include/class_layer_box_selector.h +++ b/include/class_layer_box_selector.h @@ -5,7 +5,7 @@ #include // EDA_COLOR_T definition #include -class EDA_HOTKEY_CONFIG; +struct EDA_HOTKEY_CONFIG; /* Basic class to build a layer list. * this is an basic abstract class to build a layer list selector. diff --git a/include/hotkeys_basic.h b/include/hotkeys_basic.h index f070441de4..80ffc0ad28 100644 --- a/include/hotkeys_basic.h +++ b/include/hotkeys_basic.h @@ -143,10 +143,11 @@ wxString ReturnKeyNameFromCommandId( EDA_HOTKEY** aList, int aCommandId ); */ int ReturnKeyCodeFromKeyName( const wxString& keyname ); -/* An helper enum for AddHotkeyName function - * In menus we can an a hot key, or an accelerator , or sometimes just a comment +/** + * An helper enum for AddHotkeyName function + * In menus we can add a hot key, or an accelerator , or sometimes just a comment * Hot keys can perform actions using the current mouse cursor position - * Accelerators performs the same action as the associated menu + * Accelerators perform the same action as the associated menu * A comment is used in tool tips for some tools (zoom ..) * to show the hot key that performs this action */ diff --git a/include/richio.h b/include/richio.h index 6440fda7b0..64c842fcb2 100644 --- a/include/richio.h +++ b/include/richio.h @@ -155,7 +155,7 @@ struct IO_ERROR // : std::exception /** - * Class PARSE_ERROR + * Struct PARSE_ERROR * contains a filename or source description, a problem input line, a line number, * a byte offset, and an error message which contains the the caller's report and his * call site information: CPP source file, function, and line number. diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h index 219c411523..f3a3367277 100644 --- a/include/wxPcbStruct.h +++ b/include/wxPcbStruct.h @@ -61,8 +61,8 @@ class BOARD_ITEM; class PCB_LAYER_BOX_SELECTOR; class NETLIST; class REPORTER; -class PARSE_ERROR; -class IO_ERROR; +struct PARSE_ERROR; +struct IO_ERROR; class FP_LIB_TABLE; /** diff --git a/pcbnew/exporters/idf.cpp b/pcbnew/exporters/idf.cpp index 21e4af1c9d..9ccf20eb22 100644 --- a/pcbnew/exporters/idf.cpp +++ b/pcbnew/exporters/idf.cpp @@ -568,8 +568,8 @@ bool IDF_BOARD::WriteDrills( void ) fprintf( layoutFile, ".DRILLED_HOLES\n" ); - std::list::iterator ds = drills.begin(); - std::list::iterator de = drills.end(); + std::list::iterator ds = drills.begin(); + std::list::iterator de = drills.end(); while( ds != de ) { diff --git a/pcbnew/exporters/vrml_board.cpp b/pcbnew/exporters/vrml_board.cpp index 4ef750278b..e8b13de36b 100644 --- a/pcbnew/exporters/vrml_board.cpp +++ b/pcbnew/exporters/vrml_board.cpp @@ -712,7 +712,7 @@ bool VRML_LAYER::Tesselate( VRML_LAYER* holes ) std::ostringstream ostr; ostr << "Tesselate():FAILED: " << holes->GetError(); error = ostr.str(); - return NULL; + return false; } if( Fault ) diff --git a/pcbnew/exporters/vrml_board.h b/pcbnew/exporters/vrml_board.h index aa7e935abe..9cb4a26f4f 100644 --- a/pcbnew/exporters/vrml_board.h +++ b/pcbnew/exporters/vrml_board.h @@ -58,7 +58,7 @@ #define M_PI4 ( M_PI / 4.0 ) #endif -struct GLUtesselator; +class GLUtesselator; struct VERTEX_3D { diff --git a/pcbnew/router/pns_line_placer.cpp b/pcbnew/router/pns_line_placer.cpp index a03183c45c..4b9b616f3e 100644 --- a/pcbnew/router/pns_line_placer.cpp +++ b/pcbnew/router/pns_line_placer.cpp @@ -31,6 +31,8 @@ using boost::optional; +const double PNS_LINE_PLACER::m_shoveLengthThreshold = 1.7; + PNS_LINE_PLACER::PNS_LINE_PLACER( PNS_NODE* aWorld ) { m_initial_direction = DIRECTION_45( DIRECTION_45::N ); diff --git a/pcbnew/router/pns_line_placer.h b/pcbnew/router/pns_line_placer.h index e4ab966e59..625e6451b2 100644 --- a/pcbnew/router/pns_line_placer.h +++ b/pcbnew/router/pns_line_placer.h @@ -111,7 +111,7 @@ public: PNS_NODE* GetCurrentNode() const; private: - static const double m_shoveLengthThreshold = 1.7; + static const double m_shoveLengthThreshold; bool handleViaPlacement( PNS_LINE& aHead ); diff --git a/pcbnew/tools/bright_box.cpp b/pcbnew/tools/bright_box.cpp index b0fd4aec81..ef76a91647 100644 --- a/pcbnew/tools/bright_box.cpp +++ b/pcbnew/tools/bright_box.cpp @@ -28,6 +28,8 @@ using namespace KIGFX; +const double BRIGHT_BOX::LineWidth = 100000.0; + BRIGHT_BOX::BRIGHT_BOX( BOARD_ITEM* aItem ) : EDA_ITEM( NOT_USED ), // this item is never added to a BOARD so it needs no type item( aItem ) diff --git a/pcbnew/tools/bright_box.h b/pcbnew/tools/bright_box.h index 14966db9ac..b963b0409c 100644 --- a/pcbnew/tools/bright_box.h +++ b/pcbnew/tools/bright_box.h @@ -54,7 +54,7 @@ public: private: static const int BrightBoxLayer = ITEM_GAL_LAYER( GP_OVERLAY ); static const KIGFX::COLOR4D BrightColor; - static const double LineWidth = 100000.0; + static const double LineWidth; BOARD_ITEM* item; };