Remove some extra semicolons

This commit is contained in:
Marvin Schmidt 2017-11-02 21:41:29 +01:00
parent 20f3cdaaea
commit 69974b73db
50 changed files with 63 additions and 63 deletions

View File

@ -35,6 +35,6 @@ namespace S3D
wxString& prevModelSelectDir, int& prevModelWildcard, MODULE_3D_SETTINGS* aModel ); wxString& prevModelSelectDir, int& prevModelWildcard, MODULE_3D_SETTINGS* aModel );
bool Configure3DPaths( wxWindow* aParent, S3D_FILENAME_RESOLVER* aResolver ); bool Configure3DPaths( wxWindow* aParent, S3D_FILENAME_RESOLVER* aResolver );
}; }
#endif // CACHE_DIALOGS_3D_H #endif // CACHE_DIALOGS_3D_H

View File

@ -362,7 +362,7 @@ bool S3D::degenerate( glm::dvec3* pts )
return true; return true;
return false; return false;
}; }
static void calcTriad( glm::dvec3* pts, glm::dvec3& tri ) static void calcTriad( glm::dvec3* pts, glm::dvec3& tri )

View File

@ -242,6 +242,6 @@ namespace S3D
// read an RGB color // read an RGB color
bool ReadColor( std::istream& aFile, SGCOLOR& aColor ); bool ReadColor( std::istream& aFile, SGCOLOR& aColor );
}; }
#endif // SG_HELPERS_H #endif // SG_HELPERS_H

View File

@ -66,7 +66,7 @@ namespace S3D
void FREE_SMESH( SMESH& aMesh); void FREE_SMESH( SMESH& aMesh);
void FREE_S3DMODEL( S3DMODEL& aModel ); void FREE_S3DMODEL( S3DMODEL& aModel );
}; }
/** /**

View File

@ -82,6 +82,6 @@ namespace S3D
} }
}; };
}; // end NAMESPACE } // end NAMESPACE
#endif // STR_RSORT_H #endif // STR_RSORT_H

View File

@ -161,7 +161,7 @@ class EDA_3D_CANVAS : public wxGLCanvas
void OnTimerTimeout_Redraw( wxTimerEvent& event ); void OnTimerTimeout_Redraw( wxTimerEvent& event );
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE()
private: private:

View File

@ -105,7 +105,7 @@ private:
void OnRightClick( wxMouseEvent &event ); void OnRightClick( wxMouseEvent &event );
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE()
private: private:

View File

@ -222,7 +222,7 @@ class EDA_3D_VIEWER : public KIWAY_PLAYER
*/ */
void RenderEngineChanged(); void RenderEngineChanged();
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE()
private: private:

View File

@ -132,7 +132,7 @@ wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId,
aMenu->Append( item ); aMenu->Append( item );
return item; return item;
}; }
wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId, wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId,
@ -153,4 +153,4 @@ wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId,
aMenu->Append( item ); aMenu->Append( item );
return item; return item;
}; }

View File

@ -934,7 +934,7 @@ ECONNECT::ECONNECT( wxXmlNode* aConnect )
gate = parseRequiredAttribute<string>( aConnect, "gate" ); gate = parseRequiredAttribute<string>( aConnect, "gate" );
pin = parseRequiredAttribute<string>( aConnect, "pin" ); pin = parseRequiredAttribute<string>( aConnect, "pin" );
pad = parseRequiredAttribute<string>( aConnect, "pad" ); pad = parseRequiredAttribute<string>( aConnect, "pad" );
}; }
EDEVICE::EDEVICE( wxXmlNode* aDevice ) EDEVICE::EDEVICE( wxXmlNode* aDevice )
@ -957,7 +957,7 @@ EDEVICE::EDEVICE( wxXmlNode* aDevice )
connectNode = connectNode->GetNext(); connectNode = connectNode->GetNext();
} }
}; }
EDEVICE_SET::EDEVICE_SET( wxXmlNode* aDeviceSet ) EDEVICE_SET::EDEVICE_SET( wxXmlNode* aDeviceSet )

View File

@ -202,7 +202,7 @@ struct APP_SINGLE_TOP : public wxApp
#endif #endif
}; };
IMPLEMENT_APP( APP_SINGLE_TOP ); IMPLEMENT_APP( APP_SINGLE_TOP )
bool PGM_SINGLE_TOP::OnPgmInit() bool PGM_SINGLE_TOP::OnPgmInit()

View File

@ -1397,4 +1397,4 @@ void VIEW::Update( VIEW_ITEM* aItem, int aUpdateFlags )
const int VIEW::TOP_LAYER_MODIFIER = -VIEW_MAX_LAYERS; const int VIEW::TOP_LAYER_MODIFIER = -VIEW_MAX_LAYERS;
}; }

View File

@ -1288,13 +1288,13 @@ mpScaleXBase::mpScaleXBase( wxString name, int flags, bool ticks, unsigned int t
mpScaleX::mpScaleX( wxString name, int flags, bool ticks, unsigned int type ) : mpScaleX::mpScaleX( wxString name, int flags, bool ticks, unsigned int type ) :
mpScaleXBase( name, flags, ticks, type ) mpScaleXBase( name, flags, ticks, type )
{ {
}; }
mpScaleXLog::mpScaleXLog( wxString name, int flags, bool ticks, unsigned int type ) : mpScaleXLog::mpScaleXLog( wxString name, int flags, bool ticks, unsigned int type ) :
mpScaleXBase( name, flags, ticks, type ) mpScaleXBase( name, flags, ticks, type )
{ {
}; }
void mpScaleXBase::Plot( wxDC& dc, mpWindow& w ) void mpScaleXBase::Plot( wxDC& dc, mpWindow& w )
@ -2701,7 +2701,7 @@ void mpWindow::SetMPScrollbars( bool status )
//// SetVirtualSize((int) (m_maxX - m_minX), (int) (m_maxY - m_minY)); //// SetVirtualSize((int) (m_maxX - m_minX), (int) (m_maxY - m_minY));
// } // }
// Refresh(false);*/ // Refresh(false);*/
}; }
bool mpWindow::UpdateBBox() bool mpWindow::UpdateBBox()
{ {

View File

@ -72,7 +72,7 @@ struct BOM_PLUGIN
*/ */
WX_DECLARE_OBJARRAY( BOM_PLUGIN, BOM_PLUGIN_ARRAY ); WX_DECLARE_OBJARRAY( BOM_PLUGIN, BOM_PLUGIN_ARRAY );
#include <wx/arrimpl.cpp> #include <wx/arrimpl.cpp>
WX_DEFINE_OBJARRAY( BOM_PLUGIN_ARRAY ); WX_DEFINE_OBJARRAY( BOM_PLUGIN_ARRAY )
/** /**
* Class BOM_CFG_READER_PARSER * Class BOM_CFG_READER_PARSER

View File

@ -101,4 +101,4 @@ BITMAP_DEF GetBitmap( GRAPHIC_PINSHAPE shape )
assert( !"Invalid pin shape" ); assert( !"Invalid pin shape" );
return 0; return 0;
}; }

View File

@ -93,7 +93,7 @@ static const wxChar* plot_sheet_list( int aSize )
} }
return ret; return ret;
}; }
void DIALOG_PLOT_SCHEMATIC::SetHPGLPenWidth() void DIALOG_PLOT_SCHEMATIC::SetHPGLPenWidth()

View File

@ -172,4 +172,4 @@ void SCH_IO_MGR::Save( SCH_FILE_T aFileType, const wxString& aFileName,
} }
DECLARE_ENUM_VECTOR( SCH_IO_MGR, SCH_FILE_T ); DECLARE_ENUM_VECTOR( SCH_IO_MGR, SCH_FILE_T )

View File

@ -60,7 +60,7 @@ public:
// ALTIUM, // ALTIUM,
// etc. // etc.
} ); } )
/** /**
* Return a #SCH_PLUGIN which the caller can use to import, export, save, or load * Return a #SCH_PLUGIN which the caller can use to import, export, save, or load

View File

@ -46,7 +46,7 @@ class GBR_DISPLAY_OPTIONS;
namespace KIGFX namespace KIGFX
{ {
class VIEW; class VIEW;
}; }
/* Shapes id for basic shapes ( .m_Shape member ) */ /* Shapes id for basic shapes ( .m_Shape member ) */

View File

@ -49,7 +49,7 @@ class WX_VIEW_CONTROLS;
class VIEW_CONTROLS; class VIEW_CONTROLS;
class PAINTER; class PAINTER;
class GAL_DISPLAY_OPTIONS; class GAL_DISPLAY_OPTIONS;
}; }
class EDA_DRAW_PANEL_GAL : public wxScrolledCanvas class EDA_DRAW_PANEL_GAL : public wxScrolledCanvas

View File

@ -822,7 +822,7 @@ bool RTREE_QUAL::Load( const char* a_fileName )
stream.Close(); stream.Close();
return result; return result;
}; }
RTREE_TEMPLATE RTREE_TEMPLATE

View File

@ -193,6 +193,6 @@ namespace S3D
* creates and initializes an SMESH struct * creates and initializes an SMESH struct
*/ */
SGLIB_API void Init3DMesh( SMESH& aMesh ); SGLIB_API void Init3DMesh( SMESH& aMesh );
}; }
#endif // IFSG_API_H #endif // IFSG_API_H

View File

@ -44,6 +44,6 @@ namespace S3D
SGTYPE_SHAPE, SGTYPE_SHAPE,
SGTYPE_END SGTYPE_END
}; };
}; }
#endif // SG_TYPES_H #endif // SG_TYPES_H

View File

@ -85,11 +85,11 @@ fcontext_t LIBCONTEXT_CALL_CONVENTION make_fcontext( void* sp, size_t size,
void (* fn)( intptr_t ) ); void (* fn)( intptr_t ) );
#ifdef __cplusplus #ifdef __cplusplus
}; // namespace } // namespace
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
}; // extern "C" } // extern "C"
#endif #endif
#endif #endif

View File

@ -42,7 +42,7 @@ namespace KIGFX
{ {
class VIEW; class VIEW;
class VIEW_CONTROLS; class VIEW_CONTROLS;
}; }
enum TOOL_TYPE enum TOOL_TYPE
{ {

View File

@ -36,7 +36,7 @@ class ACTIONS;
namespace KIGFX namespace KIGFX
{ {
class VIEW; class VIEW;
}; }
/** /**
* Class TOOL_DISPATCHER * Class TOOL_DISPATCHER

View File

@ -184,6 +184,6 @@ struct TTLtraits
//@} // End of Geometric Predicates Group //@} // End of Geometric Predicates Group
}; };
}; // End of hed namespace } // End of hed namespace
#endif #endif

View File

@ -61,7 +61,7 @@ class CN_CLUSTER;
namespace ttl namespace ttl
{ {
class TRIANGULATION_HELPER; class TRIANGULATION_HELPER;
}; }
/** /**
* The half-edge data structure * The half-edge data structure
@ -426,6 +426,6 @@ public:
friend class ttl::TRIANGULATION_HELPER; friend class ttl::TRIANGULATION_HELPER;
}; };
}; // End of hed namespace } // End of hed namespace
#endif #endif

View File

@ -262,7 +262,7 @@ struct APP_KICAD : public wxApp
} }
}; };
IMPLEMENT_APP( APP_KICAD ); IMPLEMENT_APP( APP_KICAD )
// The C++ project manager supports one open PROJECT, so Prj() calls within // The C++ project manager supports one open PROJECT, so Prj() calls within

View File

@ -40,7 +40,7 @@ UNIT_SELECTOR_LEN::UNIT_SELECTOR_LEN( wxWindow *parent, wxWindowID id,
Append( _( "cm" ) ); Append( _( "cm" ) );
Append( _( "mil" ) ); Append( _( "mil" ) );
Append( _( "inch" ) ); Append( _( "inch" ) );
}; }
/* /*
@ -73,7 +73,7 @@ UNIT_SELECTOR_THICKNESS::UNIT_SELECTOR_THICKNESS( wxWindow *parent, wxWindowID i
Append( _( "mil" ) ); Append( _( "mil" ) );
Append( _( "inch" ) ); Append( _( "inch" ) );
Append( _( "oz/ft^2" ) ); Append( _( "oz/ft^2" ) );
}; }
/* /*
@ -105,7 +105,7 @@ UNIT_SELECTOR_FREQUENCY::UNIT_SELECTOR_FREQUENCY( wxWindow *parent, wxWindowID i
Append( _( "MHz" ) ); Append( _( "MHz" ) );
Append( _( "KHz" ) ); Append( _( "KHz" ) );
Append( _( "Hz" ) ); Append( _( "Hz" ) );
}; }
/* /*
* Function GetUnitScale * Function GetUnitScale
@ -132,7 +132,7 @@ UNIT_SELECTOR_ANGLE::UNIT_SELECTOR_ANGLE( wxWindow *parent, wxWindowID id,
{ {
Append( _( "Radian" ) ); Append( _( "Radian" ) );
Append( _( "Degree" ) ); Append( _( "Degree" ) );
}; }
/* /*
* Function GetUnitScale * Function GetUnitScale
@ -157,7 +157,7 @@ UNIT_SELECTOR_RESISTOR::UNIT_SELECTOR_RESISTOR( wxWindow *parent, wxWindowID id,
{ {
Append( _( "Ohm" ) ); Append( _( "Ohm" ) );
Append( _( "KOhm" ) ); Append( _( "KOhm" ) );
}; }
/* /*

View File

@ -102,7 +102,7 @@ void DRAWSEGMENT::Rotate( const wxPoint& aRotCentre, double aAngle )
+ ShowShape( m_Shape ) ) ); + ShowShape( m_Shape ) ) );
break; break;
} }
}; }
void DRAWSEGMENT::Flip( const wxPoint& aCentre ) void DRAWSEGMENT::Flip( const wxPoint& aCentre )
{ {

View File

@ -56,7 +56,7 @@ class MSG_PANEL_ITEM;
namespace KIGFX { namespace KIGFX {
class VIEW; class VIEW;
}; }
enum INCLUDE_NPTH_T enum INCLUDE_NPTH_T
{ {

View File

@ -219,7 +219,7 @@ public:
DECL_SPTR_FOR_SWIG( NETCLASSPTR, NETCLASS ) DECL_SPTR_FOR_SWIG( NETCLASSPTR, NETCLASS )
DECL_MAP_FOR_SWIG( NETCLASS_MAP, wxString, NETCLASSPTR ); DECL_MAP_FOR_SWIG( NETCLASS_MAP, wxString, NETCLASSPTR )
/** /**

View File

@ -57,7 +57,7 @@ class MSG_PANEL_INFO;
namespace KIGFX namespace KIGFX
{ {
class VIEW; class VIEW;
}; }
// Helper class to store parameters used to draw a pad // Helper class to store parameters used to draw a pad
class PAD_DRAWINFO class PAD_DRAWINFO

View File

@ -655,7 +655,7 @@ void ZONE_CONTAINER::SetCornerRadius( unsigned int aRadius )
m_cornerRadius = aRadius; m_cornerRadius = aRadius;
if( m_cornerRadius > (unsigned int) Mils2iu( MAX_ZONE_CORNER_RADIUS_MILS ) ) if( m_cornerRadius > (unsigned int) Mils2iu( MAX_ZONE_CORNER_RADIUS_MILS ) )
m_cornerRadius = Mils2iu( MAX_ZONE_CORNER_RADIUS_MILS ); m_cornerRadius = Mils2iu( MAX_ZONE_CORNER_RADIUS_MILS );
}; }
bool ZONE_CONTAINER::HitTest( const wxPoint& aPosition ) const bool ZONE_CONTAINER::HitTest( const wxPoint& aPosition ) const

View File

@ -142,4 +142,4 @@ void ZONE_SETTINGS::SetCornerRadius( int aRadius )
m_cornerRadius = 0; m_cornerRadius = 0;
else else
m_cornerRadius = aRadius; m_cornerRadius = aRadius;
}; }

View File

@ -39,9 +39,9 @@
#include <python_scripting.h> #include <python_scripting.h>
#else #else
// Dummy functions, actually defined in python_scripting.h when KICAD_SCRIPTING is enabled // Dummy functions, actually defined in python_scripting.h when KICAD_SCRIPTING is enabled
static void pcbnewGetWizardsBackTrace( wxString& aText ) {}; static void pcbnewGetWizardsBackTrace( wxString& aText ) {}
static void pcbnewGetScriptsSearchPaths( wxString& aText ) {}; static void pcbnewGetScriptsSearchPaths( wxString& aText ) {}
static void pcbnewGetUnloadableScriptNames( wxString& aText ) {}; static void pcbnewGetUnloadableScriptNames( wxString& aText ) {}
#endif #endif
enum FPGeneratorRowNames enum FPGeneratorRowNames

View File

@ -156,7 +156,7 @@ static std::string GenCADLayerName( int aCuCount, PCB_LAYER_ID aId )
return txt; return txt;
} }
}; }
static const PCB_LAYER_ID gc_seq[] = { static const PCB_LAYER_ID gc_seq[] = {
@ -204,7 +204,7 @@ static std::string GenCADLayerNameFlipped( int aCuCount, PCB_LAYER_ID aId )
} }
return GenCADLayerName( aCuCount, aId ); return GenCADLayerName( aCuCount, aId );
}; }
static wxString escapeString( const wxString& aString ) static wxString escapeString( const wxString& aString )

View File

@ -1618,7 +1618,7 @@ static SGNODE* getSGColor( VRML_COLOR_INDEX colorIdx )
sgmaterial[colorIdx] = vcolor.GetRawPtr(); sgmaterial[colorIdx] = vcolor.GetRawPtr();
return sgmaterial[colorIdx]; return sgmaterial[colorIdx];
}; }
static void create_vrml_plane( IFSG_TRANSFORM& PcbOutput, VRML_COLOR_INDEX colorID, static void create_vrml_plane( IFSG_TRANSFORM& PcbOutput, VRML_COLOR_INDEX colorID,

View File

@ -398,7 +398,7 @@ const wxString FOOTPRINT_EDIT_FRAME::getLibPath()
const wxString FOOTPRINT_EDIT_FRAME::GetCurrentLib() const const wxString FOOTPRINT_EDIT_FRAME::GetCurrentLib() const
{ {
return Prj().GetRString( PROJECT::PCB_LIB_NICKNAME ); return Prj().GetRString( PROJECT::PCB_LIB_NICKNAME );
}; }
void FOOTPRINT_EDIT_FRAME::retainLastFootprint() void FOOTPRINT_EDIT_FRAME::retainLastFootprint()

View File

@ -107,4 +107,4 @@ void PCB_VIEW::UpdateDisplayOptions( PCB_DISPLAY_OPTIONS* aOptions )
settings->LoadDisplayOptions( aOptions ); settings->LoadDisplayOptions( aOptions );
} }
}; }

View File

@ -59,6 +59,6 @@ private:
PCB_LAYER_ID m_routeLayerBottom; PCB_LAYER_ID m_routeLayerBottom;
}; };
}; }
#endif #endif

View File

@ -37,7 +37,7 @@ class PCB_TOOL;
namespace KIGFX namespace KIGFX
{ {
class VIEW; class VIEW;
}; }
class PNS_KICAD_IFACE : public PNS::ROUTER_IFACE { class PNS_KICAD_IFACE : public PNS::ROUTER_IFACE {
public: public:

View File

@ -42,7 +42,7 @@ namespace KIGFX
class VIEW; class VIEW;
class VIEW_GROUP; class VIEW_GROUP;
}; }
namespace PNS { namespace PNS {

View File

@ -72,6 +72,6 @@ namespace TOOL_EVT_UTILS
*/ */
int GetEventRotationAngle( const PCB_BASE_EDIT_FRAME& aFrame, int GetEventRotationAngle( const PCB_BASE_EDIT_FRAME& aFrame,
const TOOL_EVENT& aEvt ); const TOOL_EVENT& aEvt );
}; }
#endif // TOOL_EVENT_UTILS_H #endif // TOOL_EVENT_UTILS_H

View File

@ -181,7 +181,7 @@ void ZONE_CREATE_HELPER::commitZone( std::unique_ptr<ZONE_CONTAINER> aZone )
break; break;
} }
} }
}; }
bool ZONE_CREATE_HELPER::OnFirstPoint() bool ZONE_CREATE_HELPER::OnFirstPoint()

View File

@ -169,7 +169,7 @@ static SGNODE* getColor( IFSG_SHAPE& shape, int colorIdx )
cidx = 1; cidx = 1;
return material.GetRawPtr(); return material.GetRawPtr();
}; }
const char* GetKicadPluginName( void ) const char* GetKicadPluginName( void )

View File

@ -62,7 +62,7 @@ static bool VDegenerate( glm::vec3* pts )
return true; return true;
return false; return false;
}; }
static WRLVEC3F VCalcTriNorm( const WRLVEC3F& p1, const WRLVEC3F& p2, const WRLVEC3F& p3 ) static WRLVEC3F VCalcTriNorm( const WRLVEC3F& p1, const WRLVEC3F& p2, const WRLVEC3F& p3 )

View File

@ -48,7 +48,7 @@ namespace X3D
bool ParseSFVec3( const wxString& aSource, WRLVEC3F& aResult ); bool ParseSFVec3( const wxString& aSource, WRLVEC3F& aResult );
bool ParseSFRotation( const wxString& aSource, WRLROTATION& aResult ); bool ParseSFRotation( const wxString& aSource, WRLROTATION& aResult );
}; }
#endif // X3D_OPS_H #endif // X3D_OPS_H

View File

@ -429,7 +429,7 @@ Int128 Int128Mul( long64 lhs, long64 rhs )
tmp = -tmp; tmp = -tmp;
return tmp; return tmp;
}; }
#endif #endif
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------