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

Removed all exception specifiers since deprecated. 

Exception specifiers are deprecated in cpp11, so went through them all
and removed them from the code.
This commit is contained in:
Kristoffer Ödmark 2017-06-08 23:47:21 +02:00 committed by Wayne Stambaugh
parent 8590a22995
commit 19d5cc7548
75 changed files with 515 additions and 671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -40,6 +40,7 @@ Mario Luzeiro <mrluzeiro[at]ua-dot-pt>
Mateusz Skowroński <skowri[at]gmail-dot-com> Mateusz Skowroński <skowri[at]gmail-dot-com>
Cheng Sheng <chengsheng[at]google-dot-com> Cheng Sheng <chengsheng[at]google-dot-com>
Google Inc. Google Inc.
Kristoffer Ödmark <kristoffer.odmark90[at]gmail-dot-com>
See also CHANGELOG.txt for contributors. See also CHANGELOG.txt for contributors.

2
Documentation/development/coding-style-policy.md
View File

@ -223,7 +223,7 @@ leading sentence in the doxygen html output. The chosen format is
* @throw IO_ERROR, if there is a problem outputting, such asisk. * @throw IO_ERROR, if there is a problem outputting, such asisk.
*/ */
int PRINTF_FUNC Print( int nestLevel, int PRINTF_FUNC Print( int nestLevel,
const char* fmt, ... ) const char* fmt, ... );
~~~~~~~~~~~~~ ~~~~~~~~~~~~~
The “Function \<name\>” text goes on the 2nd line of the comment. The The “Function \<name\>” text goes on the 2nd line of the comment. The

3
common/class_page_info.cpp
View File

@ -45,7 +45,7 @@ const wxChar PAGE_INFO::A2[] = wxT( "A2" );
const wxChar PAGE_INFO::A1[] = wxT( "A1" ); const wxChar PAGE_INFO::A1[] = wxT( "A1" );
const wxChar PAGE_INFO::A0[] = wxT( "A0" ); const wxChar PAGE_INFO::A0[] = wxT( "A0" );
const wxChar PAGE_INFO::A[] = wxT( "A" ); const wxChar PAGE_INFO::A[] = wxT( "A" );
const wxChar PAGE_INFO::B[] = wxT( "B" ) ; const wxChar PAGE_INFO::B[] = wxT( "B" );
const wxChar PAGE_INFO::C[] = wxT( "C" ); const wxChar PAGE_INFO::C[] = wxT( "C" );
const wxChar PAGE_INFO::D[] = wxT( "D" ); const wxChar PAGE_INFO::D[] = wxT( "D" );
const wxChar PAGE_INFO::E[] = wxT( "E" ); const wxChar PAGE_INFO::E[] = wxT( "E" );
@ -265,7 +265,6 @@ void PAGE_INFO::SetHeightMils( int aHeightInMils )
void PAGE_INFO::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void PAGE_INFO::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
throw( IO_ERROR )
{ {
aFormatter->Print( aNestLevel, "(page %s", aFormatter->Quotew( GetType() ).c_str() ); aFormatter->Print( aNestLevel, "(page %s", aFormatter->Quotew( GetType() ).c_str() );

24
common/dsnlexer.cpp
View File

@ -350,7 +350,7 @@ bool DSNLEXER::IsSymbol( int aTok )
} }
void DSNLEXER::Expecting( int aTok ) throw( IO_ERROR ) void DSNLEXER::Expecting( int aTok )
{ {
wxString errText = wxString::Format( wxString errText = wxString::Format(
_("Expecting '%s'"), GetChars( GetTokenString( aTok ) ) ); _("Expecting '%s'"), GetChars( GetTokenString( aTok ) ) );
@ -358,7 +358,7 @@ void DSNLEXER::Expecting( int aTok ) throw( IO_ERROR )
} }
void DSNLEXER::Expecting( const char* text ) throw( IO_ERROR ) void DSNLEXER::Expecting( const char* text )
{ {
wxString errText = wxString::Format( wxString errText = wxString::Format(
_("Expecting '%s'"), GetChars( wxString::FromUTF8( text ) ) ); _("Expecting '%s'"), GetChars( wxString::FromUTF8( text ) ) );
@ -366,7 +366,7 @@ void DSNLEXER::Expecting( const char* text ) throw( IO_ERROR )
} }
void DSNLEXER::Unexpected( int aTok ) throw( IO_ERROR ) void DSNLEXER::Unexpected( int aTok )
{ {
wxString errText = wxString::Format( wxString errText = wxString::Format(
_("Unexpected '%s'"), GetChars( GetTokenString( aTok ) ) ); _("Unexpected '%s'"), GetChars( GetTokenString( aTok ) ) );
@ -374,7 +374,7 @@ void DSNLEXER::Unexpected( int aTok ) throw( IO_ERROR )
} }
void DSNLEXER::Duplicate( int aTok ) throw( IO_ERROR ) void DSNLEXER::Duplicate( int aTok )
{ {
wxString errText = wxString::Format( wxString errText = wxString::Format(
_("%s is a duplicate"), GetTokenString( aTok ).GetData() ); _("%s is a duplicate"), GetTokenString( aTok ).GetData() );
@ -382,7 +382,7 @@ void DSNLEXER::Duplicate( int aTok ) throw( IO_ERROR )
} }
void DSNLEXER::Unexpected( const char* text ) throw( IO_ERROR ) void DSNLEXER::Unexpected( const char* text )
{ {
wxString errText = wxString::Format( wxString errText = wxString::Format(
_("Unexpected '%s'"), GetChars( wxString::FromUTF8( text ) ) ); _("Unexpected '%s'"), GetChars( wxString::FromUTF8( text ) ) );
@ -390,7 +390,7 @@ void DSNLEXER::Unexpected( const char* text ) throw( IO_ERROR )
} }
void DSNLEXER::NeedLEFT() throw( IO_ERROR ) void DSNLEXER::NeedLEFT()
{ {
int tok = NextTok(); int tok = NextTok();
if( tok != DSN_LEFT ) if( tok != DSN_LEFT )
@ -398,7 +398,7 @@ void DSNLEXER::NeedLEFT() throw( IO_ERROR )
} }
void DSNLEXER::NeedRIGHT() throw( IO_ERROR ) void DSNLEXER::NeedRIGHT()
{ {
int tok = NextTok(); int tok = NextTok();
if( tok != DSN_RIGHT ) if( tok != DSN_RIGHT )
@ -406,7 +406,7 @@ void DSNLEXER::NeedRIGHT() throw( IO_ERROR )
} }
int DSNLEXER::NeedSYMBOL() throw( IO_ERROR ) int DSNLEXER::NeedSYMBOL()
{ {
int tok = NextTok(); int tok = NextTok();
if( !IsSymbol( tok ) ) if( !IsSymbol( tok ) )
@ -415,7 +415,7 @@ int DSNLEXER::NeedSYMBOL() throw( IO_ERROR )
} }
int DSNLEXER::NeedSYMBOLorNUMBER() throw( IO_ERROR ) int DSNLEXER::NeedSYMBOLorNUMBER()
{ {
int tok = NextTok(); int tok = NextTok();
if( !IsSymbol( tok ) && tok!=DSN_NUMBER ) if( !IsSymbol( tok ) && tok!=DSN_NUMBER )
@ -424,7 +424,7 @@ int DSNLEXER::NeedSYMBOLorNUMBER() throw( IO_ERROR )
} }
int DSNLEXER::NeedNUMBER( const char* aExpectation ) throw( IO_ERROR ) int DSNLEXER::NeedNUMBER( const char* aExpectation )
{ {
int tok = NextTok(); int tok = NextTok();
if( tok != DSN_NUMBER ) if( tok != DSN_NUMBER )
@ -537,7 +537,7 @@ static bool isNumber( const char* cp, const char* limit )
} }
int DSNLEXER::NextTok() throw( IO_ERROR ) int DSNLEXER::NextTok()
{ {
const char* cur = next; const char* cur = next;
const char* head = cur; const char* head = cur;
@ -808,7 +808,7 @@ exit: // single point of exit, no returns elsewhere please.
} }
wxArrayString* DSNLEXER::ReadCommentLines() throw( IO_ERROR ) wxArrayString* DSNLEXER::ReadCommentLines()
{ {
wxArrayString* ret = 0; wxArrayString* ret = 0;
bool cmt_setting = SetCommentsAreTokens( true ); bool cmt_setting = SetCommentsAreTokens( true );

1
common/eda_text.cpp
View File

@ -428,7 +428,6 @@ bool EDA_TEXT::IsDefaultFormatting() const
void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void EDA_TEXT::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
throw( IO_ERROR )
{ {
#ifndef GERBVIEW // Gerbview does not use EDA_TEXT::Format #ifndef GERBVIEW // Gerbview does not use EDA_TEXT::Format
// and does not define FMT_IU, used here // and does not define FMT_IU, used here

4
common/filter_reader.cpp
View File

@ -49,7 +49,7 @@ FILTER_READER::~FILTER_READER()
} }
char* FILTER_READER::ReadLine() throw( IO_ERROR ) char* FILTER_READER::ReadLine()
{ {
char* s; char* s;
@ -87,7 +87,7 @@ WHITESPACE_FILTER_READER::~WHITESPACE_FILTER_READER()
} }
char* WHITESPACE_FILTER_READER::ReadLine() throw( IO_ERROR ) char* WHITESPACE_FILTER_READER::ReadLine()
{ {
char* s; char* s;

3
common/fp_lib_table.cpp
View File

@ -215,7 +215,6 @@ void FP_LIB_TABLE::PrefetchLib( const wxString& aNickname )
const FP_LIB_TABLE_ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname ) const FP_LIB_TABLE_ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname )
throw( IO_ERROR )
{ {
FP_LIB_TABLE_ROW* row = dynamic_cast< FP_LIB_TABLE_ROW* >( findRow( aNickname ) ); FP_LIB_TABLE_ROW* row = dynamic_cast< FP_LIB_TABLE_ROW* >( findRow( aNickname ) );
@ -329,7 +328,6 @@ void FP_LIB_TABLE::FootprintLibCreate( const wxString& aNickname )
MODULE* FP_LIB_TABLE::FootprintLoadWithOptionalNickname( const LIB_ID& aFootprintId ) MODULE* FP_LIB_TABLE::FootprintLoadWithOptionalNickname( const LIB_ID& aFootprintId )
throw( IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception )
{ {
wxString nickname = FROM_UTF8( aFootprintId.GetLibNickname() ); wxString nickname = FROM_UTF8( aFootprintId.GetLibNickname() );
wxString fpname = FROM_UTF8( aFootprintId.GetLibItemName() ); wxString fpname = FROM_UTF8( aFootprintId.GetLibItemName() );
@ -367,7 +365,6 @@ const wxString FP_LIB_TABLE::GlobalPathEnvVariableName()
bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable ) bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable )
throw (IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception )
{ {
bool tableExists = true; bool tableExists = true;
wxFileName fn = GetGlobalTableFileName(); wxFileName fn = GetGlobalTableFileName();

5
common/lib_id.cpp
View File

@ -175,7 +175,7 @@ int LIB_ID::Parse( const UTF8& aId )
} }
LIB_ID::LIB_ID( const std::string& aId ) throw( PARSE_ERROR ) LIB_ID::LIB_ID( const std::string& aId )
{ {
int offset = Parse( aId ); int offset = Parse( aId );
@ -190,7 +190,7 @@ LIB_ID::LIB_ID( const std::string& aId ) throw( PARSE_ERROR )
} }
LIB_ID::LIB_ID( const wxString& aId ) throw( PARSE_ERROR ) LIB_ID::LIB_ID( const wxString& aId )
{ {
UTF8 id = TO_UTF8( aId ); UTF8 id = TO_UTF8( aId );
@ -297,7 +297,6 @@ UTF8 LIB_ID::GetLibItemNameAndRev() const
UTF8 LIB_ID::Format( const UTF8& aLogicalLib, const UTF8& aLibItemName, const UTF8& aRevision ) UTF8 LIB_ID::Format( const UTF8& aLogicalLib, const UTF8& aLibItemName, const UTF8& aRevision )
throw( PARSE_ERROR )
{ {
UTF8 ret; UTF8 ret;
int offset; int offset;

3
common/lib_table_base.cpp
View File

@ -357,7 +357,7 @@ bool LIB_TABLE::InsertRow( LIB_TABLE_ROW* aRow, bool doReplace )
void LIB_TABLE::Load( const wxString& aFileName ) void LIB_TABLE::Load( const wxString& aFileName )
throw( IO_ERROR )
{ {
// It's OK if footprint library tables are missing. // It's OK if footprint library tables are missing.
if( wxFileName::IsFileReadable( aFileName ) ) if( wxFileName::IsFileReadable( aFileName ) )
@ -371,7 +371,6 @@ void LIB_TABLE::Load( const wxString& aFileName )
void LIB_TABLE::Save( const wxString& aFileName ) const void LIB_TABLE::Save( const wxString& aFileName ) const
throw( IO_ERROR, boost::interprocess::lock_exception )
{ {
FILE_OUTPUTFORMATTER sf( aFileName ); FILE_OUTPUTFORMATTER sf( aFileName );
Format( &sf, 0 ); Format( &sf, 0 );

34
common/page_layout/page_layout_reader.cpp
View File

@ -48,8 +48,7 @@ class PAGE_LAYOUT_READER_PARSER : public PAGE_LAYOUT_READER_LEXER
{ {
public: public:
PAGE_LAYOUT_READER_PARSER( const char* aLine, const wxString& aSource ); PAGE_LAYOUT_READER_PARSER( const char* aLine, const wxString& aSource );
void Parse( WORKSHEET_LAYOUT* aLayout ) void Parse( WORKSHEET_LAYOUT* aLayout );
throw( PARSE_ERROR, IO_ERROR );
private: private:
@ -69,41 +68,38 @@ private:
*/ */
double parseDouble(); double parseDouble();
void parseSetup( WORKSHEET_LAYOUT* aLayout ) throw( IO_ERROR, PARSE_ERROR ); void parseSetup( WORKSHEET_LAYOUT* aLayout );
/** /**
* parse a graphic item starting by "(line" or "(rect" and read parameters. * parse a graphic item starting by "(line" or "(rect" and read parameters.
*/ */
void parseGraphic( WORKSHEET_DATAITEM * aItem ) throw( IO_ERROR, PARSE_ERROR ); void parseGraphic( WORKSHEET_DATAITEM * aItem );
/** /**
* parse a text item starting by "(tbtext" and read parameters. * parse a text item starting by "(tbtext" and read parameters.
*/ */
void parseText( WORKSHEET_DATAITEM_TEXT * aItem ) throw( IO_ERROR, PARSE_ERROR ); void parseText( WORKSHEET_DATAITEM_TEXT * aItem );
/** /**
* parse a polygon item starting by "( polygon" and read parameters. * parse a polygon item starting by "( polygon" and read parameters.
* the list of corners included in this description is read by parsePolyOutline * the list of corners included in this description is read by parsePolyOutline
*/ */
void parsePolygon( WORKSHEET_DATAITEM_POLYPOLYGON * aItem ) void parsePolygon( WORKSHEET_DATAITEM_POLYPOLYGON * aItem );
throw( IO_ERROR, PARSE_ERROR );
/** /**
* parse a list of corners starting by "( pts" and read coordinates. * parse a list of corners starting by "( pts" and read coordinates.
*/ */
void parsePolyOutline( WORKSHEET_DATAITEM_POLYPOLYGON * aItem ) void parsePolyOutline( WORKSHEET_DATAITEM_POLYPOLYGON * aItem );
throw( IO_ERROR, PARSE_ERROR );
/** /**
* parse a bitmap item starting by "( bitmap" and read parameters. * parse a bitmap item starting by "( bitmap" and read parameters.
*/ */
void parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem ) void parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem );
throw( IO_ERROR, PARSE_ERROR );
void parseCoordinate( POINT_COORD& aCoord) throw( IO_ERROR, PARSE_ERROR ); void parseCoordinate( POINT_COORD& aCoord);
void readOption( WORKSHEET_DATAITEM * aItem ) throw( IO_ERROR, PARSE_ERROR ); void readOption( WORKSHEET_DATAITEM * aItem );
void readPngdata( WORKSHEET_DATAITEM_BITMAP * aItem ) throw( IO_ERROR, PARSE_ERROR ); void readPngdata( WORKSHEET_DATAITEM_BITMAP * aItem );
}; };
// PCB_PLOT_PARAMS_PARSER // PCB_PLOT_PARAMS_PARSER
@ -115,7 +111,6 @@ PAGE_LAYOUT_READER_PARSER::PAGE_LAYOUT_READER_PARSER( const char* aLine, const w
void PAGE_LAYOUT_READER_PARSER::Parse( WORKSHEET_LAYOUT* aLayout ) void PAGE_LAYOUT_READER_PARSER::Parse( WORKSHEET_LAYOUT* aLayout )
throw( PARSE_ERROR, IO_ERROR )
{ {
T token; T token;
WORKSHEET_DATAITEM * item; WORKSHEET_DATAITEM * item;
@ -178,7 +173,6 @@ void PAGE_LAYOUT_READER_PARSER::Parse( WORKSHEET_LAYOUT* aLayout )
} }
void PAGE_LAYOUT_READER_PARSER::parseSetup( WORKSHEET_LAYOUT* aLayout ) void PAGE_LAYOUT_READER_PARSER::parseSetup( WORKSHEET_LAYOUT* aLayout )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
while( ( token = NextTok() ) != T_RIGHT ) while( ( token = NextTok() ) != T_RIGHT )
@ -235,7 +229,6 @@ void PAGE_LAYOUT_READER_PARSER::parseSetup( WORKSHEET_LAYOUT* aLayout )
} }
void PAGE_LAYOUT_READER_PARSER::parsePolygon( WORKSHEET_DATAITEM_POLYPOLYGON * aItem ) void PAGE_LAYOUT_READER_PARSER::parsePolygon( WORKSHEET_DATAITEM_POLYPOLYGON * aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
@ -309,7 +302,6 @@ void PAGE_LAYOUT_READER_PARSER::parsePolygon( WORKSHEET_DATAITEM_POLYPOLYGON * a
} }
void PAGE_LAYOUT_READER_PARSER::parsePolyOutline( WORKSHEET_DATAITEM_POLYPOLYGON * aItem ) void PAGE_LAYOUT_READER_PARSER::parsePolyOutline( WORKSHEET_DATAITEM_POLYPOLYGON * aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
DPOINT corner; DPOINT corner;
T token; T token;
@ -340,7 +332,6 @@ void PAGE_LAYOUT_READER_PARSER::parsePolyOutline( WORKSHEET_DATAITEM_POLYPOLYGON
#include <wx/mstream.h> #include <wx/mstream.h>
void PAGE_LAYOUT_READER_PARSER::parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem ) void PAGE_LAYOUT_READER_PARSER::parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
BITMAP_BASE* image = new BITMAP_BASE; BITMAP_BASE* image = new BITMAP_BASE;
@ -407,7 +398,6 @@ void PAGE_LAYOUT_READER_PARSER::parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem )
} }
void PAGE_LAYOUT_READER_PARSER::readPngdata( WORKSHEET_DATAITEM_BITMAP * aItem ) void PAGE_LAYOUT_READER_PARSER::readPngdata( WORKSHEET_DATAITEM_BITMAP * aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
std::string tmp; std::string tmp;
T token; T token;
@ -448,7 +438,6 @@ void PAGE_LAYOUT_READER_PARSER::readPngdata( WORKSHEET_DATAITEM_BITMAP * aItem )
void PAGE_LAYOUT_READER_PARSER::readOption( WORKSHEET_DATAITEM * aItem ) void PAGE_LAYOUT_READER_PARSER::readOption( WORKSHEET_DATAITEM * aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
@ -476,7 +465,6 @@ void PAGE_LAYOUT_READER_PARSER::readOption( WORKSHEET_DATAITEM * aItem )
void PAGE_LAYOUT_READER_PARSER::parseGraphic( WORKSHEET_DATAITEM * aItem ) void PAGE_LAYOUT_READER_PARSER::parseGraphic( WORKSHEET_DATAITEM * aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
@ -552,7 +540,6 @@ void PAGE_LAYOUT_READER_PARSER::parseGraphic( WORKSHEET_DATAITEM * aItem )
void PAGE_LAYOUT_READER_PARSER::parseText( WORKSHEET_DATAITEM_TEXT* aItem ) void PAGE_LAYOUT_READER_PARSER::parseText( WORKSHEET_DATAITEM_TEXT* aItem )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
@ -703,7 +690,6 @@ void PAGE_LAYOUT_READER_PARSER::parseText( WORKSHEET_DATAITEM_TEXT* aItem )
// parse an expression like " 25 1 ltcorner)" // parse an expression like " 25 1 ltcorner)"
void PAGE_LAYOUT_READER_PARSER::parseCoordinate( POINT_COORD& aCoord) void PAGE_LAYOUT_READER_PARSER::parseCoordinate( POINT_COORD& aCoord)
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;

10
common/ptree.cpp
View File

@ -87,7 +87,7 @@ inline void scanAtom( PTREE* aTree, DSNLEXER* aLexer )
} }
void Scan( PTREE* aTree, DSNLEXER* aLexer ) throw( IO_ERROR ) void Scan( PTREE* aTree, DSNLEXER* aLexer )
{ {
int tok = aLexer->CurTok(); int tok = aLexer->CurTok();
@ -135,11 +135,11 @@ inline CITER next( CITER it )
static void formatNode( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, static void formatNode( OUTPUTFORMATTER* out, int aNestLevel, int aCtl,
const std::string& aKey, CPTREE& aTree ) throw( IO_ERROR ); const std::string& aKey, CPTREE& aTree );
static void formatList( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE& aTree ) static void formatList( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE& aTree )
throw( IO_ERROR )
{ {
for( CITER it = aTree.begin(); it != aTree.end(); ++it ) for( CITER it = aTree.begin(); it != aTree.end(); ++it )
{ {
@ -170,7 +170,7 @@ static void formatList( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE&
static void formatNode( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, static void formatNode( OUTPUTFORMATTER* out, int aNestLevel, int aCtl,
const std::string& aKey, CPTREE& aTree ) const std::string& aKey, CPTREE& aTree )
throw( IO_ERROR )
{ {
if( !isAtom( aTree ) ) // is a list, not an atom if( !isAtom( aTree ) ) // is a list, not an atom
{ {
@ -202,7 +202,7 @@ static void formatNode( OUTPUTFORMATTER* out, int aNestLevel, int aCtl,
} }
void Format( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE& aTree ) throw( IO_ERROR ) void Format( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE& aTree )
{ {
if( aTree.size() == 1 && !aTree.data().size() ) if( aTree.size() == 1 && !aTree.data().size() )
{ {

30
common/richio.cpp
View File

@ -156,7 +156,7 @@ void LINE_READER::expandCapacity( unsigned newsize )
FILE_LINE_READER::FILE_LINE_READER( const wxString& aFileName, FILE_LINE_READER::FILE_LINE_READER( const wxString& aFileName,
unsigned aStartingLineNumber, unsigned aStartingLineNumber,
unsigned aMaxLineLength ) throw( IO_ERROR ) : unsigned aMaxLineLength ):
LINE_READER( aMaxLineLength ), LINE_READER( aMaxLineLength ),
iOwn( true ) iOwn( true )
{ {
@ -193,7 +193,7 @@ FILE_LINE_READER::~FILE_LINE_READER()
} }
char* FILE_LINE_READER::ReadLine() throw( IO_ERROR ) char* FILE_LINE_READER::ReadLine()
{ {
length = 0; length = 0;
@ -226,7 +226,7 @@ char* FILE_LINE_READER::ReadLine() throw( IO_ERROR )
} }
STRING_LINE_READER::STRING_LINE_READER( const std::string& aString, const wxString& aSource ) : STRING_LINE_READER::STRING_LINE_READER( const std::string& aString, const wxString& aSource ):
LINE_READER( LINE_READER_LINE_DEFAULT_MAX ), LINE_READER( LINE_READER_LINE_DEFAULT_MAX ),
lines( aString ), lines( aString ),
ndx( 0 ) ndx( 0 )
@ -237,7 +237,7 @@ STRING_LINE_READER::STRING_LINE_READER( const std::string& aString, const wxStri
} }
STRING_LINE_READER::STRING_LINE_READER( const STRING_LINE_READER& aStartingPoint ) : STRING_LINE_READER::STRING_LINE_READER( const STRING_LINE_READER& aStartingPoint ):
LINE_READER( LINE_READER_LINE_DEFAULT_MAX ), LINE_READER( LINE_READER_LINE_DEFAULT_MAX ),
lines( aStartingPoint.lines ), lines( aStartingPoint.lines ),
ndx( aStartingPoint.ndx ) ndx( aStartingPoint.ndx )
@ -250,7 +250,7 @@ STRING_LINE_READER::STRING_LINE_READER( const STRING_LINE_READER& aStartingPoint
} }
char* STRING_LINE_READER::ReadLine() throw( IO_ERROR ) char* STRING_LINE_READER::ReadLine()
{ {
size_t nlOffset = lines.find( '\n', ndx ); size_t nlOffset = lines.find( '\n', ndx );
@ -290,7 +290,7 @@ INPUTSTREAM_LINE_READER::INPUTSTREAM_LINE_READER( wxInputStream* aStream, const
} }
char* INPUTSTREAM_LINE_READER::ReadLine() throw( IO_ERROR ) char* INPUTSTREAM_LINE_READER::ReadLine()
{ {
length = 0; length = 0;
@ -367,7 +367,7 @@ const char* OUTPUTFORMATTER::GetQuoteChar( const char* wrapee )
return GetQuoteChar( wrapee, quoteChar ); return GetQuoteChar( wrapee, quoteChar );
} }
int OUTPUTFORMATTER::vprint( const char* fmt, va_list ap ) throw( IO_ERROR ) int OUTPUTFORMATTER::vprint( const char* fmt, va_list ap )
{ {
// This function can call vsnprintf twice. // This function can call vsnprintf twice.
// But internally, vsnprintf retrieves arguments from the va_list identified by arg as if // But internally, vsnprintf retrieves arguments from the va_list identified by arg as if
@ -393,7 +393,7 @@ int OUTPUTFORMATTER::vprint( const char* fmt, va_list ap ) throw( IO_ERROR )
} }
int OUTPUTFORMATTER::sprint( const char* fmt, ... ) throw( IO_ERROR ) int OUTPUTFORMATTER::sprint( const char* fmt, ... )
{ {
va_list args; va_list args;
@ -405,7 +405,7 @@ int OUTPUTFORMATTER::sprint( const char* fmt, ... ) throw( IO_ERROR )
} }
int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IO_ERROR ) int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... )
{ {
#define NESTWIDTH 2 ///< how many spaces per nestLevel #define NESTWIDTH 2 ///< how many spaces per nestLevel
@ -434,7 +434,7 @@ int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IO_ERRO
} }
std::string OUTPUTFORMATTER::Quotes( const std::string& aWrapee ) throw( IO_ERROR ) std::string OUTPUTFORMATTER::Quotes( const std::string& aWrapee )
{ {
static const char quoteThese[] = "\t ()\n\r"; static const char quoteThese[] = "\t ()\n\r";
@ -483,7 +483,7 @@ std::string OUTPUTFORMATTER::Quotes( const std::string& aWrapee ) throw( IO_ERRO
} }
std::string OUTPUTFORMATTER::Quotew( const wxString& aWrapee ) throw( IO_ERROR ) std::string OUTPUTFORMATTER::Quotew( const wxString& aWrapee )
{ {
// wxStrings are always encoded as UTF-8 as we convert to a byte sequence. // wxStrings are always encoded as UTF-8 as we convert to a byte sequence.
// The non-virutal function calls the virtual workhorse function, and if // The non-virutal function calls the virtual workhorse function, and if
@ -496,7 +496,7 @@ std::string OUTPUTFORMATTER::Quotew( const wxString& aWrapee ) throw( IO_ERROR )
//-----<STRING_FORMATTER>---------------------------------------------------- //-----<STRING_FORMATTER>----------------------------------------------------
void STRING_FORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) void STRING_FORMATTER::write( const char* aOutBuf, int aCount )
{ {
mystring.append( aOutBuf, aCount ); mystring.append( aOutBuf, aCount );
} }
@ -519,7 +519,7 @@ void STRING_FORMATTER::StripUseless()
//-----<FILE_OUTPUTFORMATTER>---------------------------------------- //-----<FILE_OUTPUTFORMATTER>----------------------------------------
FILE_OUTPUTFORMATTER::FILE_OUTPUTFORMATTER( const wxString& aFileName, FILE_OUTPUTFORMATTER::FILE_OUTPUTFORMATTER( const wxString& aFileName,
const wxChar* aMode, char aQuoteChar ) throw( IO_ERROR ) : const wxChar* aMode, char aQuoteChar ):
OUTPUTFORMATTER( OUTPUTFMTBUFZ, aQuoteChar ), OUTPUTFORMATTER( OUTPUTFMTBUFZ, aQuoteChar ),
m_filename( aFileName ) m_filename( aFileName )
{ {
@ -542,7 +542,7 @@ FILE_OUTPUTFORMATTER::~FILE_OUTPUTFORMATTER()
} }
void FILE_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) void FILE_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount )
{ {
if( 1 != fwrite( aOutBuf, aCount, 1, m_fp ) ) if( 1 != fwrite( aOutBuf, aCount, 1, m_fp ) )
{ {
@ -556,7 +556,7 @@ void FILE_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ER
//-----<STREAM_OUTPUTFORMATTER>-------------------------------------- //-----<STREAM_OUTPUTFORMATTER>--------------------------------------
void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount )
{ {
int lastWrite; int lastWrite;

2
common/worksheet.cpp
View File

@ -243,7 +243,7 @@ wxString WS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase )
void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
throw( IO_ERROR )
{ {
// Don't write the title block information if there is nothing to write. // Don't write the title block information if there is nothing to write.
bool isempty = true; bool isempty = true;

4
common/xnode.cpp
View File

@ -29,7 +29,7 @@
typedef wxXmlAttribute XATTR; typedef wxXmlAttribute XATTR;
void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel )
{ {
switch( GetType() ) switch( GetType() )
{ {
@ -48,7 +48,7 @@ void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
} }
void XNODE::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) void XNODE::FormatContents( OUTPUTFORMATTER* out, int nestLevel )
{ {
// output attributes first if they exist // output attributes first if they exist
for( XATTR* attr = (XATTR*) GetAttributes(); attr; attr = (XATTR*) attr->GetNext() ) for( XATTR* attr = (XATTR*) GetAttributes(); attr; attr = (XATTR*) attr->GetNext() )

1
eeschema/backanno.cpp
View File

@ -49,7 +49,6 @@
void SCH_EDIT_FRAME::backAnnotateFootprints( const std::string& aChangedSetOfReferences ) void SCH_EDIT_FRAME::backAnnotateFootprints( const std::string& aChangedSetOfReferences )
throw( IO_ERROR, boost::bad_pointer )
{ {
// Build a flat list of components in schematic: // Build a flat list of components in schematic:
SCH_REFERENCE_LIST refs; SCH_REFERENCE_LIST refs;

7
eeschema/class_library.cpp
View File

@ -283,7 +283,7 @@ LIB_PART* PART_LIB::ReplacePart( LIB_PART* aOldPart, LIB_PART* aNewPart )
} }
PART_LIB* PART_LIB::LoadLibrary( const wxString& aFileName ) throw( IO_ERROR, boost::bad_pointer ) PART_LIB* PART_LIB::LoadLibrary( const wxString& aFileName )
{ {
std::unique_ptr<PART_LIB> lib( new PART_LIB( LIBRARY_TYPE_EESCHEMA, aFileName ) ); std::unique_ptr<PART_LIB> lib( new PART_LIB( LIBRARY_TYPE_EESCHEMA, aFileName ) );
@ -307,7 +307,7 @@ PART_LIB* PART_LIB::LoadLibrary( const wxString& aFileName ) throw( IO_ERROR, bo
} }
PART_LIB* PART_LIBS::AddLibrary( const wxString& aFileName ) throw( IO_ERROR, boost::bad_pointer ) PART_LIB* PART_LIBS::AddLibrary( const wxString& aFileName )
{ {
PART_LIB* lib; PART_LIB* lib;
@ -327,7 +327,6 @@ PART_LIB* PART_LIBS::AddLibrary( const wxString& aFileName ) throw( IO_ERROR, bo
PART_LIB* PART_LIBS::AddLibrary( const wxString& aFileName, PART_LIBS::iterator& aIterator ) PART_LIB* PART_LIBS::AddLibrary( const wxString& aFileName, PART_LIBS::iterator& aIterator )
throw( IO_ERROR, boost::bad_pointer )
{ {
// Don't reload the library if it is already loaded. // Don't reload the library if it is already loaded.
wxFileName fn( aFileName ); wxFileName fn( aFileName );
@ -479,7 +478,6 @@ int PART_LIBS::GetModifyHash()
void PART_LIBS::LibNamesAndPaths( PROJECT* aProject, bool doSave, void PART_LIBS::LibNamesAndPaths( PROJECT* aProject, bool doSave,
wxString* aPaths, wxArrayString* aNames ) wxString* aPaths, wxArrayString* aNames )
throw( IO_ERROR, boost::bad_pointer )
{ {
wxString pro = aProject->GetProjectFullName(); wxString pro = aProject->GetProjectFullName();
@ -548,7 +546,6 @@ const wxString PART_LIBS::CacheName( const wxString& aFullProjectFilename )
void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress ) void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress )
throw( IO_ERROR, boost::bad_pointer )
{ {
wxString filename; wxString filename;
wxString libs_not_found; wxString libs_not_found;

13
eeschema/class_library.h
View File

@ -211,7 +211,7 @@ public:
* @param aFileName - File name object of part library. * @param aFileName - File name object of part library.
* @throw IO_ERROR if there's any problem loading. * @throw IO_ERROR if there's any problem loading.
*/ */
PART_LIB* AddLibrary( const wxString& aFileName ) throw( IO_ERROR, boost::bad_pointer ); PART_LIB* AddLibrary( const wxString& aFileName );
/** /**
* Function AddLibrary * Function AddLibrary
@ -222,16 +222,14 @@ public:
* @return PART_LIB* - the new PART_LIB, which remains owned by this PART_LIBS container. * @return PART_LIB* - the new PART_LIB, which remains owned by this PART_LIBS container.
* @throw IO_ERROR if there's any problem loading. * @throw IO_ERROR if there's any problem loading.
*/ */
PART_LIB* AddLibrary( const wxString& aFileName, PART_LIBS::iterator& aIterator ) PART_LIB* AddLibrary( const wxString& aFileName, PART_LIBS::iterator& aIterator );
throw( IO_ERROR, boost::bad_pointer );
/** /**
* Function LoadAllLibraries * Function LoadAllLibraries
* loads all of the project's libraries into this container, which should * loads all of the project's libraries into this container, which should
* be cleared before calling it. * be cleared before calling it.
*/ */
void LoadAllLibraries( PROJECT* aProject, bool aShowProgress=true ) void LoadAllLibraries( PROJECT* aProject, bool aShowProgress=true );
throw( IO_ERROR, boost::bad_pointer );
/** /**
* Function LibNamesAndPaths * Function LibNamesAndPaths
@ -239,8 +237,7 @@ public:
* (without paths). * (without paths).
*/ */
static void LibNamesAndPaths( PROJECT* aProject, bool doSave, static void LibNamesAndPaths( PROJECT* aProject, bool doSave,
wxString* aPaths, wxArrayString* aNames=NULL ) wxString* aPaths, wxArrayString* aNames=NULL );
throw( IO_ERROR, boost::bad_pointer );
/** /**
* Function cacheName * Function cacheName
@ -509,7 +506,7 @@ public:
* the caller. * the caller.
* @throw IO_ERROR if there's any problem loading the library. * @throw IO_ERROR if there's any problem loading the library.
*/ */
static PART_LIB* LoadLibrary( const wxString& aFileName ) throw( IO_ERROR, boost::bad_pointer ); static PART_LIB* LoadLibrary( const wxString& aFileName );
/** /**
* Function HasPowerParts * Function HasPowerParts

8
eeschema/dialogs/dialog_bom.cpp
View File

@ -86,10 +86,10 @@ class BOM_CFG_READER_PARSER : public DIALOG_BOM_CFG_LEXER
public: public:
BOM_CFG_READER_PARSER( BOM_PLUGIN_ARRAY* aPlugins, BOM_CFG_READER_PARSER( BOM_PLUGIN_ARRAY* aPlugins,
const char* aData, const wxString& aSource ); const char* aData, const wxString& aSource );
void Parse() throw( PARSE_ERROR, IO_ERROR ); void Parse();
private: private:
void parsePlugin() throw( IO_ERROR, PARSE_ERROR ); void parsePlugin();
}; };
// PCB_PLOT_PARAMS_PARSER // PCB_PLOT_PARAMS_PARSER
@ -103,7 +103,7 @@ BOM_CFG_READER_PARSER::BOM_CFG_READER_PARSER( BOM_PLUGIN_ARRAY* aPlugins,
} }
void BOM_CFG_READER_PARSER::Parse() throw( PARSE_ERROR, IO_ERROR ) void BOM_CFG_READER_PARSER::Parse()
{ {
T token; T token;
@ -131,7 +131,7 @@ void BOM_CFG_READER_PARSER::Parse() throw( PARSE_ERROR, IO_ERROR )
} }
} }
void BOM_CFG_READER_PARSER::parsePlugin() throw( IO_ERROR, PARSE_ERROR ) void BOM_CFG_READER_PARSER::parsePlugin()
{ {
BOM_PLUGIN plugin; BOM_PLUGIN plugin;

2
eeschema/project_rescue.cpp
View File

@ -75,7 +75,7 @@ static bool save_library( PART_LIB* aLibrary, SCH_EDIT_FRAME* aEditFrame )
* *
* @return true on success, false on failure * @return true on success, false on failure
*/ */
static bool insert_library( PROJECT *aProject, PART_LIB *aLibrary, size_t aIndex ) throw( boost::bad_pointer ) static bool insert_library( PROJECT *aProject, PART_LIB *aLibrary, size_t aIndex )
{ {
wxArrayString libNames; wxArrayString libNames;
wxString libPaths; wxString libPaths;

3
eeschema/schframe.h
View File

@ -212,8 +212,7 @@ protected:
void updateFindReplaceView( wxFindDialogEvent& aEvent ); void updateFindReplaceView( wxFindDialogEvent& aEvent );
void backAnnotateFootprints( const std::string& aChangedSetOfReferences ) void backAnnotateFootprints( const std::string& aChangedSetOfReferences );
throw( IO_ERROR, boost::bad_pointer );
/** /**
* Function prepareForNetlist * Function prepareForNetlist

4
eeschema/symbol_lib_table.cpp
View File

@ -216,7 +216,7 @@ void SYMBOL_LIB_TABLE::EnumerateSymbolLib( const wxString& aNickname, wxArrayStr
const SYMBOL_LIB_TABLE_ROW* SYMBOL_LIB_TABLE::FindRow( const wxString& aNickname ) const SYMBOL_LIB_TABLE_ROW* SYMBOL_LIB_TABLE::FindRow( const wxString& aNickname )
throw( IO_ERROR )
{ {
SYMBOL_LIB_TABLE_ROW* row = dynamic_cast< SYMBOL_LIB_TABLE_ROW* >( findRow( aNickname ) ); SYMBOL_LIB_TABLE_ROW* row = dynamic_cast< SYMBOL_LIB_TABLE_ROW* >( findRow( aNickname ) );
@ -340,7 +340,6 @@ void SYMBOL_LIB_TABLE::CreateSymbolLib( const wxString& aNickname )
LIB_ALIAS* SYMBOL_LIB_TABLE::LoadSymbolWithOptionalNickname( const LIB_ID& aLibId ) LIB_ALIAS* SYMBOL_LIB_TABLE::LoadSymbolWithOptionalNickname( const LIB_ID& aLibId )
throw( IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception )
{ {
wxString nickname = FROM_UTF8( aLibId.GetLibNickname() ); wxString nickname = FROM_UTF8( aLibId.GetLibNickname() );
wxString name = FROM_UTF8( aLibId.GetLibItemName() ); wxString name = FROM_UTF8( aLibId.GetLibItemName() );
@ -378,7 +377,6 @@ const wxString SYMBOL_LIB_TABLE::GlobalPathEnvVariableName()
bool SYMBOL_LIB_TABLE::LoadGlobalTable( SYMBOL_LIB_TABLE& aTable ) bool SYMBOL_LIB_TABLE::LoadGlobalTable( SYMBOL_LIB_TABLE& aTable )
throw (IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception )
{ {
bool tableExists = true; bool tableExists = true;
wxFileName fn = GetGlobalTableFileName(); wxFileName fn = GetGlobalTableFileName();

8
eeschema/symbol_lib_table.h
View File

@ -127,7 +127,7 @@ public:
* *
* @throw IO_ERROR if \a aNickName cannot be found. * @throw IO_ERROR if \a aNickName cannot be found.
*/ */
const SYMBOL_LIB_TABLE_ROW* FindRow( const wxString& aNickName ) throw( IO_ERROR ); const SYMBOL_LIB_TABLE_ROW* FindRow( const wxString& aNickName );
//-----<PLUGIN API SUBSET, REBASED ON aNickname>--------------------------- //-----<PLUGIN API SUBSET, REBASED ON aNickname>---------------------------
@ -254,8 +254,7 @@ public:
* is thrown in the case where aId cannot be found. * is thrown in the case where aId cannot be found.
* @throw PARSE_ERROR if @a atId is not parsed OK. * @throw PARSE_ERROR if @a atId is not parsed OK.
*/ */
LIB_ALIAS* LoadSymbolWithOptionalNickname( const LIB_ID& aId ) LIB_ALIAS* LoadSymbolWithOptionalNickname( const LIB_ID& aId );
throw( IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception );
/** /**
* Function LoadGlobalTable * Function LoadGlobalTable
@ -270,8 +269,7 @@ public:
* @return true if the global library table exists and is loaded properly. * @return true if the global library table exists and is loaded properly.
* @throw IO_ERROR if an error occurs attempting to load the symbol library table. * @throw IO_ERROR if an error occurs attempting to load the symbol library table.
*/ */
static bool LoadGlobalTable( SYMBOL_LIB_TABLE& aTable ) static bool LoadGlobalTable( SYMBOL_LIB_TABLE& aTable );
throw (IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception );
/** /**
* Function GetGlobalTableFileName * Function GetGlobalTableFileName

8
eeschema/template_fieldnames.cpp
View File

@ -57,7 +57,7 @@ const wxString TEMPLATE_FIELDNAME::GetDefaultFieldName( int aFieldNdx )
return fieldName; return fieldName;
} }
void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ) void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const
{ {
out->Print( nestLevel, "(field (name %s)", out->Quotew( m_Name ).c_str() ); out->Print( nestLevel, "(field (name %s)", out->Quotew( m_Name ).c_str() );
@ -71,7 +71,7 @@ void TEMPLATE_FIELDNAME::Format( OUTPUTFORMATTER* out, int nestLevel ) const thr
} }
void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR ) void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
{ {
T tok; T tok;
@ -112,7 +112,7 @@ void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR
} }
void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ) void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const
{ {
// We'll keep this general, and include the \n, even though the only known // We'll keep this general, and include the \n, even though the only known
// use at this time will not want the newlines or the indentation. // use at this time will not want the newlines or the indentation.
@ -125,7 +125,7 @@ void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ER
} }
void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR ) void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
{ {
T tok; T tok;

8
eeschema/template_fieldnames.h
View File

@ -97,7 +97,7 @@ struct TEMPLATE_FIELDNAME
* Function Format * Function Format
* serializes this object out as text into the given OUTPUTFORMATTER. * serializes this object out as text into the given OUTPUTFORMATTER.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ); void Format( OUTPUTFORMATTER* out, int nestLevel ) const ;
/** /**
* Function Parse * Function Parse
@ -112,7 +112,7 @@ struct TEMPLATE_FIELDNAME
* *
* @param aSpec is the input token stream of keywords and symbols. * @param aSpec is the input token stream of keywords and symbols.
*/ */
void Parse( TEMPLATE_FIELDNAMES_LEXER* aSpec ) throw( IO_ERROR ); void Parse( TEMPLATE_FIELDNAMES_LEXER* aSpec );
/** /**
* Function GetDefaultFieldName * Function GetDefaultFieldName
@ -137,13 +137,13 @@ public:
* Function Format * Function Format
* serializes this object out as text into the given OUTPUTFORMATTER. * serializes this object out as text into the given OUTPUTFORMATTER.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ); void Format( OUTPUTFORMATTER* out, int nestLevel ) const ;
/** /**
* Function Parse * Function Parse
* fills this object from information in the input stream handled by TEMPLATE_FIELDNAMES_LEXER * fills this object from information in the input stream handled by TEMPLATE_FIELDNAMES_LEXER
*/ */
void Parse( TEMPLATE_FIELDNAMES_LEXER* in ) throw( IO_ERROR ); void Parse( TEMPLATE_FIELDNAMES_LEXER* in );
/** /**

2
include/class_board_design_settings.h
View File

@ -560,7 +560,7 @@ public:
private: private:
void formatNetClass( NETCLASS* aNetClass, OUTPUTFORMATTER* aFormatter, int aNestLevel, void formatNetClass( NETCLASS* aNetClass, OUTPUTFORMATTER* aFormatter, int aNestLevel,
int aControlBits ) const throw( IO_ERROR ); int aControlBits ) const;
}; };
#endif // BOARD_DESIGN_SETTINGS_H_ #endif // BOARD_DESIGN_SETTINGS_H_

3
include/class_page_info.h
View File

@ -185,8 +185,7 @@ public:
* @param aControlBits The control bit definition for object specific formatting. * @param aControlBits The control bit definition for object specific formatting.
* @throw IO_ERROR on write error. * @throw IO_ERROR on write error.
*/ */
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
protected: protected:
// only the class implementation(s) may use this constructor // only the class implementation(s) may use this constructor

3
include/class_title_block.h
View File

@ -137,8 +137,7 @@ public:
* @param aControlBits The control bit definition for object specific formatting. * @param aControlBits The control bit definition for object specific formatting.
* @throw IO_ERROR on write error. * @throw IO_ERROR on write error.
*/ */
virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
private: private:
wxArrayString m_tbTexts; wxArrayString m_tbTexts;

26
include/dsnlexer.h
View File

@ -114,7 +114,7 @@ protected:
void init(); void init();
int readLine() throw( IO_ERROR ) int readLine()
{ {
if( reader ) if( reader )
{ {
@ -282,7 +282,7 @@ public:
* @return int - the type of token found next. * @return int - the type of token found next.
* @throw IO_ERROR - only if the LINE_READER throws it. * @throw IO_ERROR - only if the LINE_READER throws it.
*/ */
int NextTok() throw( IO_ERROR ); int NextTok();
/** /**
* Function NeedSYMBOL * Function NeedSYMBOL
@ -292,7 +292,7 @@ public:
* @return int - the actual token read in. * @return int - the actual token read in.
* @throw IO_ERROR, if the next token does not satisfy IsSymbol() * @throw IO_ERROR, if the next token does not satisfy IsSymbol()
*/ */
int NeedSYMBOL() throw( IO_ERROR ); int NeedSYMBOL();
/** /**
* Function NeedSYMBOLorNUMBER * Function NeedSYMBOLorNUMBER
@ -302,7 +302,7 @@ public:
* @return int - the actual token read in. * @return int - the actual token read in.
* @throw IO_ERROR, if the next token does not satisfy the above test * @throw IO_ERROR, if the next token does not satisfy the above test
*/ */
int NeedSYMBOLorNUMBER() throw( IO_ERROR ); int NeedSYMBOLorNUMBER();
/** /**
* Function NeedNUMBER * Function NeedNUMBER
@ -311,7 +311,7 @@ public:
* @return int - the actual token read in. * @return int - the actual token read in.
* @throw IO_ERROR, if the next token does not satisfy the above test * @throw IO_ERROR, if the next token does not satisfy the above test
*/ */
int NeedNUMBER( const char* aExpectation ) throw( IO_ERROR ); int NeedNUMBER( const char* aExpectation );
/** /**
* Function CurTok * Function CurTok
@ -387,7 +387,7 @@ public:
* @return wxArrayString* - heap allocated block of comments, or NULL if none; * @return wxArrayString* - heap allocated block of comments, or NULL if none;
* caller owns the allocation and must delete if not NULL. * caller owns the allocation and must delete if not NULL.
*/ */
wxArrayString* ReadCommentLines() throw( IO_ERROR ); wxArrayString* ReadCommentLines();
/** /**
* Function IsSymbol * Function IsSymbol
@ -403,7 +403,7 @@ public:
* @param aTok is the token/keyword type which was expected at the current input location. * @param aTok is the token/keyword type which was expected at the current input location.
* @throw IO_ERROR with the location within the input file of the problem. * @throw IO_ERROR with the location within the input file of the problem.
*/ */
void Expecting( int aTok ) throw( IO_ERROR ); void Expecting( int aTok );
/** /**
* Function Expecting * Function Expecting
@ -412,7 +412,7 @@ public:
* current input location, e.g. "pin|graphic|property" * current input location, e.g. "pin|graphic|property"
* @throw IO_ERROR with the location within the input file of the problem. * @throw IO_ERROR with the location within the input file of the problem.
*/ */
void Expecting( const char* aTokenList ) throw( IO_ERROR ); void Expecting( const char* aTokenList );
/** /**
* Function Unexpected * Function Unexpected
@ -421,7 +421,7 @@ public:
* current input location. * current input location.
* @throw IO_ERROR with the location within the input file of the problem. * @throw IO_ERROR with the location within the input file of the problem.
*/ */
void Unexpected( int aTok ) throw( IO_ERROR ); void Unexpected( int aTok );
/** /**
* Function Unexpected * Function Unexpected
@ -430,7 +430,7 @@ public:
* current input location. * current input location.
* @throw IO_ERROR with the location within the input file of the problem. * @throw IO_ERROR with the location within the input file of the problem.
*/ */
void Unexpected( const char* aToken ) throw( IO_ERROR ); void Unexpected( const char* aToken );
/** /**
* Function Duplicate * Function Duplicate
@ -440,7 +440,7 @@ public:
* current input location. * current input location.
* @throw IO_ERROR with the location within the input file of the problem. * @throw IO_ERROR with the location within the input file of the problem.
*/ */
void Duplicate( int aTok ) throw( IO_ERROR ); void Duplicate( int aTok );
/** /**
* Function NeedLEFT * Function NeedLEFT
@ -448,7 +448,7 @@ public:
* If it is not, an IO_ERROR is thrown. * If it is not, an IO_ERROR is thrown.
* @throw IO_ERROR, if the next token is not a DSN_LEFT * @throw IO_ERROR, if the next token is not a DSN_LEFT
*/ */
void NeedLEFT() throw( IO_ERROR ); void NeedLEFT();
/** /**
* Function NeedRIGHT * Function NeedRIGHT
@ -456,7 +456,7 @@ public:
* If it is not, an IO_ERROR is thrown. * If it is not, an IO_ERROR is thrown.
* @throw IO_ERROR, if the next token is not a DSN_RIGHT * @throw IO_ERROR, if the next token is not a DSN_RIGHT
*/ */
void NeedRIGHT() throw( IO_ERROR ); void NeedRIGHT();
/** /**
* Function GetTokenText * Function GetTokenText

3
include/eda_text.h
View File

@ -341,8 +341,7 @@ public:
* @param aControlBits The control bit definition for object specific formatting. * @param aControlBits The control bit definition for object specific formatting.
* @throw IO_ERROR on write error. * @throw IO_ERROR on write error.
*/ */
virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
protected: protected:
wxString m_Text; wxString m_Text;

4
include/filter_reader.h
View File

@ -48,7 +48,7 @@ public:
~FILTER_READER(); ~FILTER_READER();
char* ReadLine() throw( IO_ERROR ) override; char* ReadLine() override;
const wxString& GetSource() const override const wxString& GetSource() const override
{ {
@ -82,7 +82,7 @@ public:
~WHITESPACE_FILTER_READER(); ~WHITESPACE_FILTER_READER();
char* ReadLine() throw( IO_ERROR ) override; char* ReadLine() override;
const wxString& GetSource() const override const wxString& GetSource() const override
{ {

8
include/fp_lib_table.h
View File

@ -131,7 +131,7 @@ public:
* *
* @throw IO_ERROR if \a aNickName cannot be found. * @throw IO_ERROR if \a aNickName cannot be found.
*/ */
const FP_LIB_TABLE_ROW* FindRow( const wxString& aNickName ) throw( IO_ERROR ); const FP_LIB_TABLE_ROW* FindRow( const wxString& aNickName );
//-----<PLUGIN API SUBSET, REBASED ON aNickname>--------------------------- //-----<PLUGIN API SUBSET, REBASED ON aNickname>---------------------------
@ -249,8 +249,7 @@ public:
* is thrown in the case where aFootprintName cannot be found. * is thrown in the case where aFootprintName cannot be found.
* @throw PARSE_ERROR if @a aFootprintId is not parsed OK. * @throw PARSE_ERROR if @a aFootprintId is not parsed OK.
*/ */
MODULE* FootprintLoadWithOptionalNickname( const LIB_ID& aFootprintId ) MODULE* FootprintLoadWithOptionalNickname( const LIB_ID& aFootprintId );
throw( IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception );
/** /**
* Function LoadGlobalTable * Function LoadGlobalTable
@ -265,8 +264,7 @@ public:
* @throw IO_ERROR if an error occurs attempting to load the footprint library * @throw IO_ERROR if an error occurs attempting to load the footprint library
* table. * table.
*/ */
static bool LoadGlobalTable( FP_LIB_TABLE& aTable ) static bool LoadGlobalTable( FP_LIB_TABLE& aTable );
throw (IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception );
/** /**
* Function GetGlobalTableFileName * Function GetGlobalTableFileName

7
include/lib_id.h
View File

@ -70,9 +70,9 @@ public:
* *
* @param aId is a string to be parsed into the LIB_ID object. * @param aId is a string to be parsed into the LIB_ID object.
*/ */
LIB_ID( const std::string& aId ) throw( PARSE_ERROR ); LIB_ID( const std::string& aId );
LIB_ID( const wxString& aId ) throw( PARSE_ERROR ); LIB_ID( const wxString& aId );
/** /**
* This LIB_ID ctor is a special version which ignores the parsing due to symbol * This LIB_ID ctor is a special version which ignores the parsing due to symbol
@ -161,8 +161,7 @@ public:
* @throw PARSE_ERROR if any of the pieces are illegal. * @throw PARSE_ERROR if any of the pieces are illegal.
*/ */
static UTF8 Format( const UTF8& aLibNickname, const UTF8& aLibItemName, static UTF8 Format( const UTF8& aLibNickname, const UTF8& aLibItemName,
const UTF8& aRevision = "" ) const UTF8& aRevision = "" );
throw( PARSE_ERROR );
/** /**
* Function IsValid * Function IsValid

5
include/lib_table_base.h
View File

@ -415,7 +415,7 @@ public:
* @throw IO_ERROR if an error occurs attempting to load the footprint library * @throw IO_ERROR if an error occurs attempting to load the footprint library
* table. * table.
*/ */
void Load( const wxString& aFileName ) throw( IO_ERROR ); void Load( const wxString& aFileName );
/** /**
* Function Save * Function Save
@ -424,8 +424,7 @@ public:
* *
* @param aFileName is the name of the file to write to. * @param aFileName is the name of the file to write to.
*/ */
void Save( const wxString& aFileName ) const void Save( const wxString& aFileName ) const;
throw( IO_ERROR, boost::interprocess::lock_exception );
/** /**
* Search the paths all of the #LIB_TABLE_ROWS of the #LIB_TABLE and add all of the * Search the paths all of the #LIB_TABLE_ROWS of the #LIB_TABLE and add all of the

4
include/ptree.h
View File

@ -84,12 +84,12 @@ typedef boost::property_tree::ptree_error PTREE_ERROR;
* *
* </code> * </code>
*/ */
void Scan( PTREE* aTree, DSNLEXER* aLexer ) throw ( IO_ERROR ); void Scan( PTREE* aTree, DSNLEXER* aLexer );
/** /**
* Function Format * Function Format
* outputs a PTREE into s-expression format via an OUTPUTFORMATTER derivative. * outputs a PTREE into s-expression format via an OUTPUTFORMATTER derivative.
*/ */
void Format( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE& aTree ) throw( IO_ERROR ); void Format( OUTPUTFORMATTER* out, int aNestLevel, int aCtl, CPTREE& aTree );
#endif // PTREE_H_ #endif // PTREE_H_

31
include/richio.h
View File

@ -118,7 +118,7 @@ public:
* @return char* - The beginning of the read line, or NULL if EOF. * @return char* - The beginning of the read line, or NULL if EOF.
* @throw IO_ERROR when a line is too long. * @throw IO_ERROR when a line is too long.
*/ */
virtual char* ReadLine() throw( IO_ERROR ) = 0; virtual char* ReadLine() = 0;
/** /**
* Function GetSource * Function GetSource
@ -205,7 +205,7 @@ public:
*/ */
FILE_LINE_READER( const wxString& aFileName, FILE_LINE_READER( const wxString& aFileName,
unsigned aStartingLineNumber = 0, unsigned aStartingLineNumber = 0,
unsigned aMaxLineLength = LINE_READER_LINE_DEFAULT_MAX ) throw( IO_ERROR ); unsigned aMaxLineLength = LINE_READER_LINE_DEFAULT_MAX );
/** /**
* Constructor FILE_LINE_READER * Constructor FILE_LINE_READER
@ -232,7 +232,7 @@ public:
*/ */
~FILE_LINE_READER(); ~FILE_LINE_READER();
char* ReadLine() throw( IO_ERROR ) override; char* ReadLine() override;
/** /**
* Function Rewind * Function Rewind
@ -279,7 +279,7 @@ public:
*/ */
STRING_LINE_READER( const STRING_LINE_READER& aStartingPoint ); STRING_LINE_READER( const STRING_LINE_READER& aStartingPoint );
char* ReadLine() throw( IO_ERROR ) override; char* ReadLine() override;
}; };
@ -302,7 +302,7 @@ public:
*/ */
INPUTSTREAM_LINE_READER( wxInputStream* aStream, const wxString& aSource ); INPUTSTREAM_LINE_READER( wxInputStream* aStream, const wxString& aSource );
char* ReadLine() throw( IO_ERROR ) override; char* ReadLine() override;
}; };
@ -329,8 +329,8 @@ class OUTPUTFORMATTER
std::vector<char> buffer; std::vector<char> buffer;
char quoteChar[2]; char quoteChar[2];
int sprint( const char* fmt, ... ) throw( IO_ERROR ); int sprint( const char* fmt, ... );
int vprint( const char* fmt, va_list ap ) throw( IO_ERROR ); int vprint( const char* fmt, va_list ap );
protected: protected:
@ -365,7 +365,7 @@ protected:
* @param aCount tells how many bytes to write. * @param aCount tells how many bytes to write.
* @throw IO_ERROR, if there is a problem outputting, such as a full disk. * @throw IO_ERROR, if there is a problem outputting, such as a full disk.
*/ */
virtual void write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) = 0; virtual void write( const char* aOutBuf, int aCount ) = 0;
#if defined(__GNUG__) // The GNU C++ compiler defines this #if defined(__GNUG__) // The GNU C++ compiler defines this
@ -394,7 +394,7 @@ public:
* @return int - the number of characters output. * @return int - the number of characters output.
* @throw IO_ERROR, if there is a problem outputting, such as a full disk. * @throw IO_ERROR, if there is a problem outputting, such as a full disk.
*/ */
int PRINTF_FUNC Print( int nestLevel, const char* fmt, ... ) throw( IO_ERROR ); int PRINTF_FUNC Print( int nestLevel, const char* fmt, ... );
/** /**
* Function GetQuoteChar * Function GetQuoteChar
@ -429,9 +429,9 @@ public:
* *
* @throw IO_ERROR, if there is any kind of problem with the input string. * @throw IO_ERROR, if there is any kind of problem with the input string.
*/ */
virtual std::string Quotes( const std::string& aWrapee ) throw( IO_ERROR ); virtual std::string Quotes( const std::string& aWrapee );
std::string Quotew( const wxString& aWrapee ) throw( IO_ERROR ); std::string Quotew( const wxString& aWrapee );
//-----</interface functions>----------------------------------------- //-----</interface functions>-----------------------------------------
}; };
@ -479,7 +479,7 @@ public:
protected: protected:
//-----<OUTPUTFORMATTER>------------------------------------------------ //-----<OUTPUTFORMATTER>------------------------------------------------
void write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) override; void write( const char* aOutBuf, int aCount ) override;
//-----</OUTPUTFORMATTER>----------------------------------------------- //-----</OUTPUTFORMATTER>-----------------------------------------------
}; };
@ -504,14 +504,13 @@ public:
*/ */
FILE_OUTPUTFORMATTER( const wxString& aFileName, FILE_OUTPUTFORMATTER( const wxString& aFileName,
const wxChar* aMode = wxT( "wt" ), const wxChar* aMode = wxT( "wt" ),
char aQuoteChar = '"' ) char aQuoteChar = '"' );
throw( IO_ERROR );
~FILE_OUTPUTFORMATTER(); ~FILE_OUTPUTFORMATTER();
protected: protected:
//-----<OUTPUTFORMATTER>------------------------------------------------ //-----<OUTPUTFORMATTER>------------------------------------------------
void write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) override; void write( const char* aOutBuf, int aCount ) override;
//-----</OUTPUTFORMATTER>----------------------------------------------- //-----</OUTPUTFORMATTER>-----------------------------------------------
FILE* m_fp; ///< takes ownership FILE* m_fp; ///< takes ownership
@ -542,7 +541,7 @@ public:
protected: protected:
//-----<OUTPUTFORMATTER>------------------------------------------------ //-----<OUTPUTFORMATTER>------------------------------------------------
void write( const char* aOutBuf, int aCount ) throw( IO_ERROR ) override; void write( const char* aOutBuf, int aCount ) override;
//-----</OUTPUTFORMATTER>----------------------------------------------- //-----</OUTPUTFORMATTER>-----------------------------------------------
}; };

3
include/wxBasePcbFrame.h
View File

@ -95,8 +95,7 @@ protected:
* @throw IO_ERROR if an I/O error occurs or a #PARSE_ERROR if a file parsing error * @throw IO_ERROR if an I/O error occurs or a #PARSE_ERROR if a file parsing error
* occurs while reading footprint library files. * occurs while reading footprint library files.
*/ */
MODULE* loadFootprint( const LIB_ID& aFootprintId ) MODULE* loadFootprint( const LIB_ID& aFootprintId );
throw( IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception );
public: public:
PCB_BASE_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrameType, PCB_BASE_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrameType,

3
include/wxPcbStruct.h
View File

@ -253,8 +253,7 @@ public:
* @throw IO_ERROR if an I/O error occurs or a #PARSE_ERROR if a file parsing error * @throw IO_ERROR if an I/O error occurs or a #PARSE_ERROR if a file parsing error
* occurs while reading footprint library files. * occurs while reading footprint library files.
*/ */
void LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter ) void LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter );
throw( IO_ERROR, PARSE_ERROR );
void OnQuit( wxCommandEvent& event ); void OnQuit( wxCommandEvent& event );

4
include/xnode.h
View File

@ -83,7 +83,7 @@ public:
* @param nestLevel A multiple of the number of spaces to preceed the output with. * @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IO_ERROR if a system error writing the output, such as a full disk. * @throw IO_ERROR if a system error writing the output, such as a full disk.
*/ */
virtual void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ); virtual void Format( OUTPUTFORMATTER* out, int nestLevel );
/** /**
* Function FormatContents * Function FormatContents
@ -93,7 +93,7 @@ public:
* @param nestLevel A multiple of the number of spaces to preceed the output with. * @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IO_ERROR if a system error writing the output, such as a full disk. * @throw IO_ERROR if a system error writing the output, such as a full disk.
*/ */
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ); virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel );
}; };

14
new/sch_dir_lib_source.cpp
View File

@ -288,7 +288,7 @@ STRING DIR_LIB_SOURCE::makeFileName( const STRING& aPartName )
} }
void DIR_LIB_SOURCE::readString( STRING* aResult, const STRING& aFileName ) throw( IO_ERROR ) void DIR_LIB_SOURCE::readString( STRING* aResult, const STRING& aFileName )
{ {
FILE_WRAP fw = open( aFileName.c_str(), O_RDONLY ); FILE_WRAP fw = open( aFileName.c_str(), O_RDONLY );
@ -350,7 +350,7 @@ void DIR_LIB_SOURCE::readString( STRING* aResult, const STRING& aFileName ) thro
} }
void DIR_LIB_SOURCE::cache() throw( IO_ERROR ) void DIR_LIB_SOURCE::cache()
{ {
partnames.clear(); partnames.clear();
categories.clear(); categories.clear();
@ -360,7 +360,7 @@ void DIR_LIB_SOURCE::cache() throw( IO_ERROR )
DIR_LIB_SOURCE::DIR_LIB_SOURCE( const STRING& aDirectoryPath, DIR_LIB_SOURCE::DIR_LIB_SOURCE( const STRING& aDirectoryPath,
const STRING& aOptions ) throw( IO_ERROR ) : const STRING& aOptions ) :
useVersioning( strstr( aOptions.c_str(), "useVersioning" ) ) useVersioning( strstr( aOptions.c_str(), "useVersioning" ) )
{ {
sourceURI = aDirectoryPath; sourceURI = aDirectoryPath;
@ -385,7 +385,6 @@ DIR_LIB_SOURCE::~DIR_LIB_SOURCE()
void DIR_LIB_SOURCE::GetCategoricalPartNames( STRINGS* aResults, const STRING& aCategory ) void DIR_LIB_SOURCE::GetCategoricalPartNames( STRINGS* aResults, const STRING& aCategory )
throw( IO_ERROR )
{ {
PN_ITER end = aCategory.size() ? PN_ITER end = aCategory.size() ?
partnames.lower_bound( aCategory + char( '/' + 1 ) ) : partnames.lower_bound( aCategory + char( '/' + 1 ) ) :
@ -428,7 +427,6 @@ void DIR_LIB_SOURCE::GetCategoricalPartNames( STRINGS* aResults, const STRING& a
void DIR_LIB_SOURCE::GetRevisions( STRINGS* aResults, const STRING& aPartName ) void DIR_LIB_SOURCE::GetRevisions( STRINGS* aResults, const STRING& aPartName )
throw( IO_ERROR )
{ {
aResults->clear(); aResults->clear();
@ -466,7 +464,6 @@ void DIR_LIB_SOURCE::GetRevisions( STRINGS* aResults, const STRING& aPartName )
void DIR_LIB_SOURCE::ReadPart( STRING* aResult, const STRING& aPartName, const STRING& aRev ) void DIR_LIB_SOURCE::ReadPart( STRING* aResult, const STRING& aPartName, const STRING& aRev )
throw( IO_ERROR )
{ {
STRING partName = aPartName; STRING partName = aPartName;
const char* hasRev = endsWithRev( partName ); const char* hasRev = endsWithRev( partName );
@ -551,7 +548,6 @@ void DIR_LIB_SOURCE::ReadPart( STRING* aResult, const STRING& aPartName, const S
void DIR_LIB_SOURCE::ReadParts( STRINGS* aResults, const STRINGS& aPartNames ) void DIR_LIB_SOURCE::ReadParts( STRINGS* aResults, const STRINGS& aPartNames )
throw( IO_ERROR )
{ {
aResults->clear(); aResults->clear();
@ -563,7 +559,7 @@ void DIR_LIB_SOURCE::ReadParts( STRINGS* aResults, const STRINGS& aPartNames )
} }
void DIR_LIB_SOURCE::GetCategories( STRINGS* aResults ) throw( IO_ERROR ) void DIR_LIB_SOURCE::GetCategories( STRINGS* aResults )
{ {
aResults->clear(); aResults->clear();
@ -594,7 +590,7 @@ void DIR_LIB_SOURCE::Show()
#endif #endif
void DIR_LIB_SOURCE::cacheOneDir( const STRING& aCategory ) throw( IO_ERROR ) void DIR_LIB_SOURCE::cacheOneDir( const STRING& aCategory )
{ {
STRING curDir = sourceURI; STRING curDir = sourceURI;

24
new/sch_dir_lib_source.h
View File

@ -95,7 +95,7 @@ class DIR_LIB_SOURCE : public LIB_SOURCE
* Function cache * Function cache
* [re-]loads the directory cache(s). * [re-]loads the directory cache(s).
*/ */
void cache() throw( IO_ERROR ); void cache();
/** /**
* Function isCategoryName * Function isCategoryName
@ -121,7 +121,7 @@ class DIR_LIB_SOURCE : public LIB_SOURCE
* Function readString * Function readString
* reads a Sweet string into aResult. Candidate for virtual function later. * reads a Sweet string into aResult. Candidate for virtual function later.
*/ */
void readString( STRING* aResult, const STRING& aFileName ) throw( IO_ERROR ); void readString( STRING* aResult, const STRING& aFileName );
/** /**
* Function cacheOneDir * Function cacheOneDir
@ -131,7 +131,7 @@ class DIR_LIB_SOURCE : public LIB_SOURCE
* only one level of categories is supported. We know we are in the * only one level of categories is supported. We know we are in the
* top most directory if aCategory is empty. * top most directory if aCategory is empty.
*/ */
void cacheOneDir( const STRING& aCategory ) throw( IO_ERROR ); void cacheOneDir( const STRING& aCategory );
/** /**
* Function makeFileName * Function makeFileName
@ -157,27 +157,23 @@ protected:
* tree, otherwise only a single version of each part is recognized, namely the * tree, otherwise only a single version of each part is recognized, namely the
* one without the ".revN[N..]" trailer. * one without the ".revN[N..]" trailer.
*/ */
DIR_LIB_SOURCE( const STRING& aDirectoryPath, const STRING& aOptions = "" ) throw( IO_ERROR ); DIR_LIB_SOURCE( const STRING& aDirectoryPath, const STRING& aOptions = "" );
~DIR_LIB_SOURCE(); ~DIR_LIB_SOURCE();
//-----<LIB_SOURCE implementation functions >------------------------------ //-----<LIB_SOURCE implementation functions >------------------------------
void ReadPart( STRING* aResult, const STRING& aPartName, const STRING& aRev = "" ) void ReadPart( STRING* aResult, const STRING& aPartName, const STRING& aRev = "" );
throw( IO_ERROR );
void ReadParts( STRINGS* aResults, const STRINGS& aPartNames ) void ReadParts( STRINGS* aResults, const STRINGS& aPartNames );
throw( IO_ERROR );
void GetCategories( STRINGS* aResults ) throw( IO_ERROR ); void GetCategories( STRINGS* aResults );
void GetCategoricalPartNames( STRINGS* aResults, const STRING& aCategory = "" ) void GetCategoricalPartNames( STRINGS* aResults, const STRING& aCategory = "" );
throw( IO_ERROR );
void GetRevisions( STRINGS* aResults, const STRING& aPartName ) void GetRevisions( STRINGS* aResults, const STRING& aPartName );
throw( IO_ERROR );
void FindParts( STRINGS* aResults, const STRING& aQuery ) throw( IO_ERROR ) void FindParts( STRINGS* aResults, const STRING& aQuery )
{ {
// @todo // @todo
} }

6
new/sch_lib.cpp
View File

@ -155,7 +155,7 @@ LIB::~LIB()
} }
const PART* LIB::lookupPart( const LPID& aLPID ) throw( IO_ERROR ) const PART* LIB::lookupPart( const LPID& aLPID )
{ {
if( !parts ) if( !parts )
{ {
@ -228,7 +228,7 @@ const PART* LIB::lookupPart( const LPID& aLPID ) throw( IO_ERROR )
} }
PART* LIB::LookupPart( const LPID& aLPID, LIB_TABLE* aLibTable ) throw( IO_ERROR ) PART* LIB::LookupPart( const LPID& aLPID, LIB_TABLE* aLibTable )
{ {
PART* part = (PART*) lookupPart( aLPID ); PART* part = (PART*) lookupPart( aLPID );
@ -264,7 +264,7 @@ PART* LIB::LookupPart( const LPID& aLPID, LIB_TABLE* aLibTable ) throw( IO_ERROR
#if 0 && defined(DEBUG) #if 0 && defined(DEBUG)
void LIB::Test( int argc, char** argv ) throw( IO_ERROR ); void LIB::Test( int argc, char** argv );
{ {
} }

42
new/sch_lib.h
View File

@ -69,8 +69,7 @@ protected: ///< derived classes must implement
* Function ReadPart * Function ReadPart
* fetches @a aPartName's s-expression into @a aResult after clear()ing aResult. * fetches @a aPartName's s-expression into @a aResult after clear()ing aResult.
*/ */
virtual void ReadPart( STR_UTF* aResult, const STRING& aPartName, const STRING& aRev = "" ) virtual void ReadPart( STR_UTF* aResult, const STRING& aPartName, const STRING& aRev = "" ) = 0;
throw( IO_ERROR ) = 0;
/** /**
* Function ReadParts * Function ReadParts
@ -80,15 +79,13 @@ protected: ///< derived classes must implement
* does not have a version string, then the most recent version is fetched. * does not have a version string, then the most recent version is fetched.
* @param aResults receives the s-expressions * @param aResults receives the s-expressions
*/ */
virtual void ReadParts( STR_UTFS* aResults, const STRINGS& aPartNames ) virtual void ReadParts( STR_UTFS* aResults, const STRINGS& aPartNames ) = 0;
throw( IO_ERROR ) = 0;
/** /**
* Function GetCategories * Function GetCategories
* fetches all categories present in the library source into @a aResults * fetches all categories present in the library source into @a aResults
*/ */
virtual void GetCategories( STRINGS* aResults ) virtual void GetCategories( STRINGS* aResults ) = 0;
throw( IO_ERROR ) = 0;
/** /**
* Function GetCategoricalPartNames * Function GetCategoricalPartNames
@ -99,8 +96,7 @@ protected: ///< derived classes must implement
* *
* @param aResults is a place to put the fetched result, one category per STRING. * @param aResults is a place to put the fetched result, one category per STRING.
*/ */
virtual void GetCategoricalPartNames( STRINGS* aResults, const STRING& aCategory="" ) virtual void GetCategoricalPartNames( STRINGS* aResults, const STRING& aCategory="" ) = 0;
throw( IO_ERROR ) = 0;
/** /**
* Function GetRevisions * Function GetRevisions
@ -112,8 +108,7 @@ protected: ///< derived classes must implement
* the only result. This means aPartName is present in the libsource, only once * the only result. This means aPartName is present in the libsource, only once
* without a revision. This is a special case. * without a revision. This is a special case.
*/ */
virtual void GetRevisions( STRINGS* aResults, const STRING& aPartName ) virtual void GetRevisions( STRINGS* aResults, const STRING& aPartName ) = 0;
throw( IO_ERROR ) = 0;
/** /**
* Function FindParts * Function FindParts
@ -131,8 +126,7 @@ protected: ///< derived classes must implement
* *
* @param aResults is a place to put the fetched part names, one part per STRING. * @param aResults is a place to put the fetched part names, one part per STRING.
*/ */
virtual void FindParts( STRINGS* aResults, const STRING& aQuery ) virtual void FindParts( STRINGS* aResults, const STRING& aQuery ) = 0;
throw( IO_ERROR ) = 0;
//-----</abstract for implementors>-------------------------------------- //-----</abstract for implementors>--------------------------------------
@ -179,8 +173,7 @@ protected: ///< derived classes must implement
* @return STRING - if the LIB_SINK support revision numbering, then return a * @return STRING - if the LIB_SINK support revision numbering, then return a
* revision name that was next in the sequence, e.g. "rev22", else "". * revision name that was next in the sequence, e.g. "rev22", else "".
*/ */
virtual STRING WritePart( const STRING& aPartName, const STRING& aSExpression ) virtual STRING WritePart( const STRING& aPartName, const STRING& aSExpression ) = 0;
throw( IO_ERROR ) = 0;
protected: protected:
STRING sinkType; STRING sinkType;
@ -255,21 +248,20 @@ public:
* *
* @throw IO_ERROR if the part cannot be found or loaded. * @throw IO_ERROR if the part cannot be found or loaded.
*/ */
PART* LookupPart( const LPID& aLPID, LIB_TABLE* aLibTable ) PART* LookupPart( const LPID& aLPID, LIB_TABLE* aLibTable );
throw( IO_ERROR );
/** /**
* Function ReloadPart * Function ReloadPart
* will reload the part assuming the library source has a changed content * will reload the part assuming the library source has a changed content
* for it. * for it.
*/ */
void ReloadPart( PART* aPart ) throw( IO_ERROR ); void ReloadPart( PART* aPart );
/** /**
* Function GetCategories * Function GetCategories
* returns all categories of parts within this LIB into @a aResults. * returns all categories of parts within this LIB into @a aResults.
*/ */
STRINGS GetCategories() throw( IO_ERROR ); STRINGS GetCategories();
/** /**
* Function GetCategoricalPartNames * Function GetCategoricalPartNames
@ -277,7 +269,7 @@ public:
* creates cache entries for the very same parts if they do not already exist * creates cache entries for the very same parts if they do not already exist
* in this LIB (i.e. cache). * in this LIB (i.e. cache).
*/ */
STRINGS GetCategoricalPartNames( const STRING& aCategory = "" ) throw( IO_ERROR ); STRINGS GetCategoricalPartNames( const STRING& aCategory = "" );
//-----<.use delegates: source and sink>-------------------------------- //-----<.use delegates: source and sink>--------------------------------
@ -287,16 +279,16 @@ public:
* saves the part to non-volatile storage and returns the next new revision * saves the part to non-volatile storage and returns the next new revision
* name in the sequence established by the LIB_SINK. * name in the sequence established by the LIB_SINK.
*/ */
STRING WritePart( PART* aPart ) throw( IO_ERROR ); STRING WritePart( PART* aPart );
void SetPartBody( PART* aPart, const STRING& aSExpression ) throw( IO_ERROR ); void SetPartBody( PART* aPart, const STRING& aSExpression );
/** /**
* Function GetRevisions * Function GetRevisions
* returns the revisions of @a aPartName that are present in this LIB. * returns the revisions of @a aPartName that are present in this LIB.
* The returned STRINGS will look like "rev1", "rev2", etc. * The returned STRINGS will look like "rev1", "rev2", etc.
*/ */
STRINGS GetRevisions( const STRING& aPartName ) throw( IO_ERROR ); STRINGS GetRevisions( const STRING& aPartName );
/** /**
* Function FindParts * Function FindParts
@ -311,7 +303,7 @@ public:
* here is an RPN s-expression that uses (and ..) and (or ..) operators. For example * here is an RPN s-expression that uses (and ..) and (or ..) operators. For example
* "(and (footprint 0805)(value 33ohm)(category passives))" * "(and (footprint 0805)(value 33ohm)(category passives))"
*/ */
STRINGS FindParts( const STRING& aQuery ) throw( IO_ERROR ) STRINGS FindParts( const STRING& aQuery )
{ {
// run the query on the cached data first for any PARTS which are fully // run the query on the cached data first for any PARTS which are fully
// parsed (i.e. cached), then on the LIB_SOURCE to find any that // parsed (i.e. cached), then on the LIB_SOURCE to find any that
@ -321,7 +313,7 @@ public:
} }
#if defined(DEBUG) #if defined(DEBUG)
static void Test( int argc, char** argv ) throw( IO_ERROR ); static void Test( int argc, char** argv );
#endif #endif
protected: protected:
@ -356,7 +348,7 @@ protected:
* *
* @return PART* - the cached PART, or NULL if not found. No ownership transferred. * @return PART* - the cached PART, or NULL if not found. No ownership transferred.
*/ */
const PART* lookupPart( const LPID& aLPID ) throw( IO_ERROR ); const PART* lookupPart( const LPID& aLPID );
}; };

11
new/sch_lib_table.cpp
View File

@ -35,7 +35,7 @@ using namespace SCH;
using namespace LT; // tokens, enum T for LIB_TABLE using namespace LT; // tokens, enum T for LIB_TABLE
LIB_TABLE::LIB_TABLE( LIB_TABLE* aFallBackTable ) : LIB_TABLE::LIB_TABLE( LIB_TABLE* aFallBackTable ):
fallBack( aFallBackTable ) fallBack( aFallBackTable )
{ {
// not copying fall back, simply search aFallBackTable separately // not copying fall back, simply search aFallBackTable separately
@ -43,7 +43,7 @@ LIB_TABLE::LIB_TABLE( LIB_TABLE* aFallBackTable ) :
} }
void LIB_TABLE::Parse( SCH_LIB_TABLE_LEXER* in ) throw( IO_ERROR, PARSE_ERROR ) void LIB_TABLE::Parse( SCH_LIB_TABLE_LEXER* in )
{ {
/* grammar: /* grammar:
@ -143,7 +143,6 @@ void LIB_TABLE::Parse( SCH_LIB_TABLE_LEXER* in ) throw( IO_ERROR, PARSE_ERROR )
void LIB_TABLE::Format( OUTPUTFORMATTER* out, int nestLevel ) const void LIB_TABLE::Format( OUTPUTFORMATTER* out, int nestLevel ) const
throw( IO_ERROR )
{ {
out->Print( nestLevel, "(lib_table\n" ); out->Print( nestLevel, "(lib_table\n" );
for( ROWS_CITER it = rows.begin(); it != rows.end(); ++it ) for( ROWS_CITER it = rows.begin(); it != rows.end(); ++it )
@ -153,7 +152,6 @@ void LIB_TABLE::Format( OUTPUTFORMATTER* out, int nestLevel ) const
void LIB_TABLE::ROW::Format( OUTPUTFORMATTER* out, int nestLevel ) const void LIB_TABLE::ROW::Format( OUTPUTFORMATTER* out, int nestLevel ) const
throw( IO_ERROR )
{ {
out->Print( nestLevel, "(lib (logical %s)(type %s)(full_uri %s)(options %s))\n", out->Print( nestLevel, "(lib (logical %s)(type %s)(full_uri %s)(options %s))\n",
out->Quotes( logicalName ).c_str(), out->Quotes( logicalName ).c_str(),
@ -190,9 +188,7 @@ STRINGS LIB_TABLE::GetLogicalLibs()
return ret; return ret;
} }
PART* LIB_TABLE::LookupPart( const LPID& aLPID, LIB* aLocalLib ) PART* LIB_TABLE::LookupPart( const LPID& aLPID, LIB* aLocalLib )
throw( IO_ERROR )
{ {
LIB* lib = lookupLib( aLPID, aLocalLib ); LIB* lib = lookupLib( aLPID, aLocalLib );
@ -201,7 +197,6 @@ PART* LIB_TABLE::LookupPart( const LPID& aLPID, LIB* aLocalLib )
LIB* LIB_TABLE::lookupLib( const LPID& aLPID, LIB* aFallBackLib ) LIB* LIB_TABLE::lookupLib( const LPID& aLPID, LIB* aFallBackLib )
throw( IO_ERROR )
{ {
if( aLPID.GetLogicalLib().size() ) if( aLPID.GetLogicalLib().size() )
{ {
@ -234,7 +229,7 @@ LIB* LIB_TABLE::lookupLib( const LPID& aLPID, LIB* aFallBackLib )
} }
void LIB_TABLE::loadLib( ROW* aRow ) throw( IO_ERROR ) void LIB_TABLE::loadLib( ROW* aRow )
{ {
assert( !aRow->lib ); // caller should know better. assert( !aRow->lib ); // caller should know better.

11
new/sch_lib_table.h
View File

@ -146,8 +146,7 @@ public:
* @param nestLevel is the indentation level to base all lines of the output. * @param nestLevel is the indentation level to base all lines of the output.
* Actual indentation will be 2 spaces for each nestLevel. * Actual indentation will be 2 spaces for each nestLevel.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const void Format( OUTPUTFORMATTER* out, int nestLevel ) const;
throw( IO_ERROR );
protected: protected:
@ -246,7 +245,7 @@ public:
* @param nestLevel is the indentation level to base all lines of the output. * @param nestLevel is the indentation level to base all lines of the output.
* Actual indentation will be 2 spaces for each nestLevel. * Actual indentation will be 2 spaces for each nestLevel.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ); void Format( OUTPUTFORMATTER* out, int nestLevel ) const;
/** /**
* Function LookupPart * Function LookupPart
@ -268,7 +267,7 @@ public:
* *
* @throw IO_ERROR if any problem occurs or if the part cannot be found. * @throw IO_ERROR if any problem occurs or if the part cannot be found.
*/ */
PART* LookupPart( const LPID& aLogicalPartID, LIB* aFallBackLib = NULL ) throw( IO_ERROR ); PART* LookupPart( const LPID& aLogicalPartID, LIB* aFallBackLib = NULL );
/** /**
* Function GetLogicalLibs * Function GetLogicalLibs
@ -366,14 +365,14 @@ private:
* *
* @throw IO_ERROR if any problem occurs or if the LIB cannot be found or cannot be loaded. * @throw IO_ERROR if any problem occurs or if the LIB cannot be found or cannot be loaded.
*/ */
LIB* lookupLib( const LPID& aLogicalPartID, LIB* aFallBackLib = NULL ) throw( IO_ERROR ); LIB* lookupLib( const LPID& aLogicalPartID, LIB* aFallBackLib = NULL );
/** /**
* Function loadLib * Function loadLib
* loads a LIB using information in @a aRow. Call only if LIB not * loads a LIB using information in @a aRow. Call only if LIB not
* already loaded. * already loaded.
*/ */
void loadLib( ROW* aRow ) throw( IO_ERROR ); void loadLib( ROW* aRow );
typedef boost::ptr_map<STRING, ROW> ROWS; typedef boost::ptr_map<STRING, ROW> ROWS;
typedef ROWS::iterator ROWS_ITER; typedef ROWS::iterator ROWS_ITER;

16
new/sch_part.cpp
View File

@ -37,7 +37,6 @@
* outputs a formatted "(at X Y [ANGLE])" s-expression * outputs a formatted "(at X Y [ANGLE])" s-expression
*/ */
static void formatAt( OUTPUTFORMATTER* out, const SCH::POINT& aPos, ANGLE aAngle, int indent=0 ) static void formatAt( OUTPUTFORMATTER* out, const SCH::POINT& aPos, ANGLE aAngle, int indent=0 )
throw( IO_ERROR )
{ {
// if( aPos.x || aPos.y || aAngle ) // if( aPos.x || aPos.y || aAngle )
{ {
@ -48,7 +47,6 @@
} }
static void formatStroke( OUTPUTFORMATTER* out, STROKE aStroke, int indent=0 ) static void formatStroke( OUTPUTFORMATTER* out, STROKE aStroke, int indent=0 )
throw( IO_ERROR )
{ {
if( aStroke == STROKE_DEFAULT ) if( aStroke == STROKE_DEFAULT )
out->Print( indent, "(stroke %.6g)", InternalToWidth( aStroke ) ); out->Print( indent, "(stroke %.6g)", InternalToWidth( aStroke ) );
@ -318,7 +316,6 @@ PROPERTIES::iterator PART::propertyFind( const wxString& aPropertyName )
void PART::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void PART::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
out->Print( indent, "(part %s", partNameAndRev.c_str() ); out->Print( indent, "(part %s", partNameAndRev.c_str() );
@ -392,7 +389,6 @@ void PART::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void PROPERTY::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void PROPERTY::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
wxASSERT( owner ); // all PROPERTYs should have an owner. wxASSERT( owner ); // all PROPERTYs should have an owner.
@ -433,7 +429,6 @@ TEXT_EFFECTS* PROPERTY::EffectsLookup()
void TEXT_EFFECTS::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void TEXT_EFFECTS::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
if( propName.IsEmpty() ) if( propName.IsEmpty() )
out->Print( indent, "(effects " ); out->Print( indent, "(effects " );
@ -451,7 +446,6 @@ void TEXT_EFFECTS::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void FONT::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void FONT::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
if( italic || bold || !name.IsEmpty() || size.height != FONTZ_DEFAULT || size.width != FONTZ_DEFAULT ) if( italic || bold || !name.IsEmpty() || size.height != FONTZ_DEFAULT || size.width != FONTZ_DEFAULT )
{ {
@ -476,7 +470,6 @@ void FONT::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void PIN::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void PIN::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
bool hasSignal = !signal.text.IsEmpty(); bool hasSignal = !signal.text.IsEmpty();
bool hasPad = !pad.text.IsEmpty(); bool hasPad = !pad.text.IsEmpty();
@ -516,7 +509,6 @@ PIN::~PIN()
void PINTEXT::Format( OUTPUTFORMATTER* out, const char* aElement, int indent, int ctl ) const void PINTEXT::Format( OUTPUTFORMATTER* out, const char* aElement, int indent, int ctl ) const
throw( IO_ERROR )
{ {
out->Print( indent, "(%s %s", aElement, out->Quotew( text ).c_str() ); out->Print( indent, "(%s %s", aElement, out->Quotew( text ).c_str() );
@ -530,7 +522,6 @@ void PINTEXT::Format( OUTPUTFORMATTER* out, const char* aElement, int indent, in
void POLY_LINE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void POLY_LINE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
out->Print( indent, "(%s ", pts.size() == 2 ? "line" : "polyline" ); out->Print( indent, "(%s ", pts.size() == 2 ? "line" : "polyline" );
formatContents( out, indent, ctl ); formatContents( out, indent, ctl );
@ -538,7 +529,6 @@ void POLY_LINE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void POLY_LINE::formatContents( OUTPUTFORMATTER* out, int indent, int ctl ) const void POLY_LINE::formatContents( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
formatStroke( out, stroke ); formatStroke( out, stroke );
@ -576,15 +566,12 @@ void POLY_LINE::formatContents( OUTPUTFORMATTER* out, int indent, int ctl ) con
void BEZIER::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void BEZIER::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
out->Print( indent, "(bezier " ); out->Print( indent, "(bezier " );
formatContents( out, indent, ctl ); // inherited from POLY_LINE formatContents( out, indent, ctl ); // inherited from POLY_LINE
} }
void RECTANGLE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void RECTANGLE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
// (rectangle (start X Y) (end X Y) [(stroke WIDTH)] (fill FILL_TYPE)) // (rectangle (start X Y) (end X Y) [(stroke WIDTH)] (fill FILL_TYPE))
@ -603,7 +590,6 @@ void RECTANGLE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void CIRCLE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void CIRCLE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
/* /*
(circle (center X Y)(radius LENGTH) [(stroke WIDTH)] (fill FILL_TYPE)) (circle (center X Y)(radius LENGTH) [(stroke WIDTH)] (fill FILL_TYPE))
@ -623,7 +609,6 @@ void CIRCLE::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void ARC::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void ARC::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
/* /*
(arc (pos X Y)(radius RADIUS)(start X Y)(end X Y) [(stroke WIDTH)] (fill FILL_TYPE)) (arc (pos X Y)(radius RADIUS)(start X Y)(end X Y) [(stroke WIDTH)] (fill FILL_TYPE))
@ -646,7 +631,6 @@ void ARC::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
void GR_TEXT::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const void GR_TEXT::Format( OUTPUTFORMATTER* out, int indent, int ctl ) const
throw( IO_ERROR )
{ {
/* /*
(text "This is the text that gets drawn." (text "This is the text that gets drawn."

42
new/sch_part.h
View File

@ -177,8 +177,7 @@ public:
bold( false ) bold( false )
{} {}
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
// trust compiler to write its own assignment operator for this class OK. // trust compiler to write its own assignment operator for this class OK.
}; };
@ -200,8 +199,7 @@ struct TEXT_EFFECTS
property( 0 ) property( 0 )
{} {}
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
// trust compiler to write its own assignment operator for this class OK. // trust compiler to write its own assignment operator for this class OK.
}; };
@ -246,7 +244,6 @@ public:
* outputs this object to @a aFormatter in s-expression form. * outputs this object to @a aFormatter in s-expression form.
*/ */
virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const virtual void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
throw( IO_ERROR )
{} {}
}; };
@ -263,8 +260,7 @@ protected:
int fillType; // T_none, T_filled, or T_transparent int fillType; // T_none, T_filled, or T_transparent
POINTS pts; POINTS pts;
void formatContents( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void formatContents( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
public: public:
POLY_LINE( PART* aOwner ) : POLY_LINE( PART* aOwner ) :
@ -274,8 +270,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -299,8 +294,7 @@ public:
fillType = PR::T_none; fillType = PR::T_none;
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -330,8 +324,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -362,8 +355,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -396,8 +388,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -441,8 +432,7 @@ public:
return SWEET_LEXER::TokenName( PR::T( aJustify ) ); return SWEET_LEXER::TokenName( PR::T( aJustify ) );
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -507,8 +497,7 @@ public:
return effects; return effects;
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -529,8 +518,7 @@ struct PINTEXT
isVisible( true ) isVisible( true )
{} {}
void Format( OUTPUTFORMATTER* aFormatter, const char* aElement, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, const char* aElement, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
}; };
@ -565,8 +553,7 @@ public:
return SWEET_LEXER::TokenName( PR::T( shape ) ); return SWEET_LEXER::TokenName( PR::T( shape ) );
} }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
BASE_GRAPHIC* Clone( PART* aOwner ) const BASE_GRAPHIC* Clone( PART* aOwner ) const
{ {
@ -626,7 +613,7 @@ public:
* instead an exception would be thrown. * instead an exception would be thrown.
* @throw IO_ERROR if any problem occurs or if the part cannot be found. * @throw IO_ERROR if any problem occurs or if the part cannot be found.
*/ */
PART* Lookup( LIB_TABLE* aLibTable, LIB* aFallBackLib ) throw( IO_ERROR ) PART* Lookup( LIB_TABLE* aLibTable, LIB* aFallBackLib )
{ {
if( !part ) if( !part )
{ {
@ -725,8 +712,7 @@ public:
* @param aControlBits are bit flags ORed together which control how the output * @param aControlBits are bit flags ORed together which control how the output
* is done. * is done.
*/ */
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits = 0 ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits = 0 ) const;
throw( IO_ERROR );
/** /**
* Function PropDelete * Function PropDelete

34
pagelayout_editor/page_layout_writer.cpp
View File

@ -63,26 +63,21 @@ protected:
virtual ~WORKSHEET_LAYOUT_IO() {} virtual ~WORKSHEET_LAYOUT_IO() {}
public: public:
void Format( WORKSHEET_LAYOUT* aPageLayout ) const void Format( WORKSHEET_LAYOUT* aPageLayout ) const;
throw( IO_ERROR );
void Format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const void Format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const;
throw( IO_ERROR );
private: private:
void format( WORKSHEET_LAYOUT* aPageLayout ) const void format( WORKSHEET_LAYOUT* aPageLayout ) const;
throw( IO_ERROR );
void format( WORKSHEET_DATAITEM_TEXT* aItem, int aNestLevel ) const throw( IO_ERROR ); void format( WORKSHEET_DATAITEM_TEXT* aItem, int aNestLevel ) const;
void format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const throw( IO_ERROR ); void format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const;
void format( WORKSHEET_DATAITEM_POLYPOLYGON* aItem, int aNestLevel ) void format( WORKSHEET_DATAITEM_POLYPOLYGON* aItem, int aNestLevel )
const throw( IO_ERROR ); const;
void format( WORKSHEET_DATAITEM_BITMAP* aItem, int aNestLevel ) const void format( WORKSHEET_DATAITEM_BITMAP* aItem, int aNestLevel ) const;
throw( IO_ERROR ); void formatCoordinate( const char * aToken, POINT_COORD & aCoord ) const;
void formatCoordinate( const char * aToken, POINT_COORD & aCoord ) const void formatRepeatParameters( WORKSHEET_DATAITEM* aItem ) const;
throw( IO_ERROR ); void formatOptions( WORKSHEET_DATAITEM* aItem ) const;
void formatRepeatParameters( WORKSHEET_DATAITEM* aItem ) const throw( IO_ERROR );
void formatOptions( WORKSHEET_DATAITEM* aItem ) const throw( IO_ERROR );
}; };
@ -162,7 +157,6 @@ void WORKSHEET_LAYOUT::SaveInString( wxString& aOutputString )
void WORKSHEET_LAYOUT_IO::Format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const void WORKSHEET_LAYOUT_IO::Format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
switch( aItem->GetType() ) switch( aItem->GetType() )
{ {
@ -190,7 +184,6 @@ void WORKSHEET_LAYOUT_IO::Format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) co
void WORKSHEET_LAYOUT_IO::Format( WORKSHEET_LAYOUT* aPageLayout ) const void WORKSHEET_LAYOUT_IO::Format( WORKSHEET_LAYOUT* aPageLayout ) const
throw( IO_ERROR )
{ {
LOCALE_IO toggle; // switch on/off the locale "C" notation LOCALE_IO toggle; // switch on/off the locale "C" notation
@ -230,7 +223,6 @@ void WORKSHEET_LAYOUT_IO::Format( WORKSHEET_LAYOUT* aPageLayout ) const
void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_TEXT* aItem, int aNestLevel ) const void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_TEXT* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(%s", getTokenName( T_tbtext ) ); m_out->Print( aNestLevel, "(%s", getTokenName( T_tbtext ) );
m_out->Print( 0, " %s", m_out->Quotew( aItem->m_TextBase ).c_str() ); m_out->Print( 0, " %s", m_out->Quotew( aItem->m_TextBase ).c_str() );
@ -311,7 +303,6 @@ void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_TEXT* aItem, int aNestLevel
} }
void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
if( aItem->GetType() == WORKSHEET_DATAITEM::WS_RECT ) if( aItem->GetType() == WORKSHEET_DATAITEM::WS_RECT )
m_out->Print( aNestLevel, "(%s", getTokenName( T_rect ) ); m_out->Print( aNestLevel, "(%s", getTokenName( T_rect ) );
@ -335,7 +326,6 @@ void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM* aItem, int aNestLevel ) co
void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_POLYPOLYGON* aItem, int aNestLevel ) const void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_POLYPOLYGON* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(%s", getTokenName( T_polygon ) ); m_out->Print( aNestLevel, "(%s", getTokenName( T_polygon ) );
m_out->Print( 0, " (%s %s)", getTokenName( T_name ), m_out->Print( 0, " (%s %s)", getTokenName( T_name ),
@ -386,7 +376,6 @@ void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_POLYPOLYGON* aItem, int aNe
void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_BITMAP* aItem, int aNestLevel ) const void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_BITMAP* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(%s", getTokenName( T_bitmap ) ); m_out->Print( aNestLevel, "(%s", getTokenName( T_bitmap ) );
m_out->Print( 0, " (%s %s)", getTokenName( T_name ), m_out->Print( 0, " (%s %s)", getTokenName( T_name ),
@ -416,7 +405,6 @@ void WORKSHEET_LAYOUT_IO::format( WORKSHEET_DATAITEM_BITMAP* aItem, int aNestLev
void WORKSHEET_LAYOUT_IO::formatCoordinate( const char * aToken, void WORKSHEET_LAYOUT_IO::formatCoordinate( const char * aToken,
POINT_COORD & aCoord ) const POINT_COORD & aCoord ) const
throw( IO_ERROR )
{ {
m_out->Print( 0, " (%s %s %s", aToken, m_out->Print( 0, " (%s %s %s", aToken,
double2Str( aCoord.m_Pos.x ).c_str(), double2Str( aCoord.m_Pos.x ).c_str(),
@ -445,7 +433,6 @@ void WORKSHEET_LAYOUT_IO::formatCoordinate( const char * aToken,
void WORKSHEET_LAYOUT_IO::formatRepeatParameters( WORKSHEET_DATAITEM* aItem ) const void WORKSHEET_LAYOUT_IO::formatRepeatParameters( WORKSHEET_DATAITEM* aItem ) const
throw( IO_ERROR )
{ {
if( aItem->m_RepeatCount <= 1 ) if( aItem->m_RepeatCount <= 1 )
return; return;
@ -465,7 +452,6 @@ void WORKSHEET_LAYOUT_IO::formatRepeatParameters( WORKSHEET_DATAITEM* aItem ) co
void WORKSHEET_LAYOUT_IO::formatOptions( WORKSHEET_DATAITEM* aItem ) const void WORKSHEET_LAYOUT_IO::formatOptions( WORKSHEET_DATAITEM* aItem ) const
throw( IO_ERROR )
{ {
switch( aItem->GetPage1Option() ) switch( aItem->GetPage1Option() )
{ {

8
pcb_calculator/datafile_read_write.cpp
View File

@ -123,7 +123,7 @@ static const char* regtype_str[] =
"normal", "3terminal" "normal", "3terminal"
}; };
int PCB_CALCULATOR_DATAFILE::WriteHeader( OUTPUTFORMATTER* aFormatter ) const throw( IO_ERROR ) int PCB_CALCULATOR_DATAFILE::WriteHeader( OUTPUTFORMATTER* aFormatter ) const
{ {
int nestlevel = 0; int nestlevel = 0;
aFormatter->Print( nestlevel++, "(datafile\n"); aFormatter->Print( nestlevel++, "(datafile\n");
@ -138,7 +138,7 @@ int PCB_CALCULATOR_DATAFILE::WriteHeader( OUTPUTFORMATTER* aFormatter ) const th
} }
void PCB_CALCULATOR_DATAFILE::Format( OUTPUTFORMATTER* aFormatter, void PCB_CALCULATOR_DATAFILE::Format( OUTPUTFORMATTER* aFormatter,
int aNestLevel ) const throw( IO_ERROR ) int aNestLevel ) const
{ {
// Write regulators list: // Write regulators list:
aFormatter->Print( aNestLevel++, "(%s\n", getTokenName( T_regulators ) ); aFormatter->Print( aNestLevel++, "(%s\n", getTokenName( T_regulators ) );
@ -163,7 +163,6 @@ void PCB_CALCULATOR_DATAFILE::Format( OUTPUTFORMATTER* aFormatter,
void PCB_CALCULATOR_DATAFILE::Parse( PCB_CALCULATOR_DATAFILE_PARSER* aParser ) void PCB_CALCULATOR_DATAFILE::Parse( PCB_CALCULATOR_DATAFILE_PARSER* aParser )
throw( IO_ERROR, PARSE_ERROR )
{ {
aParser->Parse( this ); aParser->Parse( this );
} }
@ -184,7 +183,7 @@ PCB_CALCULATOR_DATAFILE_PARSER::PCB_CALCULATOR_DATAFILE_PARSER( char* aLine, wxS
} }
void PCB_CALCULATOR_DATAFILE_PARSER::Parse( PCB_CALCULATOR_DATAFILE* aDataList ) throw( IO_ERROR, PARSE_ERROR ) void PCB_CALCULATOR_DATAFILE_PARSER::Parse( PCB_CALCULATOR_DATAFILE* aDataList )
{ {
T token; T token;
while( ( token = NextTok() ) != T_EOF) while( ( token = NextTok() ) != T_EOF)
@ -203,7 +202,6 @@ void PCB_CALCULATOR_DATAFILE_PARSER::Parse( PCB_CALCULATOR_DATAFILE* aDataList )
} }
void PCB_CALCULATOR_DATAFILE_PARSER::ParseRegulatorDescr( PCB_CALCULATOR_DATAFILE* aDataList ) void PCB_CALCULATOR_DATAFILE_PARSER::ParseRegulatorDescr( PCB_CALCULATOR_DATAFILE* aDataList )
throw( IO_ERROR, PARSE_ERROR )
{ {
T token; T token;
wxString name; wxString name;

10
pcb_calculator/datafile_read_write.h
View File

@ -42,9 +42,9 @@ protected:
public: public:
PCB_CALCULATOR_DATAFILE( REGULATOR_LIST * aList ); PCB_CALCULATOR_DATAFILE( REGULATOR_LIST * aList );
int WriteHeader( OUTPUTFORMATTER* aFormatter ) const throw( IO_ERROR ); int WriteHeader( OUTPUTFORMATTER* aFormatter ) const ;
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel ) const throw( IO_ERROR ); void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel ) const ;
void Parse( PCB_CALCULATOR_DATAFILE_PARSER* aParser ) throw( IO_ERROR, PARSE_ERROR ); void Parse( PCB_CALCULATOR_DATAFILE_PARSER* aParser );
}; };
@ -58,8 +58,8 @@ public:
PCB_CALCULATOR_DATAFILE_PARSER( LINE_READER* aReader ); PCB_CALCULATOR_DATAFILE_PARSER( LINE_READER* aReader );
PCB_CALCULATOR_DATAFILE_PARSER( char* aLine, wxString aSource ); PCB_CALCULATOR_DATAFILE_PARSER( char* aLine, wxString aSource );
LINE_READER* GetReader() { return reader; }; LINE_READER* GetReader() { return reader; };
void Parse( PCB_CALCULATOR_DATAFILE* aDataList ) throw( IO_ERROR, PARSE_ERROR ); void Parse( PCB_CALCULATOR_DATAFILE* aDataList );
void ParseRegulatorDescr( PCB_CALCULATOR_DATAFILE* aDataList ) throw( IO_ERROR, PARSE_ERROR ); void ParseRegulatorDescr( PCB_CALCULATOR_DATAFILE* aDataList );
}; };
#endif // PDATAFILE_READ_WRITE_H_ #endif // PDATAFILE_READ_WRITE_H_

1
pcbnew/class_netclass.cpp
View File

@ -249,7 +249,6 @@ void NETCLASS::Show( int nestLevel, std::ostream& os ) const
void NETCLASS::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void NETCLASS::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const
throw( IO_ERROR )
{ {
aFormatter->Print( aNestLevel, "(net_class %s %s\n", aFormatter->Print( aNestLevel, "(net_class %s %s\n",
aFormatter->Quotew( GetName() ).c_str(), aFormatter->Quotew( GetName() ).c_str(),

3
pcbnew/class_netclass.h
View File

@ -210,8 +210,7 @@ public:
* @param aControlBits The control bit definition for object specific formatting. * @param aControlBits The control bit definition for object specific formatting.
* @throw IO_ERROR on write error. * @throw IO_ERROR on write error.
*/ */
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControlBits ) const;
throw( IO_ERROR );
#if defined(DEBUG) #if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ) const; void Show( int nestLevel, std::ostream& os ) const;

2
pcbnew/github/github_plugin.cpp
View File

@ -529,7 +529,7 @@ bool GITHUB_PLUGIN::repoURL_zipURL( const wxString& aRepoURL, std::string* aZipU
} }
void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL ) throw( IO_ERROR ) void GITHUB_PLUGIN::remoteGetZip( const wxString& aRepoURL )
{ {
std::string zip_url; std::string zip_url;

2
pcbnew/github/github_plugin.h
View File

@ -221,7 +221,7 @@ protected:
* is received into the m_input_stream. If the image has already been stored, * is received into the m_input_stream. If the image has already been stored,
* do nothing. * do nothing.
*/ */
void remoteGetZip( const wxString& aRepoURL ) throw( IO_ERROR ); void remoteGetZip( const wxString& aRepoURL );
wxString m_lib_path; ///< from aLibraryPath, something like https://github.com/liftoff-sr/pretty_footprints wxString m_lib_path; ///< from aLibraryPath, something like https://github.com/liftoff-sr/pretty_footprints
std::string m_zip_image; ///< byte image of the zip file in its entirety. std::string m_zip_image; ///< byte image of the zip file in its entirety.

4
pcbnew/gpcb_plugin.cpp
View File

@ -187,7 +187,7 @@ class GPCB_FPL_CACHE
wxDateTime m_mod_time; /// Footprint library path modified time stamp. wxDateTime m_mod_time; /// Footprint library path modified time stamp.
MODULE_MAP m_modules; /// Map of footprint file name per MODULE*. MODULE_MAP m_modules; /// Map of footprint file name per MODULE*.
MODULE* parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR, PARSE_ERROR ); MODULE* parseMODULE( LINE_READER* aLineReader );
/** /**
* Function testFlags * Function testFlags
@ -418,7 +418,7 @@ bool GPCB_FPL_CACHE::IsModified( const wxString& aLibPath, const wxString& aFoot
} }
MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR, PARSE_ERROR ) MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader )
{ {
#define TEXT_DEFAULT_SIZE ( 40*IU_PER_MILS ) #define TEXT_DEFAULT_SIZE ( 40*IU_PER_MILS )
#define OLD_GPCB_UNIT_CONV IU_PER_MILS #define OLD_GPCB_UNIT_CONV IU_PER_MILS

12
pcbnew/kicad_netlist_reader.cpp
View File

@ -35,7 +35,7 @@
using namespace NL_T; using namespace NL_T;
void KICAD_NETLIST_READER::LoadNetlist() throw ( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) void KICAD_NETLIST_READER::LoadNetlist()
{ {
m_parser->Parse(); m_parser->Parse();
@ -61,7 +61,7 @@ KICAD_NETLIST_PARSER::KICAD_NETLIST_PARSER( LINE_READER* aReader, NETLIST* aNetl
} }
void KICAD_NETLIST_PARSER::skipCurrent() throw( IO_ERROR, PARSE_ERROR ) void KICAD_NETLIST_PARSER::skipCurrent()
{ {
int curr_level = 0; int curr_level = 0;
@ -81,7 +81,7 @@ void KICAD_NETLIST_PARSER::skipCurrent() throw( IO_ERROR, PARSE_ERROR )
} }
void KICAD_NETLIST_PARSER::Parse() throw( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) void KICAD_NETLIST_PARSER::Parse()
{ {
int plevel = 0; // the count of ')' to read and end of file, int plevel = 0; // the count of ')' to read and end of file,
// after parsing all sections // after parsing all sections
@ -177,7 +177,7 @@ void KICAD_NETLIST_PARSER::Parse() throw( IO_ERROR, PARSE_ERROR, boost::bad_poin
} }
void KICAD_NETLIST_PARSER::parseNet() throw( IO_ERROR, PARSE_ERROR ) void KICAD_NETLIST_PARSER::parseNet()
{ {
/* Parses a section like /* Parses a section like
* (net (code 20) (name /PC-A0) * (net (code 20) (name /PC-A0)
@ -268,7 +268,7 @@ void KICAD_NETLIST_PARSER::parseNet() throw( IO_ERROR, PARSE_ERROR )
} }
void KICAD_NETLIST_PARSER::parseComponent() throw( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) void KICAD_NETLIST_PARSER::parseComponent()
{ {
/* Parses a section like /* Parses a section like
* (comp (ref P1) * (comp (ref P1)
@ -380,7 +380,7 @@ void KICAD_NETLIST_PARSER::parseComponent() throw( IO_ERROR, PARSE_ERROR, boost:
} }
void KICAD_NETLIST_PARSER::parseLibPartList() throw( IO_ERROR, PARSE_ERROR ) void KICAD_NETLIST_PARSER::parseLibPartList()
{ {
/* Parses a section like /* Parses a section like
* (libpart (lib device) (part C) * (libpart (lib device) (part C)

14
pcbnew/kicad_plugin.cpp
View File

@ -432,7 +432,6 @@ void PCB_IO::Save( const wxString& aFileName, BOARD* aBoard, const PROPERTIES* a
BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput ) BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput )
throw( FUTURE_FORMAT_ERROR, PARSE_ERROR, IO_ERROR )
{ {
std::string input = TO_UTF8( aClipboardSourceInput ); std::string input = TO_UTF8( aClipboardSourceInput );
@ -455,7 +454,6 @@ BOARD_ITEM* PCB_IO::Parse( const wxString& aClipboardSourceInput )
void PCB_IO::Format( BOARD_ITEM* aItem, int aNestLevel ) const void PCB_IO::Format( BOARD_ITEM* aItem, int aNestLevel ) const
throw( IO_ERROR )
{ {
LOCALE_IO toggle; // public API function, perform anything convenient for caller LOCALE_IO toggle; // public API function, perform anything convenient for caller
@ -527,7 +525,6 @@ void PCB_IO::formatLayer( const BOARD_ITEM* aItem ) const
void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
throw( IO_ERROR )
{ {
const BOARD_DESIGN_SETTINGS& dsnSettings = aBoard->GetDesignSettings(); const BOARD_DESIGN_SETTINGS& dsnSettings = aBoard->GetDesignSettings();
@ -784,7 +781,6 @@ void PCB_IO::format( BOARD* aBoard, int aNestLevel ) const
void PCB_IO::format( DIMENSION* aDimension, int aNestLevel ) const void PCB_IO::format( DIMENSION* aDimension, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(dimension %s (width %s)", m_out->Print( aNestLevel, "(dimension %s (width %s)",
FMT_IU( aDimension->GetValue() ).c_str(), FMT_IU( aDimension->GetValue() ).c_str(),
@ -846,7 +842,6 @@ void PCB_IO::format( DIMENSION* aDimension, int aNestLevel ) const
void PCB_IO::format( DRAWSEGMENT* aSegment, int aNestLevel ) const void PCB_IO::format( DRAWSEGMENT* aSegment, int aNestLevel ) const
throw( IO_ERROR )
{ {
unsigned i; unsigned i;
@ -912,7 +907,6 @@ void PCB_IO::format( DRAWSEGMENT* aSegment, int aNestLevel ) const
void PCB_IO::format( EDGE_MODULE* aModuleDrawing, int aNestLevel ) const void PCB_IO::format( EDGE_MODULE* aModuleDrawing, int aNestLevel ) const
throw( IO_ERROR )
{ {
switch( aModuleDrawing->GetShape() ) switch( aModuleDrawing->GetShape() )
{ {
@ -976,7 +970,6 @@ void PCB_IO::format( EDGE_MODULE* aModuleDrawing, int aNestLevel ) const
void PCB_IO::format( PCB_TARGET* aTarget, int aNestLevel ) const void PCB_IO::format( PCB_TARGET* aTarget, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(target %s (at %s) (size %s)", m_out->Print( aNestLevel, "(target %s (at %s) (size %s)",
( aTarget->GetShape() ) ? "x" : "plus", ( aTarget->GetShape() ) ? "x" : "plus",
@ -996,7 +989,6 @@ void PCB_IO::format( PCB_TARGET* aTarget, int aNestLevel ) const
void PCB_IO::format( MODULE* aModule, int aNestLevel ) const void PCB_IO::format( MODULE* aModule, int aNestLevel ) const
throw( IO_ERROR )
{ {
if( !( m_ctl & CTL_OMIT_INITIAL_COMMENTS ) ) if( !( m_ctl & CTL_OMIT_INITIAL_COMMENTS ) )
{ {
@ -1147,7 +1139,6 @@ void PCB_IO::format( MODULE* aModule, int aNestLevel ) const
void PCB_IO::formatLayers( LSET aLayerMask, int aNestLevel ) const void PCB_IO::formatLayers( LSET aLayerMask, int aNestLevel ) const
throw( IO_ERROR )
{ {
std::string output; std::string output;
@ -1246,7 +1237,6 @@ void PCB_IO::formatLayers( LSET aLayerMask, int aNestLevel ) const
void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
throw( IO_ERROR )
{ {
const char* shape; const char* shape;
@ -1365,7 +1355,6 @@ void PCB_IO::format( D_PAD* aPad, int aNestLevel ) const
void PCB_IO::format( TEXTE_PCB* aText, int aNestLevel ) const void PCB_IO::format( TEXTE_PCB* aText, int aNestLevel ) const
throw( IO_ERROR )
{ {
m_out->Print( aNestLevel, "(gr_text %s (at %s", m_out->Print( aNestLevel, "(gr_text %s (at %s",
m_out->Quotew( aText->GetText() ).c_str(), m_out->Quotew( aText->GetText() ).c_str(),
@ -1390,7 +1379,6 @@ void PCB_IO::format( TEXTE_PCB* aText, int aNestLevel ) const
void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const
throw( IO_ERROR )
{ {
wxString type; wxString type;
@ -1448,7 +1436,6 @@ void PCB_IO::format( TEXTE_MODULE* aText, int aNestLevel ) const
void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const
throw( IO_ERROR )
{ {
if( aTrack->Type() == PCB_VIA_T ) if( aTrack->Type() == PCB_VIA_T )
{ {
@ -1514,7 +1501,6 @@ void PCB_IO::format( TRACK* aTrack, int aNestLevel ) const
void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const void PCB_IO::format( ZONE_CONTAINER* aZone, int aNestLevel ) const
throw( IO_ERROR )
{ {
// Save the NET info; For keepout zones, net code and net name are irrelevant // Save the NET info; For keepout zones, net code and net name are irrelevant
// so be sure a dummy value is stored, just for ZONE_CONTAINER compatibility // so be sure a dummy value is stored, just for ZONE_CONTAINER compatibility

42
pcbnew/kicad_plugin.h
View File

@ -145,8 +145,7 @@ public:
* @param aNestLevel The indentation nest level. * @param aNestLevel The indentation nest level.
* @throw IO_ERROR on write error. * @throw IO_ERROR on write error.
*/ */
void Format( BOARD_ITEM* aItem, int aNestLevel = 0 ) const void Format( BOARD_ITEM* aItem, int aNestLevel = 0 ) const;
throw( IO_ERROR );
std::string GetStringOutput( bool doClear ) std::string GetStringOutput( bool doClear )
{ {
@ -159,8 +158,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( FUTURE_FORMAT_ERROR, PARSE_ERROR, IO_ERROR );
protected: protected:
@ -189,43 +187,31 @@ protected:
void init( const PROPERTIES* aProperties ); void init( const PROPERTIES* aProperties );
private: private:
void format( BOARD* aBoard, int aNestLevel = 0 ) const void format( BOARD* aBoard, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( DIMENSION* aDimension, int aNestLevel = 0 ) const void format( DIMENSION* aDimension, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( EDGE_MODULE* aModuleDrawing, int aNestLevel = 0 ) const void format( EDGE_MODULE* aModuleDrawing, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( DRAWSEGMENT* aSegment, int aNestLevel = 0 ) const void format( DRAWSEGMENT* aSegment, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( PCB_TARGET* aTarget, int aNestLevel = 0 ) const void format( PCB_TARGET* aTarget, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( MODULE* aModule, int aNestLevel = 0 ) const void format( MODULE* aModule, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( D_PAD* aPad, int aNestLevel = 0 ) const void format( D_PAD* aPad, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( TEXTE_PCB* aText, int aNestLevel = 0 ) const void format( TEXTE_PCB* aText, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( TEXTE_MODULE* aText, int aNestLevel = 0 ) const void format( TEXTE_MODULE* aText, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( TRACK* aTrack, int aNestLevel = 0 ) const void format( TRACK* aTrack, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void format( ZONE_CONTAINER* aZone, int aNestLevel = 0 ) const void format( ZONE_CONTAINER* aZone, int aNestLevel = 0 ) const;
throw( IO_ERROR );
void formatLayer( const BOARD_ITEM* aItem ) const; void formatLayer( const BOARD_ITEM* aItem ) const;
void formatLayers( LSET aLayerMask, int aNestLevel = 0 ) const void formatLayers( LSET aLayerMask, int aNestLevel = 0 ) const;
throw( IO_ERROR );
}; };
#endif // KICAD_PLUGIN_H_ #endif // KICAD_PLUGIN_H_

7
pcbnew/legacy_netlist_reader.cpp
View File

@ -34,7 +34,7 @@
#include <pcb_netlist.h> #include <pcb_netlist.h>
#include <netlist_reader.h> #include <netlist_reader.h>
void LEGACY_NETLIST_READER::LoadNetlist() throw ( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) void LEGACY_NETLIST_READER::LoadNetlist()
{ {
int state = 0; int state = 0;
bool is_comment = false; bool is_comment = false;
@ -97,7 +97,6 @@ void LEGACY_NETLIST_READER::LoadNetlist() throw ( IO_ERROR, PARSE_ERROR, boost::
COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText ) COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText )
throw( PARSE_ERROR, boost::bad_pointer )
{ {
char* text; char* text;
wxString msg; wxString msg;
@ -178,7 +177,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText )
} }
void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent ) throw( PARSE_ERROR ) void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent )
{ {
wxString msg; wxString msg;
char* p; char* p;
@ -212,7 +211,7 @@ void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent ) throw(
} }
void LEGACY_NETLIST_READER::loadFootprintFilters() throw( IO_ERROR, PARSE_ERROR ) void LEGACY_NETLIST_READER::loadFootprintFilters()
{ {
wxArrayString filters; wxArrayString filters;
wxString cmpRef; wxString cmpRef;

1
pcbnew/loadcmp.cpp
View File

@ -332,7 +332,6 @@ MODULE* PCB_BASE_FRAME::LoadFootprint( const LIB_ID& aFootprintId )
MODULE* PCB_BASE_FRAME::loadFootprint( const LIB_ID& aFootprintId ) MODULE* PCB_BASE_FRAME::loadFootprint( const LIB_ID& aFootprintId )
throw( IO_ERROR, PARSE_ERROR, boost::interprocess::lock_exception )
{ {
FP_LIB_TABLE* fptbl = Prj().PcbFootprintLibs(); FP_LIB_TABLE* fptbl = Prj().PcbFootprintLibs();

1
pcbnew/netlist.cpp
View File

@ -224,7 +224,6 @@ MODULE* PCB_EDIT_FRAME::ListAndSelectModuleName()
#define ALLOW_PARTIAL_FPID 1 #define ALLOW_PARTIAL_FPID 1
void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter ) void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter )
throw( IO_ERROR, PARSE_ERROR )
{ {
wxString msg; wxString msg;
LIB_ID lastFPID; LIB_ID lastFPID;

3
pcbnew/netlist_reader.cpp
View File

@ -79,7 +79,6 @@ NETLIST_READER::NETLIST_FILE_T NETLIST_READER::GuessNetlistFileType( LINE_READER
NETLIST_READER* NETLIST_READER::GetNetlistReader( NETLIST* aNetlist, NETLIST_READER* NETLIST_READER::GetNetlistReader( NETLIST* aNetlist,
const wxString& aNetlistFileName, const wxString& aNetlistFileName,
const wxString& aCompFootprintFileName ) const wxString& aCompFootprintFileName )
throw( IO_ERROR )
{ {
wxASSERT( aNetlist != NULL ); wxASSERT( aNetlist != NULL );
@ -110,7 +109,7 @@ NETLIST_READER* NETLIST_READER::GetNetlistReader( NETLIST* aNetlist,
} }
bool CMP_READER::Load( NETLIST* aNetlist ) throw( IO_ERROR, PARSE_ERROR ) bool CMP_READER::Load( NETLIST* aNetlist )
{ {
wxCHECK_MSG( aNetlist != NULL,true, wxT( "No netlist passed to CMP_READER::Load()" ) ); wxCHECK_MSG( aNetlist != NULL,true, wxT( "No netlist passed to CMP_READER::Load()" ) );

27
pcbnew/netlist_reader.h
View File

@ -100,7 +100,7 @@ public:
* is not updated. This is an usual case, in CvPcb, but can be used to * is not updated. This is an usual case, in CvPcb, but can be used to
* print a warning in Pcbnew. * print a warning in Pcbnew.
*/ */
bool Load( NETLIST* aNetlist ) throw( IO_ERROR, PARSE_ERROR ); bool Load( NETLIST* aNetlist );
}; };
@ -170,8 +170,7 @@ public:
*/ */
static NETLIST_READER* GetNetlistReader( NETLIST* aNetlist, static NETLIST_READER* GetNetlistReader( NETLIST* aNetlist,
const wxString& aNetlistFileName, const wxString& aNetlistFileName,
const wxString& aCompFootprintFileName = wxEmptyString ) const wxString& aCompFootprintFileName = wxEmptyString );
throw( IO_ERROR );
/** /**
* Function LoadNetlist * Function LoadNetlist
@ -180,7 +179,7 @@ public:
* @throw IO_ERROR if a file IO error occurs. * @throw IO_ERROR if a file IO error occurs.
* @throw PARSE_ERROR if an error occurs while parsing the file. * @throw PARSE_ERROR if an error occurs while parsing the file.
*/ */
virtual void LoadNetlist() throw( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) = 0; virtual void LoadNetlist() = 0;
/** /**
* Function GetLineReader() * Function GetLineReader()
@ -220,7 +219,7 @@ class LEGACY_NETLIST_READER : public NETLIST_READER
* @return the new component created by parsing \a aLine * @return the new component created by parsing \a aLine
* @throw PARSE_ERROR when \a aLine is not a valid component description. * @throw PARSE_ERROR when \a aLine is not a valid component description.
*/ */
COMPONENT* loadComponent( char* aText ) throw( PARSE_ERROR, boost::bad_pointer ); COMPONENT* loadComponent( char* aText );
/** /**
* Function loadFootprintFilters * Function loadFootprintFilters
@ -241,7 +240,7 @@ class LEGACY_NETLIST_READER : public NETLIST_READER
* @throw IO_ERROR if a file IO error occurs. * @throw IO_ERROR if a file IO error occurs.
* @throw PARSE_ERROR if an error occurs while parsing the file. * @throw PARSE_ERROR if an error occurs while parsing the file.
*/ */
void loadFootprintFilters() throw( IO_ERROR, PARSE_ERROR ); void loadFootprintFilters();
/** /**
* Function loadNet * Function loadNet
@ -251,7 +250,7 @@ class LEGACY_NETLIST_READER : public NETLIST_READER
* @param aComponent is the component to add the net to. * @param aComponent is the component to add the net to.
* @throw PARSE_ERROR if a error occurs reading \a aText. * @throw PARSE_ERROR if a error occurs reading \a aText.
*/ */
void loadNet( char* aText, COMPONENT* aComponent ) throw( PARSE_ERROR ); void loadNet( char* aText, COMPONENT* aComponent );
public: public:
@ -283,7 +282,7 @@ public:
* @throw IO_ERROR if a file IO error occurs. * @throw IO_ERROR if a file IO error occurs.
* @throw PARSE_ERROR if an error occurs while parsing the file. * @throw PARSE_ERROR if an error occurs while parsing the file.
*/ */
virtual void LoadNetlist() throw ( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) override; virtual void LoadNetlist() override;
}; };
@ -303,7 +302,7 @@ private:
* Skip the current token level, i.e * Skip the current token level, i.e
* search for the RIGHT parenthesis which closes the current description * search for the RIGHT parenthesis which closes the current description
*/ */
void skipCurrent() throw( IO_ERROR, PARSE_ERROR ); void skipCurrent();
/** /**
* Function parseComponent * Function parseComponent
@ -315,7 +314,7 @@ private:
* (sheetpath (names /) (tstamps /)) * (sheetpath (names /) (tstamps /))
* (tstamp 3256759C)) * (tstamp 3256759C))
*/ */
void parseComponent() throw( IO_ERROR, PARSE_ERROR, boost::bad_pointer ); void parseComponent();
/** /**
* Function parseNet * Function parseNet
@ -327,7 +326,7 @@ private:
* *
* and set the corresponding pads netnames * and set the corresponding pads netnames
*/ */
void parseNet() throw( IO_ERROR, PARSE_ERROR ); void parseNet();
/** /**
* Function parseLibPartList * Function parseLibPartList
@ -351,7 +350,7 @@ private:
* <p>This section is used by CvPcb, and is not useful in Pcbnew, * <p>This section is used by CvPcb, and is not useful in Pcbnew,
* therefore it it not always read </p> * therefore it it not always read </p>
*/ */
void parseLibPartList() throw( IO_ERROR, PARSE_ERROR ); void parseLibPartList();
public: public:
@ -365,7 +364,7 @@ public:
* Function Parse * Function Parse
* parse the full netlist * parse the full netlist
*/ */
void Parse() throw( IO_ERROR, PARSE_ERROR, boost::bad_pointer ); void Parse();
// Useful for debug only: // Useful for debug only:
const char* getTokenName( NL_T::T aTok ) const char* getTokenName( NL_T::T aTok )
@ -397,7 +396,7 @@ public:
delete m_parser; delete m_parser;
} }
virtual void LoadNetlist() throw ( IO_ERROR, PARSE_ERROR, boost::bad_pointer ) override; virtual void LoadNetlist() override;
}; };

66
pcbnew/pcb_parser.cpp
View File

@ -121,7 +121,7 @@ void PCB_PARSER::pushValueIntoMap( int aIndex, int aValue )
m_netCodes[aIndex] = aValue; m_netCodes[aIndex] = aValue;
} }
double PCB_PARSER::parseDouble() throw( IO_ERROR ) double PCB_PARSER::parseDouble()
{ {
char* tmp; char* tmp;
@ -151,7 +151,7 @@ double PCB_PARSER::parseDouble() throw( IO_ERROR )
} }
bool PCB_PARSER::parseBool() throw( PARSE_ERROR ) bool PCB_PARSER::parseBool()
{ {
T token = NextTok(); T token = NextTok();
@ -166,7 +166,7 @@ bool PCB_PARSER::parseBool() throw( PARSE_ERROR )
} }
int PCB_PARSER::parseVersion() throw( IO_ERROR, PARSE_ERROR ) int PCB_PARSER::parseVersion()
{ {
if( NextTok() != T_version ) if( NextTok() != T_version )
Expecting( GetTokenText( T_version ) ); Expecting( GetTokenText( T_version ) );
@ -203,7 +203,7 @@ wxString PCB_PARSER::GetRequiredVersion()
} }
wxPoint PCB_PARSER::parseXY() throw( PARSE_ERROR, IO_ERROR ) wxPoint PCB_PARSER::parseXY()
{ {
if( CurTok() != T_LEFT ) if( CurTok() != T_LEFT )
NeedLEFT(); NeedLEFT();
@ -223,7 +223,7 @@ wxPoint PCB_PARSER::parseXY() throw( PARSE_ERROR, IO_ERROR )
} }
void PCB_PARSER::parseXY( int* aX, int* aY ) throw( PARSE_ERROR, IO_ERROR ) void PCB_PARSER::parseXY( int* aX, int* aY )
{ {
wxPoint pt = parseXY(); wxPoint pt = parseXY();
@ -235,7 +235,7 @@ void PCB_PARSER::parseXY( int* aX, int* aY ) throw( PARSE_ERROR, IO_ERROR )
} }
void PCB_PARSER::parseEDA_TEXT( EDA_TEXT* aText ) throw( PARSE_ERROR, IO_ERROR ) void PCB_PARSER::parseEDA_TEXT( EDA_TEXT* aText )
{ {
wxCHECK_RET( CurTok() == T_effects, wxCHECK_RET( CurTok() == T_effects,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as EDA_TEXT." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as EDA_TEXT." ) );
@ -332,7 +332,7 @@ void PCB_PARSER::parseEDA_TEXT( EDA_TEXT* aText ) throw( PARSE_ERROR, IO_ERROR )
} }
S3D_INFO* PCB_PARSER::parse3DModel() throw( PARSE_ERROR, IO_ERROR ) S3D_INFO* PCB_PARSER::parse3DModel()
{ {
wxCHECK_MSG( CurTok() == T_model, NULL, wxCHECK_MSG( CurTok() == T_model, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as S3D_INFO." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as S3D_INFO." ) );
@ -402,7 +402,7 @@ S3D_INFO* PCB_PARSER::parse3DModel() throw( PARSE_ERROR, IO_ERROR )
} }
BOARD_ITEM* PCB_PARSER::Parse() throw( IO_ERROR, PARSE_ERROR ) BOARD_ITEM* PCB_PARSER::Parse()
{ {
T token; T token;
BOARD_ITEM* item; BOARD_ITEM* item;
@ -441,7 +441,7 @@ BOARD_ITEM* PCB_PARSER::Parse() throw( IO_ERROR, PARSE_ERROR )
} }
BOARD* PCB_PARSER::parseBOARD() throw( IO_ERROR, PARSE_ERROR, FUTURE_FORMAT_ERROR ) BOARD* PCB_PARSER::parseBOARD()
{ {
try try
{ {
@ -457,7 +457,7 @@ BOARD* PCB_PARSER::parseBOARD() throw( IO_ERROR, PARSE_ERROR, FUTURE_FORMAT_ERRO
} }
BOARD* PCB_PARSER::parseBOARD_unchecked() throw( IO_ERROR, PARSE_ERROR ) BOARD* PCB_PARSER::parseBOARD_unchecked()
{ {
T token; T token;
@ -547,7 +547,7 @@ BOARD* PCB_PARSER::parseBOARD_unchecked() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parseHeader() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseHeader()
{ {
wxCHECK_RET( CurTok() == T_kicad_pcb, wxCHECK_RET( CurTok() == T_kicad_pcb,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a header." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a header." ) );
@ -583,7 +583,7 @@ void PCB_PARSER::parseHeader() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parseGeneralSection() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseGeneralSection()
{ {
wxCHECK_RET( CurTok() == T_general, wxCHECK_RET( CurTok() == T_general,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
@ -628,7 +628,7 @@ void PCB_PARSER::parseGeneralSection() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parsePAGE_INFO() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parsePAGE_INFO()
{ {
wxCHECK_RET( CurTok() == T_page, wxCHECK_RET( CurTok() == T_page,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a PAGE_INFO." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a PAGE_INFO." ) );
@ -684,7 +684,7 @@ void PCB_PARSER::parsePAGE_INFO() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseTITLE_BLOCK()
{ {
wxCHECK_RET( CurTok() == T_title_block, wxCHECK_RET( CurTok() == T_title_block,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
@ -767,7 +767,7 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parseLayer( LAYER* aLayer ) throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseLayer( LAYER* aLayer )
{ {
T token; T token;
@ -809,7 +809,7 @@ void PCB_PARSER::parseLayer( LAYER* aLayer ) throw( IO_ERROR, PARSE_ERROR )
void PCB_PARSER::parseLayers() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseLayers()
{ {
wxCHECK_RET( CurTok() == T_layers, wxCHECK_RET( CurTok() == T_layers,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as layers." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as layers." ) );
@ -922,7 +922,7 @@ void PCB_PARSER::parseLayers() throw( IO_ERROR, PARSE_ERROR )
template<class T, class M> template<class T, class M>
T PCB_PARSER::lookUpLayer( const M& aMap ) throw( PARSE_ERROR, IO_ERROR ) T PCB_PARSER::lookUpLayer( const M& aMap )
{ {
// avoid constructing another std::string, use lexer's directly // avoid constructing another std::string, use lexer's directly
typename M::const_iterator it = aMap.find( curText ); typename M::const_iterator it = aMap.find( curText );
@ -955,7 +955,7 @@ T PCB_PARSER::lookUpLayer( const M& aMap ) throw( PARSE_ERROR, IO_ERROR )
} }
PCB_LAYER_ID PCB_PARSER::parseBoardItemLayer() throw( PARSE_ERROR, IO_ERROR ) PCB_LAYER_ID PCB_PARSER::parseBoardItemLayer()
{ {
wxCHECK_MSG( CurTok() == T_layer, UNDEFINED_LAYER, wxCHECK_MSG( CurTok() == T_layer, UNDEFINED_LAYER,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as layer." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as layer." ) );
@ -970,7 +970,7 @@ PCB_LAYER_ID PCB_PARSER::parseBoardItemLayer() throw( PARSE_ERROR, IO_ERROR )
} }
LSET PCB_PARSER::parseBoardItemLayersAsMask() throw( PARSE_ERROR, IO_ERROR ) LSET PCB_PARSER::parseBoardItemLayersAsMask()
{ {
wxCHECK_MSG( CurTok() == T_layers, LSET(), wxCHECK_MSG( CurTok() == T_layers, LSET(),
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
@ -988,7 +988,7 @@ LSET PCB_PARSER::parseBoardItemLayersAsMask() throw( PARSE_ERROR, IO_ERROR )
} }
void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseSetup()
{ {
wxCHECK_RET( CurTok() == T_setup, wxCHECK_RET( CurTok() == T_setup,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as setup." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as setup." ) );
@ -1223,7 +1223,7 @@ void PCB_PARSER::parseSetup() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parseNETINFO_ITEM() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseNETINFO_ITEM()
{ {
wxCHECK_RET( CurTok() == T_net, wxCHECK_RET( CurTok() == T_net,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as net." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as net." ) );
@ -1249,7 +1249,7 @@ void PCB_PARSER::parseNETINFO_ITEM() throw( IO_ERROR, PARSE_ERROR )
} }
void PCB_PARSER::parseNETCLASS() throw( IO_ERROR, PARSE_ERROR ) void PCB_PARSER::parseNETCLASS()
{ {
wxCHECK_RET( CurTok() == T_net_class, wxCHECK_RET( CurTok() == T_net_class,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as net class." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as net class." ) );
@ -1332,7 +1332,7 @@ void PCB_PARSER::parseNETCLASS() throw( IO_ERROR, PARSE_ERROR )
} }
DRAWSEGMENT* PCB_PARSER::parseDRAWSEGMENT() throw( IO_ERROR, PARSE_ERROR ) DRAWSEGMENT* PCB_PARSER::parseDRAWSEGMENT()
{ {
wxCHECK_MSG( CurTok() == T_gr_arc || CurTok() == T_gr_circle || CurTok() == T_gr_curve || wxCHECK_MSG( CurTok() == T_gr_arc || CurTok() == T_gr_circle || CurTok() == T_gr_curve ||
CurTok() == T_gr_line || CurTok() == T_gr_poly, NULL, CurTok() == T_gr_line || CurTok() == T_gr_poly, NULL,
@ -1494,7 +1494,7 @@ DRAWSEGMENT* PCB_PARSER::parseDRAWSEGMENT() throw( IO_ERROR, PARSE_ERROR )
} }
TEXTE_PCB* PCB_PARSER::parseTEXTE_PCB() throw( IO_ERROR, PARSE_ERROR ) TEXTE_PCB* PCB_PARSER::parseTEXTE_PCB()
{ {
wxCHECK_MSG( CurTok() == T_gr_text, NULL, wxCHECK_MSG( CurTok() == T_gr_text, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as TEXTE_PCB." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as TEXTE_PCB." ) );
@ -1562,7 +1562,7 @@ TEXTE_PCB* PCB_PARSER::parseTEXTE_PCB() throw( IO_ERROR, PARSE_ERROR )
} }
DIMENSION* PCB_PARSER::parseDIMENSION() throw( IO_ERROR, PARSE_ERROR ) DIMENSION* PCB_PARSER::parseDIMENSION()
{ {
wxCHECK_MSG( CurTok() == T_dimension, NULL, wxCHECK_MSG( CurTok() == T_dimension, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as DIMENSION." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as DIMENSION." ) );
@ -1715,7 +1715,6 @@ DIMENSION* PCB_PARSER::parseDIMENSION() throw( IO_ERROR, PARSE_ERROR )
MODULE* PCB_PARSER::parseMODULE( wxArrayString* aInitialComments ) MODULE* PCB_PARSER::parseMODULE( wxArrayString* aInitialComments )
throw( IO_ERROR, PARSE_ERROR, FUTURE_FORMAT_ERROR )
{ {
try try
{ {
@ -1732,7 +1731,6 @@ MODULE* PCB_PARSER::parseMODULE( wxArrayString* aInitialComments )
MODULE* PCB_PARSER::parseMODULE_unchecked( wxArrayString* aInitialComments ) MODULE* PCB_PARSER::parseMODULE_unchecked( wxArrayString* aInitialComments )
throw( IO_ERROR, PARSE_ERROR )
{ {
wxCHECK_MSG( CurTok() == T_module, NULL, wxCHECK_MSG( CurTok() == T_module, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as MODULE." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as MODULE." ) );
@ -1983,7 +1981,7 @@ MODULE* PCB_PARSER::parseMODULE_unchecked( wxArrayString* aInitialComments )
} }
TEXTE_MODULE* PCB_PARSER::parseTEXTE_MODULE() throw( IO_ERROR, PARSE_ERROR ) TEXTE_MODULE* PCB_PARSER::parseTEXTE_MODULE()
{ {
wxCHECK_MSG( CurTok() == T_fp_text, NULL, wxCHECK_MSG( CurTok() == T_fp_text, NULL,
wxString::Format( wxT( "Cannot parse %s as TEXTE_MODULE at line %d, offset %d." ), wxString::Format( wxT( "Cannot parse %s as TEXTE_MODULE at line %d, offset %d." ),
@ -2068,7 +2066,7 @@ TEXTE_MODULE* PCB_PARSER::parseTEXTE_MODULE() throw( IO_ERROR, PARSE_ERROR )
} }
EDGE_MODULE* PCB_PARSER::parseEDGE_MODULE() throw( IO_ERROR, PARSE_ERROR ) EDGE_MODULE* PCB_PARSER::parseEDGE_MODULE()
{ {
wxCHECK_MSG( CurTok() == T_fp_arc || CurTok() == T_fp_circle || CurTok() == T_fp_curve || wxCHECK_MSG( CurTok() == T_fp_arc || CurTok() == T_fp_circle || CurTok() == T_fp_curve ||
CurTok() == T_fp_line || CurTok() == T_fp_poly, NULL, CurTok() == T_fp_line || CurTok() == T_fp_poly, NULL,
@ -2235,7 +2233,7 @@ EDGE_MODULE* PCB_PARSER::parseEDGE_MODULE() throw( IO_ERROR, PARSE_ERROR )
} }
D_PAD* PCB_PARSER::parseD_PAD( MODULE* aParent ) throw( IO_ERROR, PARSE_ERROR ) D_PAD* PCB_PARSER::parseD_PAD( MODULE* aParent )
{ {
wxCHECK_MSG( CurTok() == T_pad, NULL, wxCHECK_MSG( CurTok() == T_pad, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as D_PAD." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as D_PAD." ) );
@ -2489,7 +2487,7 @@ D_PAD* PCB_PARSER::parseD_PAD( MODULE* aParent ) throw( IO_ERROR, PARSE_ERROR )
} }
TRACK* PCB_PARSER::parseTRACK() throw( IO_ERROR, PARSE_ERROR ) TRACK* PCB_PARSER::parseTRACK()
{ {
wxCHECK_MSG( CurTok() == T_segment, NULL, wxCHECK_MSG( CurTok() == T_segment, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as TRACK." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as TRACK." ) );
@ -2555,7 +2553,7 @@ TRACK* PCB_PARSER::parseTRACK() throw( IO_ERROR, PARSE_ERROR )
} }
VIA* PCB_PARSER::parseVIA() throw( IO_ERROR, PARSE_ERROR ) VIA* PCB_PARSER::parseVIA()
{ {
wxCHECK_MSG( CurTok() == T_via, NULL, wxCHECK_MSG( CurTok() == T_via, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as VIA." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as VIA." ) );
@ -2638,7 +2636,7 @@ VIA* PCB_PARSER::parseVIA() throw( IO_ERROR, PARSE_ERROR )
} }
ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER() throw( IO_ERROR, PARSE_ERROR ) ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER()
{ {
wxCHECK_MSG( CurTok() == T_zone, NULL, wxCHECK_MSG( CurTok() == T_zone, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( "Cannot parse " ) + GetTokenString( CurTok() ) +
@ -3008,7 +3006,7 @@ ZONE_CONTAINER* PCB_PARSER::parseZONE_CONTAINER() throw( IO_ERROR, PARSE_ERROR )
} }
PCB_TARGET* PCB_PARSER::parsePCB_TARGET() throw( IO_ERROR, PARSE_ERROR ) PCB_TARGET* PCB_PARSER::parsePCB_TARGET()
{ {
wxCHECK_MSG( CurTok() == T_target, NULL, wxCHECK_MSG( CurTok() == T_target, NULL,
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as PCB_TARGET." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as PCB_TARGET." ) );

86
pcbnew/pcb_parser.h
View File

@ -102,21 +102,21 @@ class PCB_PARSER : public PCB_LEXER
*/ */
void init(); void init();
void parseHeader() throw( IO_ERROR, PARSE_ERROR ); void parseHeader();
void parseGeneralSection() throw( IO_ERROR, PARSE_ERROR ); void parseGeneralSection();
void parsePAGE_INFO() throw( IO_ERROR, PARSE_ERROR ); void parsePAGE_INFO();
void parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR ); void parseTITLE_BLOCK();
void parseLayers() throw( IO_ERROR, PARSE_ERROR ); void parseLayers();
void parseLayer( LAYER* aLayer ) throw( IO_ERROR, PARSE_ERROR ); void parseLayer( LAYER* aLayer );
void parseSetup() throw( IO_ERROR, PARSE_ERROR ); void parseSetup();
void parseNETINFO_ITEM() throw( IO_ERROR, PARSE_ERROR ); void parseNETINFO_ITEM();
void parseNETCLASS() throw( IO_ERROR, PARSE_ERROR ); void parseNETCLASS();
DRAWSEGMENT* parseDRAWSEGMENT() throw( IO_ERROR, PARSE_ERROR ); DRAWSEGMENT* parseDRAWSEGMENT();
TEXTE_PCB* parseTEXTE_PCB() throw( IO_ERROR, PARSE_ERROR ); TEXTE_PCB* parseTEXTE_PCB();
DIMENSION* parseDIMENSION() throw( IO_ERROR, PARSE_ERROR ); DIMENSION* parseDIMENSION();
/** /**
* Function parseMODULE * Function parseMODULE
@ -124,29 +124,27 @@ class PCB_PARSER : public PCB_LEXER
* or NULL. If not NULL, then caller has given ownership of a wxArrayString to * or NULL. If not NULL, then caller has given ownership of a wxArrayString to
* this function and care must be taken to delete it even on exception. * this function and care must be taken to delete it even on exception.
*/ */
MODULE* parseMODULE( wxArrayString* aInitialComments = 0 ) MODULE* parseMODULE( wxArrayString* aInitialComments = 0 );
throw( IO_ERROR, PARSE_ERROR, FUTURE_FORMAT_ERROR );
/** /**
* Function parseMODULE_unchecked * Function parseMODULE_unchecked
* Parse a module, but do not replace PARSE_ERROR with FUTURE_FORMAT_ERROR automatically. * Parse a module, but do not replace PARSE_ERROR with FUTURE_FORMAT_ERROR automatically.
*/ */
MODULE* parseMODULE_unchecked( wxArrayString* aInitialComments = 0 ) MODULE* parseMODULE_unchecked( wxArrayString* aInitialComments = 0 );
throw( IO_ERROR, PARSE_ERROR ); TEXTE_MODULE* parseTEXTE_MODULE();
TEXTE_MODULE* parseTEXTE_MODULE() throw( IO_ERROR, PARSE_ERROR ); EDGE_MODULE* parseEDGE_MODULE();
EDGE_MODULE* parseEDGE_MODULE() throw( IO_ERROR, PARSE_ERROR ); D_PAD* parseD_PAD( MODULE* aParent = NULL );
D_PAD* parseD_PAD( MODULE* aParent = NULL ) throw( IO_ERROR, PARSE_ERROR ); TRACK* parseTRACK();
TRACK* parseTRACK() throw( IO_ERROR, PARSE_ERROR ); VIA* parseVIA();
VIA* parseVIA() throw( IO_ERROR, PARSE_ERROR ); ZONE_CONTAINER* parseZONE_CONTAINER();
ZONE_CONTAINER* parseZONE_CONTAINER() throw( IO_ERROR, PARSE_ERROR ); PCB_TARGET* parsePCB_TARGET();
PCB_TARGET* parsePCB_TARGET() throw( IO_ERROR, PARSE_ERROR ); BOARD* parseBOARD();
BOARD* parseBOARD() throw( IO_ERROR, PARSE_ERROR, FUTURE_FORMAT_ERROR );
/** /**
* Function parseBOARD_unchecked * Function parseBOARD_unchecked
* Parse a module, but do not replace PARSE_ERROR with FUTURE_FORMAT_ERROR automatically. * Parse a module, but do not replace PARSE_ERROR with FUTURE_FORMAT_ERROR automatically.
*/ */
BOARD* parseBOARD_unchecked() throw( IO_ERROR, PARSE_ERROR ); BOARD* parseBOARD_unchecked();
/** /**
@ -160,7 +158,7 @@ class PCB_PARSER : public PCB_LEXER
* @return int - The result of the parsed #BOARD_ITEM layer or set designator. * @return int - The result of the parsed #BOARD_ITEM layer or set designator.
*/ */
template<class T, class M> template<class T, class M>
T lookUpLayer( const M& aMap ) throw( PARSE_ERROR, IO_ERROR ); T lookUpLayer( const M& aMap );
/** /**
* Function parseBoardItemLayer * Function parseBoardItemLayer
@ -170,7 +168,7 @@ class PCB_PARSER : public PCB_LEXER
* @throw PARSE_ERROR if the layer syntax is incorrect. * @throw PARSE_ERROR if the layer syntax is incorrect.
* @return The index the parsed #BOARD_ITEM layer. * @return The index the parsed #BOARD_ITEM layer.
*/ */
PCB_LAYER_ID parseBoardItemLayer() throw( IO_ERROR, PARSE_ERROR ); PCB_LAYER_ID parseBoardItemLayer();
/** /**
* Function parseBoardItemLayersAsMask * Function parseBoardItemLayersAsMask
@ -180,7 +178,7 @@ class PCB_PARSER : public PCB_LEXER
* @throw PARSE_ERROR if the layers syntax is incorrect. * @throw PARSE_ERROR if the layers syntax is incorrect.
* @return The mask of layers the parsed #BOARD_ITEM is on. * @return The mask of layers the parsed #BOARD_ITEM is on.
*/ */
LSET parseBoardItemLayersAsMask() throw( PARSE_ERROR, IO_ERROR ); LSET parseBoardItemLayersAsMask();
/** /**
* Function parseXY * Function parseXY
@ -193,9 +191,9 @@ class PCB_PARSER : public PCB_LEXER
* @throw PARSE_ERROR if the coordinate pair syntax is incorrect. * @throw PARSE_ERROR if the coordinate pair syntax is incorrect.
* @return A wxPoint object containing the coordinate pair. * @return A wxPoint object containing the coordinate pair.
*/ */
wxPoint parseXY() throw( PARSE_ERROR, IO_ERROR ); wxPoint parseXY();
void parseXY( int* aX, int* aY ) throw( PARSE_ERROR, IO_ERROR ); void parseXY( int* aX, int* aY );
/** /**
* Function parseEDA_TEXT * Function parseEDA_TEXT
@ -204,9 +202,9 @@ class PCB_PARSER : public PCB_LEXER
* @throw PARSE_ERROR if the text syntax is not valid. * @throw PARSE_ERROR if the text syntax is not valid.
* @param aText A point to the #EDA_TEXT object to save the parsed settings into. * @param aText A point to the #EDA_TEXT object to save the parsed settings into.
*/ */
void parseEDA_TEXT( EDA_TEXT* aText ) throw( PARSE_ERROR, IO_ERROR ); void parseEDA_TEXT( EDA_TEXT* aText );
S3D_INFO* parse3DModel() throw( PARSE_ERROR, IO_ERROR ); S3D_INFO* parse3DModel();
/** /**
* Function parseDouble * Function parseDouble
@ -216,20 +214,20 @@ class PCB_PARSER : public PCB_LEXER
* @throw IO_ERROR if an error occurs attempting to convert the current token. * @throw IO_ERROR if an error occurs attempting to convert the current token.
* @return The result of the parsed token. * @return The result of the parsed token.
*/ */
double parseDouble() throw( IO_ERROR ); double parseDouble();
inline double parseDouble( const char* aExpected ) throw( IO_ERROR ) inline double parseDouble( const char* aExpected )
{ {
NeedNUMBER( aExpected ); NeedNUMBER( aExpected );
return parseDouble(); return parseDouble();
} }
inline double parseDouble( PCB_KEYS_T::T aToken ) throw( IO_ERROR ) inline double parseDouble( PCB_KEYS_T::T aToken )
{ {
return parseDouble( GetTokenText( aToken ) ); return parseDouble( GetTokenText( aToken ) );
} }
inline int parseBoardUnits() throw( IO_ERROR ) inline int parseBoardUnits()
{ {
// There should be no major rounding issues here, since the values in // There should be no major rounding issues here, since the values in
// the file are in mm and get converted to nano-meters. // the file are in mm and get converted to nano-meters.
@ -240,7 +238,7 @@ class PCB_PARSER : public PCB_LEXER
return KiROUND( parseDouble() * IU_PER_MM ); return KiROUND( parseDouble() * IU_PER_MM );
} }
inline int parseBoardUnits( const char* aExpected ) throw( PARSE_ERROR, IO_ERROR ) inline int parseBoardUnits( const char* aExpected )
{ {
// Use here KiROUND, not KIROUND (see comments about them) // Use here KiROUND, not KIROUND (see comments about them)
// when having a function as argument, because it will be called twice // when having a function as argument, because it will be called twice
@ -248,35 +246,35 @@ class PCB_PARSER : public PCB_LEXER
return KiROUND( parseDouble( aExpected ) * IU_PER_MM ); return KiROUND( parseDouble( aExpected ) * IU_PER_MM );
} }
inline int parseBoardUnits( PCB_KEYS_T::T aToken ) throw( PARSE_ERROR, IO_ERROR ) inline int parseBoardUnits( PCB_KEYS_T::T aToken )
{ {
return parseBoardUnits( GetTokenText( aToken ) ); return parseBoardUnits( GetTokenText( aToken ) );
} }
inline int parseInt() throw( PARSE_ERROR ) inline int parseInt()
{ {
return (int)strtol( CurText(), NULL, 10 ); return (int)strtol( CurText(), NULL, 10 );
} }
inline int parseInt( const char* aExpected ) throw( PARSE_ERROR ) inline int parseInt( const char* aExpected )
{ {
NeedNUMBER( aExpected ); NeedNUMBER( aExpected );
return parseInt(); return parseInt();
} }
inline long parseHex() throw( PARSE_ERROR ) inline long parseHex()
{ {
NextTok(); NextTok();
return strtol( CurText(), NULL, 16 ); return strtol( CurText(), NULL, 16 );
} }
bool parseBool() throw( PARSE_ERROR ); bool parseBool();
/** /**
* Parse a format version tag like (version 20160417) return the version. * Parse a format version tag like (version 20160417) return the version.
* Expects to start on 'version', and eats the closing paren. * Expects to start on 'version', and eats the closing paren.
*/ */
int parseVersion() throw( IO_ERROR, PARSE_ERROR ); int parseVersion();
public: public:
@ -308,7 +306,7 @@ public:
m_board = aBoard; m_board = aBoard;
} }
BOARD_ITEM* Parse() throw( IO_ERROR, PARSE_ERROR ); BOARD_ITEM* Parse();
/** /**
* Return whether a version number, if any was parsed, was too recent * Return whether a version number, if any was parsed, was too recent

6
pcbnew/pcb_plot_params.cpp
View File

@ -135,7 +135,7 @@ void PCB_PLOT_PARAMS::SetGerberPrecision( int aPrecision )
// PLEASE NOTE: only plot dialog options are processed // PLEASE NOTE: only plot dialog options are processed
void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter, void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter,
int aNestLevel, int aControl ) const throw( IO_ERROR ) int aNestLevel, int aControl ) const
{ {
const char* falseStr = getTokenName( T_false ); const char* falseStr = getTokenName( T_false );
const char* trueStr = getTokenName( T_true ); const char* trueStr = getTokenName( T_true );
@ -215,7 +215,6 @@ 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( PARSE_ERROR, IO_ERROR )
{ {
aParser->Parse( this ); aParser->Parse( this );
} }
@ -337,7 +336,6 @@ 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( PARSE_ERROR, IO_ERROR )
{ {
T token; T token;
@ -559,7 +557,7 @@ double PCB_PLOT_PARAMS_PARSER::parseDouble()
return val; return val;
} }
void PCB_PLOT_PARAMS_PARSER::skipCurrent() throw( IO_ERROR, PARSE_ERROR ) void PCB_PLOT_PARAMS_PARSER::skipCurrent()
{ {
int curr_level = 0; int curr_level = 0;
T token; T token;

5
pcbnew/pcb_plot_params.h
View File

@ -165,9 +165,8 @@ public:
void SetSkipPlotNPTH_Pads( bool aSkip ) { m_skipNPTH_Pads = aSkip; } void SetSkipPlotNPTH_Pads( bool aSkip ) { m_skipNPTH_Pads = aSkip; }
bool GetSkipPlotNPTH_Pads() const { return m_skipNPTH_Pads; } bool GetSkipPlotNPTH_Pads() const { return m_skipNPTH_Pads; }
void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl=0 ) void Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aControl=0 ) const;
const throw( IO_ERROR ); void Parse( PCB_PLOT_PARAMS_PARSER* aParser );
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;

4
pcbnew/pcb_plot_params_parser.h
View File

@ -41,7 +41,7 @@ public:
LINE_READER* GetReader() { return reader; }; LINE_READER* GetReader() { return reader; };
void Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) throw( PARSE_ERROR, IO_ERROR ); void Parse( PCB_PLOT_PARAMS* aPcbPlotParams );
private: private:
bool parseBool(); bool parseBool();
@ -67,7 +67,7 @@ private:
* Skip the current token level, i.e * Skip the current token level, i.e
* search for the RIGHT parenthesis which closes the current description * search for the RIGHT parenthesis which closes the current description
*/ */
void skipCurrent() throw( IO_ERROR, PARSE_ERROR ); void skipCurrent();
}; };
#endif // PCB_PLOT_PARAMS_PARSER_H_ #endif // PCB_PLOT_PARAMS_PARSER_H_

128
pcbnew/specctra.cpp
View File

@ -131,7 +131,7 @@ int SPECCTRA_DB::findLayerName( const std::string& aLayerName ) const
return -1; return -1;
} }
void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id ) throw( IO_ERROR ) void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id )
{ {
T tok; T tok;
@ -174,7 +174,7 @@ void SPECCTRA_DB::readCOMPnPIN( std::string* component_id, std::string* pin_id )
} }
void SPECCTRA_DB::readTIME( time_t* time_stamp ) throw( IO_ERROR ) void SPECCTRA_DB::readTIME( time_t* time_stamp )
{ {
T tok; T tok;
@ -240,7 +240,7 @@ void SPECCTRA_DB::readTIME( time_t* time_stamp ) throw( IO_ERROR )
} }
void SPECCTRA_DB::LoadPCB( const wxString& aFilename ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::LoadPCB( const wxString& aFilename )
{ {
FILE_LINE_READER curr_reader( aFilename ); FILE_LINE_READER curr_reader( aFilename );
@ -259,7 +259,7 @@ void SPECCTRA_DB::LoadPCB( const wxString& aFilename ) throw( IO_ERROR, boost::b
} }
void SPECCTRA_DB::LoadSESSION( const wxString& aFilename ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::LoadSESSION( const wxString& aFilename )
{ {
FILE_LINE_READER curr_reader( aFilename ); FILE_LINE_READER curr_reader( aFilename );
@ -279,7 +279,7 @@ void SPECCTRA_DB::LoadSESSION( const wxString& aFilename ) throw( IO_ERROR, boos
} }
void SPECCTRA_DB::doPCB( PCB* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doPCB( PCB* growth )
{ {
T tok; T tok;
@ -384,7 +384,7 @@ void SPECCTRA_DB::doPCB( PCB* growth ) throw( IO_ERROR, boost::bad_pointer )
} }
void SPECCTRA_DB::doPARSER( PARSER* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doPARSER( PARSER* growth )
{ {
T tok; T tok;
std::string const1; std::string const1;
@ -523,7 +523,7 @@ void SPECCTRA_DB::doPARSER( PARSER* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doRESOLUTION( UNIT_RES* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doRESOLUTION( UNIT_RES* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -550,7 +550,7 @@ void SPECCTRA_DB::doRESOLUTION( UNIT_RES* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doUNIT( UNIT_RES* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doUNIT( UNIT_RES* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -571,7 +571,7 @@ void SPECCTRA_DB::doUNIT( UNIT_RES* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doSPECCTRA_LAYER_PAIR( SPECCTRA_LAYER_PAIR* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doSPECCTRA_LAYER_PAIR( SPECCTRA_LAYER_PAIR* growth )
{ {
NeedSYMBOL(); NeedSYMBOL();
growth->layer_id0 = CurText(); growth->layer_id0 = CurText();
@ -588,7 +588,7 @@ void SPECCTRA_DB::doSPECCTRA_LAYER_PAIR( SPECCTRA_LAYER_PAIR* growth ) throw( IO
void SPECCTRA_DB::doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) void SPECCTRA_DB::doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth )
throw( IO_ERROR, boost::bad_pointer )
{ {
T tok; T tok;
@ -607,7 +607,7 @@ void SPECCTRA_DB::doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth )
} }
void SPECCTRA_DB::doSTRUCTURE( STRUCTURE* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doSTRUCTURE( STRUCTURE* growth )
{ {
T tok; T tok;
@ -741,7 +741,7 @@ L_place:
} }
void SPECCTRA_DB::doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doSTRUCTURE_OUT( STRUCTURE_OUT* growth )
{ {
/* /*
<structure_out_descriptor >::= <structure_out_descriptor >::=
@ -784,7 +784,7 @@ void SPECCTRA_DB::doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IO_ERROR, boos
} }
void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -873,7 +873,7 @@ void SPECCTRA_DB::doKEEPOUT( KEEPOUT* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doCONNECT( CONNECT* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doCONNECT( CONNECT* growth )
{ {
/* from page 143 of specctra spec: /* from page 143 of specctra spec:
@ -908,7 +908,7 @@ void SPECCTRA_DB::doCONNECT( CONNECT* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doWINDOW( WINDOW* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doWINDOW( WINDOW* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -960,7 +960,7 @@ void SPECCTRA_DB::doWINDOW( WINDOW* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -987,7 +987,7 @@ void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth ) throw( IO_ERROR, boost::bad_poi
if( tok != T_path ) if( tok != T_path )
Expecting( T_path ); Expecting( T_path );
PATH* path = new PATH( growth, T_path ) ; PATH* path = new PATH( growth, T_path );
growth->paths.push_back( path ); growth->paths.push_back( path );
doPATH( path ); doPATH( path );
@ -1007,7 +1007,7 @@ void SPECCTRA_DB::doBOUNDARY( BOUNDARY* growth ) throw( IO_ERROR, boost::bad_poi
} }
void SPECCTRA_DB::doPATH( PATH* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doPATH( PATH* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1055,7 +1055,7 @@ void SPECCTRA_DB::doPATH( PATH* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doRECTANGLE( RECTANGLE* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doRECTANGLE( RECTANGLE* growth )
{ {
NeedSYMBOL(); NeedSYMBOL();
growth->layer_id = CurText(); growth->layer_id = CurText();
@ -1080,7 +1080,7 @@ void SPECCTRA_DB::doRECTANGLE( RECTANGLE* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doCIRCLE( CIRCLE* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doCIRCLE( CIRCLE* growth )
{ {
T tok; T tok;
@ -1108,7 +1108,7 @@ void SPECCTRA_DB::doCIRCLE( CIRCLE* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doQARC( QARC* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doQARC( QARC* growth )
{ {
NeedSYMBOL(); NeedSYMBOL();
growth->layer_id = CurText(); growth->layer_id = CurText();
@ -1132,7 +1132,7 @@ void SPECCTRA_DB::doQARC( QARC* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doSTRINGPROP( STRINGPROP* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doSTRINGPROP( STRINGPROP* growth )
{ {
NeedSYMBOL(); NeedSYMBOL();
growth->value = CurText(); growth->value = CurText();
@ -1140,7 +1140,7 @@ void SPECCTRA_DB::doSTRINGPROP( STRINGPROP* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doTOKPROP( TOKPROP* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doTOKPROP( TOKPROP* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1153,7 +1153,7 @@ void SPECCTRA_DB::doTOKPROP( TOKPROP* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doVIA( VIA* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doVIA( VIA* growth )
{ {
T tok; T tok;
@ -1182,7 +1182,7 @@ void SPECCTRA_DB::doVIA( VIA* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doCONTROL( CONTROL* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doCONTROL( CONTROL* growth )
{ {
T tok; T tok;
@ -1217,7 +1217,7 @@ void SPECCTRA_DB::doCONTROL( CONTROL* growth ) throw( IO_ERROR, boost::bad_point
case T_microvia: case T_microvia:
case T_reroute_order_viols: case T_reroute_order_viols:
TOKPROP* tokprop; TOKPROP* tokprop;
tokprop = new TOKPROP( growth, tok ) ; tokprop = new TOKPROP( growth, tok );
growth->Append( tokprop ); growth->Append( tokprop );
doTOKPROP( tokprop ); doTOKPROP( tokprop );
break; break;
@ -1229,7 +1229,7 @@ void SPECCTRA_DB::doCONTROL( CONTROL* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doPROPERTIES( PROPERTIES* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doPROPERTIES( PROPERTIES* growth )
{ {
T tok; T tok;
PROPERTY property; // construct it once here, append multiple times. PROPERTY property; // construct it once here, append multiple times.
@ -1252,7 +1252,7 @@ void SPECCTRA_DB::doPROPERTIES( PROPERTIES* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doLAYER( LAYER* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doLAYER( LAYER* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1374,7 +1374,7 @@ void SPECCTRA_DB::doLAYER( LAYER* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doRULE( RULE* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doRULE( RULE* growth )
{ {
std::string builder; std::string builder;
int bracketNesting = 1; // we already saw the opening T_LEFT int bracketNesting = 1; // we already saw the opening T_LEFT
@ -1420,7 +1420,7 @@ void SPECCTRA_DB::doRULE( RULE* growth ) throw( IO_ERROR )
#if 0 #if 0
void SPECCTRA_DB::doPLACE_RULE( PLACE_RULE* growth, bool expect_object_type ) throw( IO_ERROR ) void SPECCTRA_DB::doPLACE_RULE( PLACE_RULE* growth, bool expect_object_type )
{ {
/* (place_rule [<structure_place_rule_object> ] /* (place_rule [<structure_place_rule_object> ]
{[<spacing_descriptor> | {[<spacing_descriptor> |
@ -1506,7 +1506,7 @@ void SPECCTRA_DB::doPLACE_RULE( PLACE_RULE* growth, bool expect_object_type ) th
#endif #endif
void SPECCTRA_DB::doREGION( REGION* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doREGION( REGION* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1575,7 +1575,7 @@ void SPECCTRA_DB::doREGION( REGION* growth ) throw( IO_ERROR, boost::bad_pointer
} }
void SPECCTRA_DB::doCLASS_CLASS( CLASS_CLASS* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doCLASS_CLASS( CLASS_CLASS* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1620,7 +1620,7 @@ void SPECCTRA_DB::doCLASS_CLASS( CLASS_CLASS* growth ) throw( IO_ERROR, boost::b
} }
void SPECCTRA_DB::doCLASSES( CLASSES* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doCLASSES( CLASSES* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1643,7 +1643,7 @@ void SPECCTRA_DB::doCLASSES( CLASSES* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doGRID( GRID* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doGRID( GRID* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1708,7 +1708,7 @@ void SPECCTRA_DB::doGRID( GRID* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doLAYER_RULE( LAYER_RULE* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doLAYER_RULE( LAYER_RULE* growth )
{ {
T tok; T tok;
@ -1733,7 +1733,7 @@ void SPECCTRA_DB::doLAYER_RULE( LAYER_RULE* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doPLACE( PLACE* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doPLACE( PLACE* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1848,7 +1848,7 @@ void SPECCTRA_DB::doPLACE( PLACE* growth ) throw( IO_ERROR, boost::bad_pointer )
} }
void SPECCTRA_DB::doCOMPONENT( COMPONENT* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doCOMPONENT( COMPONENT* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -1878,7 +1878,7 @@ void SPECCTRA_DB::doCOMPONENT( COMPONENT* growth ) throw( IO_ERROR, boost::bad_p
} }
void SPECCTRA_DB::doPLACEMENT( PLACEMENT* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doPLACEMENT( PLACEMENT* growth )
{ {
T tok; T tok;
@ -1933,7 +1933,7 @@ void SPECCTRA_DB::doPLACEMENT( PLACEMENT* growth ) throw( IO_ERROR, boost::bad_p
} }
void SPECCTRA_DB::doPADSTACK( PADSTACK* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doPADSTACK( PADSTACK* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -2033,7 +2033,7 @@ void SPECCTRA_DB::doPADSTACK( PADSTACK* growth ) throw( IO_ERROR, boost::bad_poi
} }
void SPECCTRA_DB::doSHAPE( SHAPE* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doSHAPE( SHAPE* growth )
{ {
T tok; T tok;
@ -2117,7 +2117,7 @@ L_done_that:
} }
void SPECCTRA_DB::doIMAGE( IMAGE* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doIMAGE( IMAGE* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -2213,7 +2213,7 @@ void SPECCTRA_DB::doIMAGE( IMAGE* growth ) throw( IO_ERROR, boost::bad_pointer )
} }
void SPECCTRA_DB::doPIN( PIN* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doPIN( PIN* growth )
{ {
T tok = NextTok(); T tok = NextTok();
@ -2260,7 +2260,7 @@ void SPECCTRA_DB::doPIN( PIN* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doLIBRARY( LIBRARY* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doLIBRARY( LIBRARY* growth )
{ {
T tok; T tok;
@ -2314,7 +2314,7 @@ void SPECCTRA_DB::doLIBRARY( LIBRARY* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doNET( NET* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doNET( NET* growth )
{ {
T tok = NextTok(); T tok = NextTok();
PIN_REFS* pin_refs; PIN_REFS* pin_refs;
@ -2454,7 +2454,7 @@ L_pins:
} }
void SPECCTRA_DB::doTOPOLOGY( TOPOLOGY* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doTOPOLOGY( TOPOLOGY* growth )
{ {
T tok; T tok;
@ -2492,7 +2492,7 @@ void SPECCTRA_DB::doTOPOLOGY( TOPOLOGY* growth ) throw( IO_ERROR, boost::bad_poi
} }
void SPECCTRA_DB::doCLASS( CLASS* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doCLASS( CLASS* growth )
{ {
T tok; T tok;
@ -2602,7 +2602,7 @@ void SPECCTRA_DB::doCLASS( CLASS* growth ) throw( IO_ERROR, boost::bad_pointer )
} }
void SPECCTRA_DB::doNETWORK( NETWORK* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doNETWORK( NETWORK* growth )
{ {
T tok; T tok;
@ -2647,7 +2647,7 @@ void SPECCTRA_DB::doNETWORK( NETWORK* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doCOMP_ORDER( COMP_ORDER* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doCOMP_ORDER( COMP_ORDER* growth )
{ {
T tok; T tok;
@ -2665,7 +2665,7 @@ void SPECCTRA_DB::doCOMP_ORDER( COMP_ORDER* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doFROMTO( FROMTO* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doFROMTO( FROMTO* growth )
{ {
T tok; T tok;
@ -2751,7 +2751,7 @@ void SPECCTRA_DB::doFROMTO( FROMTO* growth ) throw( IO_ERROR, boost::bad_pointer
} }
void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doWIRE( WIRE* growth )
{ {
T tok; T tok;
@ -2872,7 +2872,7 @@ void SPECCTRA_DB::doWIRE( WIRE* growth ) throw( IO_ERROR, boost::bad_pointer )
} }
void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth )
{ {
T tok; T tok;
POINT point; POINT point;
@ -2976,7 +2976,7 @@ void SPECCTRA_DB::doWIRE_VIA( WIRE_VIA* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doWIRING( WIRING* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doWIRING( WIRING* growth )
{ {
T tok; T tok;
@ -3032,7 +3032,7 @@ void SPECCTRA_DB::doWIRING( WIRING* growth ) throw( IO_ERROR, boost::bad_pointer
} }
void SPECCTRA_DB::doANCESTOR( ANCESTOR* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doANCESTOR( ANCESTOR* growth )
{ {
T tok; T tok;
@ -3070,7 +3070,7 @@ void SPECCTRA_DB::doANCESTOR( ANCESTOR* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doHISTORY( HISTORY* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doHISTORY( HISTORY* growth )
{ {
T tok; T tok;
@ -3126,7 +3126,7 @@ void SPECCTRA_DB::doHISTORY( HISTORY* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doSESSION( SESSION* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doSESSION( SESSION* growth )
{ {
T tok; T tok;
@ -3203,7 +3203,7 @@ void SPECCTRA_DB::doSESSION( SESSION* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doWAS_IS( WAS_IS* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doWAS_IS( WAS_IS* growth )
{ {
T tok; T tok;
PIN_PAIR empty( growth ); PIN_PAIR empty( growth );
@ -3244,7 +3244,7 @@ void SPECCTRA_DB::doWAS_IS( WAS_IS* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::doROUTE( ROUTE* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doROUTE( ROUTE* growth )
{ {
T tok; T tok;
@ -3327,7 +3327,7 @@ void SPECCTRA_DB::doROUTE( ROUTE* growth ) throw( IO_ERROR, boost::bad_pointer )
} }
void SPECCTRA_DB::doNET_OUT( NET_OUT* growth ) throw( IO_ERROR, boost::bad_pointer ) void SPECCTRA_DB::doNET_OUT( NET_OUT* growth )
{ {
T tok; T tok;
@ -3395,7 +3395,7 @@ void SPECCTRA_DB::doNET_OUT( NET_OUT* growth ) throw( IO_ERROR, boost::bad_point
} }
void SPECCTRA_DB::doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IO_ERROR ) void SPECCTRA_DB::doSUPPLY_PIN( SUPPLY_PIN* growth )
{ {
T tok; T tok;
PIN_REF empty(growth); PIN_REF empty(growth);
@ -3431,7 +3431,7 @@ void SPECCTRA_DB::doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IO_ERROR )
} }
void SPECCTRA_DB::ExportPCB( wxString aFilename, bool aNameChange ) throw( IO_ERROR ) void SPECCTRA_DB::ExportPCB( wxString aFilename, bool aNameChange )
{ {
if( pcb ) if( pcb )
{ {
@ -3508,7 +3508,7 @@ UNIT_RES* ELEM::GetUnits() const
} }
void ELEM::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) void ELEM::Format( OUTPUTFORMATTER* out, int nestLevel )
{ {
out->Print( nestLevel, "(%s\n", Name() ); out->Print( nestLevel, "(%s\n", Name() );
@ -3518,7 +3518,7 @@ void ELEM::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
} }
void ELEM_HOLDER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) void ELEM_HOLDER::FormatContents( OUTPUTFORMATTER* out, int nestLevel )
{ {
for( int i=0; i<Length(); ++i ) for( int i=0; i<Length(); ++i )
{ {
@ -3631,7 +3631,7 @@ PARSER::PARSER( ELEM* aParent ) :
} }
void PARSER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) void PARSER::FormatContents( OUTPUTFORMATTER* out, int nestLevel )
{ {
out->Print( nestLevel, "(string_quote %c)\n", string_quote ); out->Print( nestLevel, "(string_quote %c)\n", string_quote );
out->Print( nestLevel, "(space_in_quoted_tokens %s)\n", space_in_quoted_tokens ? "on" : "off" ); out->Print( nestLevel, "(space_in_quoted_tokens %s)\n", space_in_quoted_tokens ? "on" : "off" );
@ -3667,7 +3667,7 @@ void PARSER::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERR
} }
void PLACE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) void PLACE::Format( OUTPUTFORMATTER* out, int nestLevel )
{ {
bool useMultiLine; bool useMultiLine;

241
pcbnew/specctra.h
View File

@ -149,7 +149,7 @@ struct POINT
* @param nestLevel A multiple of the number of spaces to preceed the output with. * @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IO_ERROR if a system error writing the output, such as a full disk. * @throw IO_ERROR if a system error writing the output, such as a full disk.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ) void Format( OUTPUTFORMATTER* out, int nestLevel ) const
{ {
out->Print( nestLevel, " %.6g %.6g", x, y ); out->Print( nestLevel, " %.6g %.6g", x, y );
} }
@ -171,7 +171,7 @@ struct PROPERTY
* @param nestLevel A multiple of the number of spaces to preceed the output with. * @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IO_ERROR if a system error writing the output, such as a full disk. * @throw IO_ERROR if a system error writing the output, such as a full disk.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const throw( IO_ERROR ) void Format( OUTPUTFORMATTER* out, int nestLevel ) const
{ {
const char* quoteName = out->GetQuoteChar( name.c_str() ); const char* quoteName = out->GetQuoteChar( name.c_str() );
const char* quoteValue = out->GetQuoteChar( value.c_str() ); const char* quoteValue = out->GetQuoteChar( value.c_str() );
@ -249,7 +249,7 @@ public:
* @param nestLevel A multiple of the number of spaces to preceed the output with. * @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IO_ERROR if a system error writing the output, such as a full disk. * @throw IO_ERROR if a system error writing the output, such as a full disk.
*/ */
virtual void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ); virtual void Format( OUTPUTFORMATTER* out, int nestLevel );
/** /**
@ -261,7 +261,7 @@ public:
* @param nestLevel A multiple of the number of spaces to preceed the output with. * @param nestLevel A multiple of the number of spaces to preceed the output with.
* @throw IO_ERROR if a system error writing the output, such as a full disk. * @throw IO_ERROR if a system error writing the output, such as a full disk.
*/ */
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel )
{ {
// overridden in ELEM_HOLDER // overridden in ELEM_HOLDER
} }
@ -293,7 +293,7 @@ public:
{ {
} }
virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override; virtual void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override;
//-----< list operations >-------------------------------------------- //-----< list operations >--------------------------------------------
@ -389,7 +389,7 @@ public:
PARSER( ELEM* aParent ); PARSER( ELEM* aParent );
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override; void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override;
}; };
@ -423,7 +423,7 @@ public:
DSN_T GetEngUnits() const { return units; } DSN_T GetEngUnits() const { return units; }
int GetValue() const { return value; } int GetValue() const { return value; }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( type == T_unit ) if( type == T_unit )
out->Print( nestLevel, "(%s %s)\n", Name(), out->Print( nestLevel, "(%s %s)\n", Name(),
@ -469,7 +469,7 @@ public:
POINT GetOrigin() { return point0; } POINT GetOrigin() { return point0; }
POINT GetEnd() { return point1; } POINT GetEnd() { return point1; }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* newline = nestLevel ? "\n" : ""; const char* newline = nestLevel ? "\n" : "";
@ -502,7 +502,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s", Name() ); out->Print( nestLevel, "(%s", Name() );
@ -548,7 +548,7 @@ public:
delete rule; delete rule;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s", Name() ); out->Print( nestLevel, "(%s", Name() );
@ -609,7 +609,7 @@ public:
aperture_width = aWidth; aperture_width = aWidth;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* newline = nestLevel ? "\n" : ""; const char* newline = nestLevel ? "\n" : "";
@ -702,7 +702,7 @@ public:
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s\n", Name() ); out->Print( nestLevel, "(%s\n", Name() );
@ -735,7 +735,7 @@ public:
diameter = 0.0; diameter = 0.0;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* newline = nestLevel ? "\n" : ""; const char* newline = nestLevel ? "\n" : "";
@ -782,7 +782,7 @@ public:
aperture_width = 0.0; aperture_width = 0.0;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* newline = nestLevel ? "\n" : ""; const char* newline = nestLevel ? "\n" : "";
@ -864,7 +864,7 @@ public:
} }
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s ", Name() ); out->Print( nestLevel, "(%s ", Name() );
@ -947,7 +947,7 @@ public:
windows.push_back( aWindow ); windows.push_back( aWindow );
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* newline = "\n"; const char* newline = "\n";
@ -1024,7 +1024,7 @@ public:
padstacks.push_back( aViaName ); padstacks.push_back( aViaName );
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const int RIGHTMARGIN = 80; const int RIGHTMARGIN = 80;
int perLine = out->Print( nestLevel, "(%s", Name() ); int perLine = out->Print( nestLevel, "(%s", Name() );
@ -1078,7 +1078,7 @@ public:
{ {
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( STRINGS::iterator i=class_ids.begin(); i!=class_ids.end(); ++i ) for( STRINGS::iterator i=class_ids.begin(); i!=class_ids.end(); ++i )
{ {
@ -1117,7 +1117,7 @@ public:
delete classes; delete classes;
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( classes ) if( classes )
classes->Format( out, nestLevel ); classes->Format( out, nestLevel );
@ -1147,7 +1147,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s\n", Name() ); out->Print( nestLevel, "(%s\n", Name() );
@ -1202,7 +1202,7 @@ public:
delete rules; delete rules;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( name.c_str() ); const char* quote = out->GetQuoteChar( name.c_str() );
@ -1276,7 +1276,7 @@ public:
layer_weight = 0.0; layer_weight = 0.0;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote0 = out->GetQuoteChar( layer_id0.c_str() ); const char* quote0 = out->GetQuoteChar( layer_id0.c_str() );
const char* quote1 = out->GetQuoteChar( layer_id1.c_str() ); const char* quote1 = out->GetQuoteChar( layer_id1.c_str() );
@ -1303,7 +1303,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s\n", Name() ); out->Print( nestLevel, "(%s\n", Name() );
@ -1351,7 +1351,7 @@ public:
value = T_NONE; value = T_NONE;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s %s)\n", Name(), out->Print( nestLevel, "(%s %s)\n", Name(),
GetTokenText( value ) ); GetTokenText( value ) );
@ -1377,7 +1377,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( value.c_str() ); const char* quote = out->GetQuoteChar( value.c_str() );
@ -1420,7 +1420,7 @@ public:
delete rules; delete rules;
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( region_id.size() ) if( region_id.size() )
{ {
@ -1464,7 +1464,7 @@ public:
image_type= T_NONE; image_type= T_NONE;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s %s %.6g", out->Print( nestLevel, "(%s %s %.6g",
Name(), Name(),
@ -1508,7 +1508,7 @@ public:
delete rules; delete rules;
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( LAYERS::iterator i=layers.begin(); i!=layers.end(); ++i ) for( LAYERS::iterator i=layers.begin(); i!=layers.end(); ++i )
i->Format( out, nestLevel ); i->Format( out, nestLevel );
@ -1592,7 +1592,7 @@ public:
place_boundary->SetParent( this ); place_boundary->SetParent( this );
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( unit ) if( unit )
unit->Format( out, nestLevel ); unit->Format( out, nestLevel );
@ -1724,7 +1724,7 @@ public:
rotation = aRotation; rotation = aRotation;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override; void Format( OUTPUTFORMATTER* out, int nestLevel ) override;
}; };
typedef boost::ptr_vector<PLACE> PLACES; typedef boost::ptr_vector<PLACE> PLACES;
@ -1761,7 +1761,7 @@ public:
*/ */
// static int Compare( IMAGE* lhs, IMAGE* rhs ); // static int Compare( IMAGE* lhs, IMAGE* rhs );
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( image_id.c_str() ); const char* quote = out->GetQuoteChar( image_id.c_str() );
out->Print( nestLevel, "(%s %s%s%s\n", Name(), out->Print( nestLevel, "(%s %s%s%s\n", Name(),
@ -1772,7 +1772,7 @@ public:
out->Print( nestLevel, ")\n" ); out->Print( nestLevel, ")\n" );
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( PLACES::iterator i=places.begin(); i!=places.end(); ++i ) for( PLACES::iterator i=places.begin(); i!=places.end(); ++i )
i->Format( out, nestLevel ); i->Format( out, nestLevel );
@ -1825,7 +1825,7 @@ public:
return added; return added;
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( unit ) if( unit )
unit->Format( out, nestLevel ); unit->Format( out, nestLevel );
@ -1891,7 +1891,7 @@ public:
connect = aConnect; connect = aConnect;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s ", Name() ); out->Print( nestLevel, "(%s ", Name() );
@ -1950,7 +1950,7 @@ public:
vertex.FixNegativeZero(); vertex.FixNegativeZero();
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( padstack_id.c_str() ); const char* quote = out->GetQuoteChar( padstack_id.c_str() );
if( isRotated ) if( isRotated )
@ -2035,7 +2035,7 @@ public:
return image_id; return image_id;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
std::string imageId = GetImageId(); std::string imageId = GetImageId();
@ -2050,7 +2050,7 @@ public:
} }
// this is here for makeHash() // this is here for makeHash()
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( side != T_both ) if( side != T_both )
out->Print( 0, " (side %s)", GetTokenText( side ) ); out->Print( 0, " (side %s)", GetTokenText( side ) );
@ -2150,7 +2150,7 @@ public:
padstack_id = aPadstackId; padstack_id = aPadstackId;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( padstack_id.c_str() ); const char* quote = out->GetQuoteChar( padstack_id.c_str() );
@ -2164,7 +2164,7 @@ public:
// this factored out for use by Compare() // this factored out for use by Compare()
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( unit ) if( unit )
unit->Format( out, nestLevel ); unit->Format( out, nestLevel );
@ -2393,7 +2393,7 @@ public:
return NULL; return NULL;
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( unit ) if( unit )
unit->Format( out, nestLevel ); unit->Format( out, nestLevel );
@ -2438,7 +2438,7 @@ struct PIN_REF : public ELEM
* is like Format() but is not virual and returns the number of characters * is like Format() but is not virual and returns the number of characters
* that were output. * that were output.
*/ */
int FormatIt( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) int FormatIt( OUTPUTFORMATTER* out, int nestLevel )
{ {
// only print the newline if there is a nest level, and make // only print the newline if there is a nest level, and make
// the quotes unconditional on this one. // the quotes unconditional on this one.
@ -2482,7 +2482,7 @@ public:
delete rules; delete rules;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
// no quoting on these two, the lexer preserved the quotes on input // no quoting on these two, the lexer preserved the quotes on input
out->Print( nestLevel, "(%s %s %s ", out->Print( nestLevel, "(%s %s %s ",
@ -2540,7 +2540,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s", Name() ); out->Print( nestLevel, "(%s", Name() );
@ -2623,7 +2623,7 @@ public:
return -1; return -1;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( net_id.c_str() ); const char* quote = out->GetQuoteChar( net_id.c_str() );
const char* space = " "; const char* space = " ";
@ -2700,7 +2700,7 @@ public:
{ {
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( FROMTOS::iterator i=fromtos.begin(); i!=fromtos.end(); ++i ) for( FROMTOS::iterator i=fromtos.begin(); i!=fromtos.end(); ++i )
i->Format( out, nestLevel ); i->Format( out, nestLevel );
@ -2747,7 +2747,7 @@ public:
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( class_id.c_str() ); const char* quote = out->GetQuoteChar( class_id.c_str() );
@ -2816,7 +2816,7 @@ public:
{ {
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( NETS::iterator i=nets.begin(); i!=nets.end(); ++i ) for( NETS::iterator i=nets.begin(); i!=nets.end(); ++i )
i->Format( out, nestLevel ); i->Format( out, nestLevel );
@ -2897,7 +2897,7 @@ public:
} }
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
out->Print( nestLevel, "(%s ", Name() ); out->Print( nestLevel, "(%s ", Name() );
@ -2981,7 +2981,7 @@ public:
return padstack_id; return padstack_id;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( padstack_id.c_str() ); const char* quote = out->GetQuoteChar( padstack_id.c_str() );
@ -3107,7 +3107,7 @@ public:
delete unit; delete unit;
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( unit ) if( unit )
unit->Format( out, nestLevel ); unit->Format( out, nestLevel );
@ -3170,7 +3170,7 @@ public:
delete wiring; delete wiring;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( pcbname.c_str() ); const char* quote = out->GetQuoteChar( pcbname.c_str() );
@ -3233,7 +3233,7 @@ public:
time_stamp = time(NULL); time_stamp = time(NULL);
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
char temp[80]; char temp[80];
struct tm* tmp; struct tm* tmp;
@ -3277,7 +3277,7 @@ public:
time_stamp = time(NULL); time_stamp = time(NULL);
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( ANCESTORS::iterator i=ancestors.begin(); i!=ancestors.end(); ++i ) for( ANCESTORS::iterator i=ancestors.begin(); i!=ancestors.end(); ++i )
i->Format( out, nestLevel ); i->Format( out, nestLevel );
@ -3320,7 +3320,7 @@ public:
{ {
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
bool singleLine = pin_refs.size() <= 1; bool singleLine = pin_refs.size() <= 1;
out->Print( nestLevel, "(%s", Name() ); out->Print( nestLevel, "(%s", Name() );
@ -3379,7 +3379,7 @@ public:
delete rules; delete rules;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( net_id.c_str() ); const char* quote = out->GetQuoteChar( net_id.c_str() );
@ -3446,7 +3446,7 @@ public:
return ELEM::GetUnits(); return ELEM::GetUnits();
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
if( resolution ) if( resolution )
resolution->Format( out, nestLevel ); resolution->Format( out, nestLevel );
@ -3509,7 +3509,7 @@ public:
{ {
} }
void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void FormatContents( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
for( PIN_PAIRS::iterator i=pin_pairs.begin(); i!=pin_pairs.end(); ++i ) for( PIN_PAIRS::iterator i=pin_pairs.begin(); i!=pin_pairs.end(); ++i )
{ {
@ -3566,7 +3566,7 @@ public:
delete route; delete route;
} }
void Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR ) override void Format( OUTPUTFORMATTER* out, int nestLevel ) override
{ {
const char* quote = out->GetQuoteChar( session_id.c_str() ); const char* quote = out->GetQuoteChar( session_id.c_str() );
out->Print( nestLevel, "(%s %s%s%s\n", Name(), out->Print( nestLevel, "(%s %s%s%s\n", Name(),
@ -3676,7 +3676,7 @@ class SPECCTRA_DB : public SPECCTRA_LEXER
* @throw IO_ERROR, if the next token or two do no make up a pin_reference, * @throw IO_ERROR, if the next token or two do no make up a pin_reference,
* or there is an error reading from the input stream. * or there is an error reading from the input stream.
*/ */
void readCOMPnPIN( std::string* component_id, std::string* pid_id ) throw( IO_ERROR ); void readCOMPnPIN( std::string* component_id, std::string* pid_id );
/** /**
* Function readTIME * Function readTIME
@ -3692,60 +3692,60 @@ class SPECCTRA_DB : public SPECCTRA_LEXER
* @throw IO_ERROR, if the next token or 8 do no make up a time stamp, * @throw IO_ERROR, if the next token or 8 do no make up a time stamp,
* or there is an error reading from the input stream. * or there is an error reading from the input stream.
*/ */
void readTIME( time_t* time_stamp ) throw( IO_ERROR ); void readTIME( time_t* time_stamp );
void doPCB( PCB* growth ) throw( IO_ERROR, boost::bad_pointer ); void doPCB( PCB* growth );
void doPARSER( PARSER* growth ) throw( IO_ERROR ); void doPARSER( PARSER* growth );
void doRESOLUTION( UNIT_RES* growth ) throw( IO_ERROR ); void doRESOLUTION( UNIT_RES* growth );
void doUNIT( UNIT_RES* growth ) throw( IO_ERROR ); void doUNIT( UNIT_RES* growth );
void doSTRUCTURE( STRUCTURE* growth ) throw( IO_ERROR, boost::bad_pointer ); void doSTRUCTURE( STRUCTURE* growth );
void doSTRUCTURE_OUT( STRUCTURE_OUT* growth ) throw( IO_ERROR, boost::bad_pointer ); void doSTRUCTURE_OUT( STRUCTURE_OUT* growth );
void doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth ) throw( IO_ERROR, boost::bad_pointer ); void doLAYER_NOISE_WEIGHT( LAYER_NOISE_WEIGHT* growth );
void doSPECCTRA_LAYER_PAIR( SPECCTRA_LAYER_PAIR* growth ) throw( IO_ERROR ); void doSPECCTRA_LAYER_PAIR( SPECCTRA_LAYER_PAIR* growth );
void doBOUNDARY( BOUNDARY* growth ) throw( IO_ERROR, boost::bad_pointer ); void doBOUNDARY( BOUNDARY* growth );
void doRECTANGLE( RECTANGLE* growth ) throw( IO_ERROR ); void doRECTANGLE( RECTANGLE* growth );
void doPATH( PATH* growth ) throw( IO_ERROR ); void doPATH( PATH* growth );
void doSTRINGPROP( STRINGPROP* growth ) throw( IO_ERROR ); void doSTRINGPROP( STRINGPROP* growth );
void doTOKPROP( TOKPROP* growth ) throw( IO_ERROR ); void doTOKPROP( TOKPROP* growth );
void doVIA( VIA* growth ) throw( IO_ERROR ); void doVIA( VIA* growth );
void doCONTROL( CONTROL* growth ) throw( IO_ERROR, boost::bad_pointer ); void doCONTROL( CONTROL* growth );
void doLAYER( LAYER* growth ) throw( IO_ERROR ); void doLAYER( LAYER* growth );
void doRULE( RULE* growth ) throw( IO_ERROR ); void doRULE( RULE* growth );
void doKEEPOUT( KEEPOUT* growth ) throw( IO_ERROR, boost::bad_pointer ); void doKEEPOUT( KEEPOUT* growth );
void doCIRCLE( CIRCLE* growth ) throw( IO_ERROR ); void doCIRCLE( CIRCLE* growth );
void doQARC( QARC* growth ) throw( IO_ERROR ); void doQARC( QARC* growth );
void doWINDOW( WINDOW* growth ) throw( IO_ERROR ); void doWINDOW( WINDOW* growth );
void doCONNECT( CONNECT* growth ) throw( IO_ERROR ); void doCONNECT( CONNECT* growth );
void doREGION( REGION* growth ) throw( IO_ERROR, boost::bad_pointer ); void doREGION( REGION* growth );
void doCLASS_CLASS( CLASS_CLASS* growth ) throw( IO_ERROR, boost::bad_pointer ); void doCLASS_CLASS( CLASS_CLASS* growth );
void doLAYER_RULE( LAYER_RULE* growth ) throw( IO_ERROR ); void doLAYER_RULE( LAYER_RULE* growth );
void doCLASSES( CLASSES* growth ) throw( IO_ERROR ); void doCLASSES( CLASSES* growth );
void doGRID( GRID* growth ) throw( IO_ERROR ); void doGRID( GRID* growth );
void doPLACE( PLACE* growth ) throw( IO_ERROR, boost::bad_pointer ); void doPLACE( PLACE* growth );
void doCOMPONENT( COMPONENT* growth ) throw( IO_ERROR, boost::bad_pointer ); void doCOMPONENT( COMPONENT* growth );
void doPLACEMENT( PLACEMENT* growth ) throw( IO_ERROR, boost::bad_pointer ); void doPLACEMENT( PLACEMENT* growth );
void doPROPERTIES( PROPERTIES* growth ) throw( IO_ERROR ); void doPROPERTIES( PROPERTIES* growth );
void doPADSTACK( PADSTACK* growth ) throw( IO_ERROR, boost::bad_pointer ); void doPADSTACK( PADSTACK* growth );
void doSHAPE( SHAPE* growth ) throw( IO_ERROR, boost::bad_pointer ); void doSHAPE( SHAPE* growth );
void doIMAGE( IMAGE* growth ) throw( IO_ERROR, boost::bad_pointer ); void doIMAGE( IMAGE* growth );
void doLIBRARY( LIBRARY* growth ) throw( IO_ERROR, boost::bad_pointer ); void doLIBRARY( LIBRARY* growth );
void doPIN( PIN* growth ) throw( IO_ERROR ); void doPIN( PIN* growth );
void doNET( NET* growth ) throw( IO_ERROR, boost::bad_pointer ); void doNET( NET* growth );
void doNETWORK( NETWORK* growth ) throw( IO_ERROR, boost::bad_pointer ); void doNETWORK( NETWORK* growth );
void doCLASS( CLASS* growth ) throw( IO_ERROR, boost::bad_pointer ); void doCLASS( CLASS* growth );
void doTOPOLOGY( TOPOLOGY* growth ) throw( IO_ERROR, boost::bad_pointer ); void doTOPOLOGY( TOPOLOGY* growth );
void doFROMTO( FROMTO* growth ) throw( IO_ERROR, boost::bad_pointer ); void doFROMTO( FROMTO* growth );
void doCOMP_ORDER( COMP_ORDER* growth ) throw( IO_ERROR ); void doCOMP_ORDER( COMP_ORDER* growth );
void doWIRE( WIRE* growth ) throw( IO_ERROR, boost::bad_pointer ); void doWIRE( WIRE* growth );
void doWIRE_VIA( WIRE_VIA* growth ) throw( IO_ERROR ); void doWIRE_VIA( WIRE_VIA* growth );
void doWIRING( WIRING* growth ) throw( IO_ERROR, boost::bad_pointer ); void doWIRING( WIRING* growth );
void doSESSION( SESSION* growth ) throw( IO_ERROR, boost::bad_pointer ); void doSESSION( SESSION* growth );
void doANCESTOR( ANCESTOR* growth ) throw( IO_ERROR ); void doANCESTOR( ANCESTOR* growth );
void doHISTORY( HISTORY* growth ) throw( IO_ERROR, boost::bad_pointer ); void doHISTORY( HISTORY* growth );
void doROUTE( ROUTE* growth ) throw( IO_ERROR, boost::bad_pointer ); void doROUTE( ROUTE* growth );
void doWAS_IS( WAS_IS* growth ) throw( IO_ERROR ); void doWAS_IS( WAS_IS* growth );
void doNET_OUT( NET_OUT* growth ) throw( IO_ERROR, boost::bad_pointer ); void doNET_OUT( NET_OUT* growth );
void doSUPPLY_PIN( SUPPLY_PIN* growth ) throw( IO_ERROR ); void doSUPPLY_PIN( SUPPLY_PIN* growth );
//-----<FromBOARD>------------------------------------------------------- //-----<FromBOARD>-------------------------------------------------------
@ -3756,7 +3756,7 @@ class SPECCTRA_DB : public SPECCTRA_LEXER
* @param aBoard The BOARD to get information from in order to make the BOUNDARY. * @param aBoard The BOARD to get information from in order to make the BOUNDARY.
* @param aBoundary The empty BOUNDARY to fill in. * @param aBoundary The empty BOUNDARY to fill in.
*/ */
void fillBOUNDARY( BOARD* aBoard, BOUNDARY* aBoundary ) throw( IO_ERROR, boost::bad_pointer ); void fillBOUNDARY( BOARD* aBoard, BOUNDARY* aBoundary );
/** /**
* Function makeIMAGE * Function makeIMAGE
@ -3826,15 +3826,14 @@ class SPECCTRA_DB : public SPECCTRA_LEXER
* Function makeTRACK * Function makeTRACK
* creates a TRACK form the PATH and BOARD info. * creates a TRACK form the PATH and BOARD info.
*/ */
TRACK* makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR ); TRACK* makeTRACK( PATH* aPath, int aPointIndex, int aNetcode );
/** /**
* Function makeVIA * Function makeVIA
* instantiates a KiCad VIA on the heap and initializes it with internal * instantiates a KiCad VIA on the heap and initializes it with internal
* values consistent with the given PADSTACK, POINT, and netcode. * values consistent with the given PADSTACK, POINT, and netcode.
*/ */
::VIA* makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode, int aViaDrillDefault ) ::VIA* makeVIA( PADSTACK* aPadstack, const POINT& aPoint, int aNetCode, int aViaDrillDefault );
throw( IO_ERROR );
//-----</FromSESSION>---------------------------------------------------- //-----</FromSESSION>----------------------------------------------------
@ -3906,7 +3905,7 @@ public:
* @param aFilename The name of the dsn file to load. * @param aFilename The name of the dsn file to load.
* @throw IO_ERROR if there is a lexer or parser error. * @throw IO_ERROR if there is a lexer or parser error.
*/ */
void LoadPCB( const wxString& aFilename ) throw( IO_ERROR, boost::bad_pointer ); void LoadPCB( const wxString& aFilename );
/** /**
* Function LoadSESSION * Function LoadSESSION
@ -3918,7 +3917,7 @@ public:
* @param aFilename The name of the dsn file to load. * @param aFilename The name of the dsn file to load.
* @throw IO_ERROR if there is a lexer or parser error. * @throw IO_ERROR if there is a lexer or parser error.
*/ */
void LoadSESSION( const wxString& aFilename ) throw( IO_ERROR, boost::bad_pointer ); void LoadSESSION( const wxString& aFilename );
/** /**
* Function ExportPCB * Function ExportPCB
@ -3929,7 +3928,7 @@ public:
* and also to to be changed in the output file. * and also to to be changed in the output file.
* @throw IO_ERROR, if an i/o error occurs saving the file. * @throw IO_ERROR, if an i/o error occurs saving the file.
*/ */
void ExportPCB( wxString aFilename, bool aNameChange=false ) throw( IO_ERROR ); void ExportPCB( wxString aFilename, bool aNameChange=false );
/** /**
* Function FromBOARD * Function FromBOARD
@ -3942,7 +3941,7 @@ public:
* *
* @param aBoard The BOARD to convert to a PCB. * @param aBoard The BOARD to convert to a PCB.
*/ */
void FromBOARD( BOARD* aBoard ) throw( IO_ERROR, boost::bad_ptr_container_operation ); void FromBOARD( BOARD* aBoard );
/** /**
* Function FromSESSION * Function FromSESSION
@ -3952,7 +3951,7 @@ public:
* *
* @param aBoard The BOARD to merge the SESSION information into. * @param aBoard The BOARD to merge the SESSION information into.
*/ */
void FromSESSION( BOARD* aBoard ) throw( IO_ERROR ); void FromSESSION( BOARD* aBoard );
/** /**
* Function ExportSESSION * Function ExportSESSION

2
pcbnew/specctra_export.cpp
View File

@ -729,7 +729,6 @@ PADSTACK* SPECCTRA_DB::makeVia( const ::VIA* aVia )
void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary ) void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary )
throw( IO_ERROR, boost::bad_pointer )
{ {
wxString errMessage; wxString errMessage;
SHAPE_POLY_SET outlines; SHAPE_POLY_SET outlines;
@ -789,7 +788,6 @@ typedef std::pair<STRINGSET::iterator, bool> STRINGSET_PAIR;
void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
throw( IO_ERROR, boost::bad_ptr_container_operation )
{ {
PCB_TYPE_COLLECTOR items; PCB_TYPE_COLLECTOR items;

5
pcbnew/specctra_import.cpp
View File

@ -197,7 +197,7 @@ static wxPoint mapPt( const POINT& aPoint, UNIT_RES* aResolution )
} }
TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) throw( IO_ERROR ) TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode )
{ {
int layerNdx = findLayerName( aPath->layer_id ); int layerNdx = findLayerName( aPath->layer_id );
@ -222,7 +222,6 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
::VIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint, ::VIA* SPECCTRA_DB::makeVIA( PADSTACK* aPadstack, const POINT& aPoint,
int aNetCode, int aViaDrillDefault ) int aNetCode, int aViaDrillDefault )
throw( IO_ERROR )
{ {
::VIA* via = 0; ::VIA* via = 0;
SHAPE* shape; SHAPE* shape;
@ -358,7 +357,7 @@ TRACK* SPECCTRA_DB::makeTRACK( PATH* aPath, int aPointIndex, int aNetcode ) thro
// no UI code in this function, throw exception to report problems to the // no UI code in this function, throw exception to report problems to the
// UI handler: void PCB_EDIT_FRAME::ImportSpecctraSession( wxCommandEvent& event ) // UI handler: void PCB_EDIT_FRAME::ImportSpecctraSession( wxCommandEvent& event )
void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) throw( IO_ERROR ) void SPECCTRA_DB::FromSESSION( BOARD* aBoard )
{ {
sessionBoard = aBoard; // not owned here sessionBoard = aBoard; // not owned here

4
tools/io_benchmark/stdstream_line_reader.cpp
View File

@ -41,7 +41,7 @@ STDISTREAM_LINE_READER::~STDISTREAM_LINE_READER()
} }
char* STDISTREAM_LINE_READER::ReadLine() throw( IO_ERROR ) char* STDISTREAM_LINE_READER::ReadLine()
{ {
getline( *m_stream, m_buffer ); getline( *m_stream, m_buffer );
@ -67,7 +67,7 @@ void STDISTREAM_LINE_READER::setStream( std::istream& aStream )
} }
IFSTREAM_LINE_READER::IFSTREAM_LINE_READER( const wxFileName& aFileName ) throw( IO_ERROR ) : IFSTREAM_LINE_READER::IFSTREAM_LINE_READER( const wxFileName& aFileName ) :
m_fStream( aFileName.GetFullName().ToUTF8() ) m_fStream( aFileName.GetFullName().ToUTF8() )
{ {
if( !m_fStream.is_open() ) if( !m_fStream.is_open() )

4
tools/io_benchmark/stdstream_line_reader.h
View File

@ -42,7 +42,7 @@ public:
~STDISTREAM_LINE_READER(); ~STDISTREAM_LINE_READER();
char* ReadLine() throw( IO_ERROR ) override; char* ReadLine() override;
protected: protected:
@ -61,7 +61,7 @@ class IFSTREAM_LINE_READER : public STDISTREAM_LINE_READER
{ {
public: public:
IFSTREAM_LINE_READER( const wxFileName& aFileName ) throw( IO_ERROR ); IFSTREAM_LINE_READER( const wxFileName& aFileName );
void Rewind(); void Rewind();