diff --git a/src/add-ons/translators/rtf/RTF.cpp b/src/add-ons/translators/rtf/RTF.cpp index ea4663ce55..f7ed622ccb 100644 --- a/src/add-ons/translators/rtf/RTF.cpp +++ b/src/add-ons/translators/rtf/RTF.cpp @@ -33,15 +33,15 @@ static const char *kDestinationControlWords[] = { "rxe", "stylesheet", "subject", "tc", "title", "txe", "xe", }; -static char read_char(BDataIO &stream, bool endOfFileAllowed = false) throw (status_t); -static int32 parse_integer(char first, BDataIO &stream, char &_last, int32 base = 10) throw (status_t); +static char read_char(BDataIO &stream, bool endOfFileAllowed = false); +static int32 parse_integer(char first, BDataIO &stream, char &_last, int32 base = 10); using namespace RTF; static char -read_char(BDataIO &stream, bool endOfFileAllowed) throw (status_t) +read_char(BDataIO &stream, bool endOfFileAllowed) { char c; ssize_t bytesRead = stream.Read(&c, 1); @@ -58,7 +58,6 @@ read_char(BDataIO &stream, bool endOfFileAllowed) throw (status_t) static int32 parse_integer(char first, BDataIO &stream, char &_last, int32 base) - throw (status_t) { const char *kDigits = "0123456789abcdef"; int32 integer = 0; @@ -292,7 +291,7 @@ Group::~Group() void -Group::Parse(char first, BDataIO &stream, char &last) throw (status_t) +Group::Parse(char first, BDataIO &stream, char &last) { if (first == '\0') first = read_char(stream); @@ -452,7 +451,7 @@ Header::~Header() void -Header::Parse(char first, BDataIO &stream, char &last) throw (status_t) +Header::Parse(char first, BDataIO &stream, char &last) { // The stream has been peeked into by the parser already, and // only the version follows in the stream -- let's pick it up @@ -529,7 +528,7 @@ Text::IsDefinitionDelimiter() void -Text::Parse(char first, BDataIO &stream, char &last) throw (status_t) +Text::Parse(char first, BDataIO &stream, char &last) { char c = first; if (c == '\0') @@ -613,7 +612,7 @@ Command::~Command() void -Command::Parse(char first, BDataIO &stream, char &last) throw (status_t) +Command::Parse(char first, BDataIO &stream, char &last) { if (first == '\0') first = read_char(stream); @@ -817,7 +816,7 @@ Worker::Dispatch(Element *element) void -Worker::Work() throw (status_t) +Worker::Work() { Dispatch(&fStart); } diff --git a/src/add-ons/translators/rtf/RTF.h b/src/add-ons/translators/rtf/RTF.h index 504f2295ab..91f7ff9721 100644 --- a/src/add-ons/translators/rtf/RTF.h +++ b/src/add-ons/translators/rtf/RTF.h @@ -53,7 +53,7 @@ class Element { Group *Parent() const; virtual bool IsDefinitionDelimiter(); - virtual void Parse(char first, BDataIO &stream, char &last) throw (status_t) = 0; + virtual void Parse(char first, BDataIO &stream, char &last) = 0; virtual void PrintToStream(int32 level = 0); private: @@ -79,7 +79,7 @@ class Group : public Element { void DetermineDestination(); group_destination Destination() const; - virtual void Parse(char first, BDataIO &stream, char &last) throw (status_t); + virtual void Parse(char first, BDataIO &stream, char &last); protected: BList fElements; @@ -96,7 +96,7 @@ class Header : public Group { rgb_color Color(int32 index); - virtual void Parse(char first, BDataIO &stream, char &last) throw (status_t); + virtual void Parse(char first, BDataIO &stream, char &last); private: int32 fVersion; @@ -113,7 +113,7 @@ class Text : public Element { uint32 Length() const; virtual bool IsDefinitionDelimiter(); - virtual void Parse(char first, BDataIO &stream, char &last) throw (status_t); + virtual void Parse(char first, BDataIO &stream, char &last); private: BString fText; @@ -132,7 +132,7 @@ class Command : public Element { bool HasOption() const; int32 Option() const; - virtual void Parse(char first, BDataIO &stream, char &last) throw (status_t); + virtual void Parse(char first, BDataIO &stream, char &last); private: BString fName; @@ -163,7 +163,7 @@ class Worker { Worker(RTF::Header &start); virtual ~Worker(); - void Work() throw (status_t); + void Work(); protected: virtual void Group(RTF::Group *group); diff --git a/src/add-ons/translators/rtf/convert.cpp b/src/add-ons/translators/rtf/convert.cpp index deb5a5fadb..3474666c80 100644 --- a/src/add-ons/translators/rtf/convert.cpp +++ b/src/add-ons/translators/rtf/convert.cpp @@ -60,7 +60,7 @@ class TextOutput : public RTF::Worker { virtual void Text(RTF::Text *text); private: - void PrepareTextRun(text_run *current) throw (status_t); + void PrepareTextRun(text_run *current); BDataIO *fTarget; int32 fOffset; @@ -89,7 +89,7 @@ conversion_context::Reset() static size_t write_text(conversion_context &context, const char *text, size_t length, - BDataIO *target = NULL) throw (status_t) + BDataIO *target = NULL) { size_t prefix = 0; if (context.new_line) { @@ -116,7 +116,7 @@ write_text(conversion_context &context, const char *text, size_t length, static size_t write_text(conversion_context &context, const char *text, - BDataIO *target = NULL) throw (status_t) + BDataIO *target = NULL) { return write_text(context, text, strlen(text), target); } @@ -124,7 +124,7 @@ write_text(conversion_context &context, const char *text, static size_t next_line(conversion_context &context, const char *prefix, - BDataIO *target) throw (status_t) + BDataIO *target) { size_t length = strlen(prefix); context.new_line = true; @@ -143,7 +143,7 @@ next_line(conversion_context &context, const char *prefix, static size_t write_unicode_char(conversion_context &context, uint32 c, - BDataIO *target) throw (status_t) + BDataIO *target) { size_t length = 1; char bytes[4]; @@ -173,7 +173,7 @@ write_unicode_char(conversion_context &context, uint32 c, static size_t process_command(conversion_context &context, RTF::Command *command, - BDataIO *target) throw (status_t) + BDataIO *target) { const char *name = command->Name(); @@ -374,7 +374,7 @@ TextOutput::FlattenedRunArray(int32 &_size) void -TextOutput::PrepareTextRun(text_run *run) throw (status_t) +TextOutput::PrepareTextRun(text_run *run) { if (run != NULL && fOffset == run->offset) return;