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

reverse throw() clauses to quiet SWIG errors

This commit is contained in:
Dick Hollenbeck 2012-11-27 13:57:38 -06:00
parent b065b37a1e
commit 5155c35a71
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/kicad_plugin.cpp
View File

@ -309,7 +309,7 @@ void PCB_IO::Save( const wxString& aFileName, BOARD* aBoard, PROPERTIES* aProper
} }
BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput ) throw( IO_ERROR, PARSE_ERROR ) BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput ) throw( PARSE_ERROR, IO_ERROR )
{ {
std::string input = TO_UTF8( aClipboardSourceInput ); std::string input = TO_UTF8( aClipboardSourceInput );

2
pcbnew/kicad_plugin.h
View File

@ -129,7 +129,7 @@ public:
void SetOutputFormatter( OUTPUTFORMATTER* aFormatter ) { m_out = aFormatter; } void SetOutputFormatter( OUTPUTFORMATTER* aFormatter ) { m_out = aFormatter; }
BOARD_ITEM* Parse( const wxString& aClipboardSourceInput ) BOARD_ITEM* Parse( const wxString& aClipboardSourceInput )
throw( IO_ERROR, PARSE_ERROR ); throw( PARSE_ERROR, IO_ERROR );
protected: protected:

4
pcbnew/pcb_plot_params.cpp
View File

@ -186,7 +186,7 @@ void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter,
void PCB_PLOT_PARAMS::Parse( PCB_PLOT_PARAMS_PARSER* aParser ) void PCB_PLOT_PARAMS::Parse( PCB_PLOT_PARAMS_PARSER* aParser )
throw( IO_ERROR, PARSE_ERROR ) throw( PARSE_ERROR, IO_ERROR )
{ {
aParser->Parse( this ); aParser->Parse( this );
} }
@ -310,7 +310,7 @@ PCB_PLOT_PARAMS_PARSER::PCB_PLOT_PARAMS_PARSER( char* aLine, const wxString& aSo
void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams )
throw( IO_ERROR, PARSE_ERROR ) throw( PARSE_ERROR, IO_ERROR )
{ {
T token; T token;
while( ( token = NextTok() ) != T_RIGHT ) while( ( token = NextTok() ) != T_RIGHT )

7
pcbnew/pcb_plot_params.h
View File

@ -41,8 +41,10 @@ class PCB_PLOT_PARAMS_PARSER : public PCB_PLOT_PARAMS_LEXER
public: public:
PCB_PLOT_PARAMS_PARSER( LINE_READER* aReader ); PCB_PLOT_PARAMS_PARSER( LINE_READER* aReader );
PCB_PLOT_PARAMS_PARSER( char* aLine, const wxString& aSource ); PCB_PLOT_PARAMS_PARSER( char* aLine, const wxString& aSource );
LINE_READER* GetReader() { return reader; }; LINE_READER* GetReader() { return reader; };
void Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) throw( IO_ERROR, PARSE_ERROR );
void Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) throw( PARSE_ERROR, IO_ERROR );
bool ParseBool(); bool ParseBool();
/** /**
@ -55,6 +57,7 @@ public:
int ParseInt( int aMin, int aMax ); int ParseInt( int aMin, int aMax );
}; };
/** /**
* Class PCB_PLOT_PARAMS * Class PCB_PLOT_PARAMS
* handles plot parameters and options when plotting/printing a board. * handles plot parameters and options when plotting/printing a board.
@ -180,7 +183,7 @@ public:
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl=0 ) void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl=0 )
const throw( IO_ERROR ); const throw( IO_ERROR );
void Parse( PCB_PLOT_PARAMS_PARSER* aParser ) throw( IO_ERROR, PARSE_ERROR ); void Parse( PCB_PLOT_PARAMS_PARSER* aParser ) throw( PARSE_ERROR, IO_ERROR );
bool operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const; bool operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const;
bool operator!=( const PCB_PLOT_PARAMS &aPcbPlotParams ) const; bool operator!=( const PCB_PLOT_PARAMS &aPcbPlotParams ) const;