Browse Source

Remove some extra semicolons

pull/5/merge
Marvin Schmidt 8 years ago
parent
commit
69974b73db
  1. 2
      3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
  2. 2
      3d-viewer/3d_cache/sg/sg_helpers.cpp
  3. 2
      3d-viewer/3d_cache/sg/sg_helpers.h
  4. 2
      3d-viewer/3d_cache/sg/sg_node.h
  5. 2
      3d-viewer/3d_cache/str_rsort.h
  6. 2
      3d-viewer/3d_canvas/eda_3d_canvas.h
  7. 2
      3d-viewer/3d_model_viewer/c3d_model_viewer.h
  8. 2
      3d-viewer/3d_viewer/eda_3d_viewer.h
  9. 4
      common/bitmap.cpp
  10. 4
      common/eagle_parser.cpp
  11. 2
      common/single_top.cpp
  12. 2
      common/view/view.cpp
  13. 6
      common/widgets/mathplot.cpp
  14. 2
      eeschema/dialogs/dialog_bom.cpp
  15. 2
      eeschema/pin_shape.cpp
  16. 2
      eeschema/plot_schematic_HPGL.cpp
  17. 2
      eeschema/sch_io_mgr.cpp
  18. 2
      eeschema/sch_io_mgr.h
  19. 2
      gerbview/class_gerber_draw_item.h
  20. 2
      include/class_draw_panel_gal.h
  21. 2
      include/geometry/rtree.h
  22. 2
      include/plugins/3dapi/ifsg_api.h
  23. 2
      include/plugins/3dapi/sg_types.h
  24. 4
      include/system/libcontext.h
  25. 2
      include/tool/tool_base.h
  26. 2
      include/tool/tool_dispatcher.h
  27. 2
      include/ttl/halfedge/hetraits.h
  28. 4
      include/ttl/halfedge/hetriang.h
  29. 2
      kicad/kicad.cpp
  30. 10
      pcb_calculator/UnitSelector.cpp
  31. 2
      pcbnew/class_drawsegment.cpp
  32. 2
      pcbnew/class_module.h
  33. 2
      pcbnew/class_netclass.h
  34. 2
      pcbnew/class_pad.h
  35. 2
      pcbnew/class_zone.cpp
  36. 2
      pcbnew/class_zone_settings.cpp
  37. 6
      pcbnew/dialogs/dialog_footprint_wizard_list.cpp
  38. 4
      pcbnew/exporters/export_gencad.cpp
  39. 2
      pcbnew/exporters/export_vrml.cpp
  40. 2
      pcbnew/moduleframe.cpp
  41. 2
      pcbnew/pcb_view.cpp
  42. 2
      pcbnew/pcb_view.h
  43. 2
      pcbnew/router/pns_kicad_iface.h
  44. 2
      pcbnew/router/pns_router.h
  45. 2
      pcbnew/tools/tool_event_utils.h
  46. 2
      pcbnew/tools/zone_create_helper.cpp
  47. 2
      plugins/3d/idf/s3d_plugin_idf.cpp
  48. 2
      plugins/3d/vrml/wrlfacet.cpp
  49. 2
      plugins/3d/vrml/x3d/x3d_ops.h
  50. 2
      polygon/clipper.cpp

2
3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h

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

2
3d-viewer/3d_cache/sg/sg_helpers.cpp

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

2
3d-viewer/3d_cache/sg/sg_helpers.h

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

2
3d-viewer/3d_cache/sg/sg_node.h

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

2
3d-viewer/3d_cache/str_rsort.h

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

2
3d-viewer/3d_canvas/eda_3d_canvas.h

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

2
3d-viewer/3d_model_viewer/c3d_model_viewer.h

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

2
3d-viewer/3d_viewer/eda_3d_viewer.h

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

4
common/bitmap.cpp

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

4
common/eagle_parser.cpp

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

2
common/single_top.cpp

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

2
common/view/view.cpp

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

6
common/widgets/mathplot.cpp

@ -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 ) :
mpScaleXBase( name, flags, ticks, type )
{
};
}
mpScaleXLog::mpScaleXLog( wxString name, int flags, bool ticks, unsigned int type ) :
mpScaleXBase( name, flags, ticks, type )
{
};
}
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));
// }
// Refresh(false);*/
};
}
bool mpWindow::UpdateBBox()
{

2
eeschema/dialogs/dialog_bom.cpp

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

2
eeschema/pin_shape.cpp

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

2
eeschema/plot_schematic_HPGL.cpp

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

2
eeschema/sch_io_mgr.cpp

@ -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 )

2
eeschema/sch_io_mgr.h

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

2
gerbview/class_gerber_draw_item.h

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

2
include/class_draw_panel_gal.h

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

2
include/geometry/rtree.h

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

2
include/plugins/3dapi/ifsg_api.h

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

2
include/plugins/3dapi/sg_types.h

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

4
include/system/libcontext.h

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

2
include/tool/tool_base.h

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

2
include/tool/tool_dispatcher.h

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

2
include/ttl/halfedge/hetraits.h

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

4
include/ttl/halfedge/hetriang.h

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

2
kicad/kicad.cpp

@ -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

10
pcb_calculator/UnitSelector.cpp

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

2
pcbnew/class_drawsegment.cpp

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

2
pcbnew/class_module.h

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

2
pcbnew/class_netclass.h

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

2
pcbnew/class_pad.h

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

2
pcbnew/class_zone.cpp

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

2
pcbnew/class_zone_settings.cpp

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

6
pcbnew/dialogs/dialog_footprint_wizard_list.cpp

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

4
pcbnew/exporters/export_gencad.cpp

@ -156,7 +156,7 @@ static std::string GenCADLayerName( int aCuCount, PCB_LAYER_ID aId )
return txt;
}
};
}
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 );
};
}
static wxString escapeString( const wxString& aString )

2
pcbnew/exporters/export_vrml.cpp

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

2
pcbnew/moduleframe.cpp

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

2
pcbnew/pcb_view.cpp

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

2
pcbnew/pcb_view.h

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

2
pcbnew/router/pns_kicad_iface.h

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

2
pcbnew/router/pns_router.h

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

2
pcbnew/tools/tool_event_utils.h

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

2
pcbnew/tools/zone_create_helper.cpp

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

2
plugins/3d/idf/s3d_plugin_idf.cpp

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

2
plugins/3d/vrml/wrlfacet.cpp

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

2
plugins/3d/vrml/x3d/x3d_ops.h

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

2
polygon/clipper.cpp

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

Loading…
Cancel
Save