Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RTFTranslator: Remove some dynamic exception specifications.

Browse Source
This commit is contained in:
Augustin Cavalier 2021-12-07 14:22:12 -05:00
parent db911197a0
commit 365c228de7
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/add-ons/translators/rtf/RTF.cpp
View File

@ -33,15 +33,15 @@ static const char *kDestinationControlWords[] = {
"rxe", "stylesheet", "subject", "tc", "title", "txe", "xe", "rxe", "stylesheet", "subject", "tc", "title", "txe", "xe",
}; };
static char read_char(BDataIO &stream, bool endOfFileAllowed = false) 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) throw (status_t); static int32 parse_integer(char first, BDataIO &stream, char &_last, int32 base = 10);
using namespace RTF; using namespace RTF;
static char static char
read_char(BDataIO &stream, bool endOfFileAllowed) throw (status_t) read_char(BDataIO &stream, bool endOfFileAllowed)
{ {
char c; char c;
ssize_t bytesRead = stream.Read(&c, 1); ssize_t bytesRead = stream.Read(&c, 1);
@ -58,7 +58,6 @@ read_char(BDataIO &stream, bool endOfFileAllowed) throw (status_t)
static int32 static int32
parse_integer(char first, BDataIO &stream, char &_last, int32 base) parse_integer(char first, BDataIO &stream, char &_last, int32 base)
throw (status_t)
{ {
const char *kDigits = "0123456789abcdef"; const char *kDigits = "0123456789abcdef";
int32 integer = 0; int32 integer = 0;
@ -292,7 +291,7 @@ Group::~Group()
void void
Group::Parse(char first, BDataIO &stream, char &last) throw (status_t) Group::Parse(char first, BDataIO &stream, char &last)
{ {
if (first == '\0') if (first == '\0')
first = read_char(stream); first = read_char(stream);
@ -452,7 +451,7 @@ Header::~Header()
void 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 // The stream has been peeked into by the parser already, and
// only the version follows in the stream -- let's pick it up // only the version follows in the stream -- let's pick it up
@ -529,7 +528,7 @@ Text::IsDefinitionDelimiter()
void void
Text::Parse(char first, BDataIO &stream, char &last) throw (status_t) Text::Parse(char first, BDataIO &stream, char &last)
{ {
char c = first; char c = first;
if (c == '\0') if (c == '\0')
@ -613,7 +612,7 @@ Command::~Command()
void void
Command::Parse(char first, BDataIO &stream, char &last) throw (status_t) Command::Parse(char first, BDataIO &stream, char &last)
{ {
if (first == '\0') if (first == '\0')
first = read_char(stream); first = read_char(stream);
@ -817,7 +816,7 @@ Worker::Dispatch(Element *element)
void void
Worker::Work() throw (status_t) Worker::Work()
{ {
Dispatch(&fStart); Dispatch(&fStart);
} }

12
src/add-ons/translators/rtf/RTF.h
View File

@ -53,7 +53,7 @@ class Element {
Group *Parent() const; Group *Parent() const;
virtual bool IsDefinitionDelimiter(); 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); virtual void PrintToStream(int32 level = 0);
private: private:
@ -79,7 +79,7 @@ class Group : public Element {
void DetermineDestination(); void DetermineDestination();
group_destination Destination() const; 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: protected:
BList fElements; BList fElements;
@ -96,7 +96,7 @@ class Header : public Group {
rgb_color Color(int32 index); 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: private:
int32 fVersion; int32 fVersion;
@ -113,7 +113,7 @@ class Text : public Element {
uint32 Length() const; uint32 Length() const;
virtual bool IsDefinitionDelimiter(); 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: private:
BString fText; BString fText;
@ -132,7 +132,7 @@ class Command : public Element {
bool HasOption() const; bool HasOption() const;
int32 Option() 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: private:
BString fName; BString fName;
@ -163,7 +163,7 @@ class Worker {
Worker(RTF::Header &start); Worker(RTF::Header &start);
virtual ~Worker(); virtual ~Worker();
void Work() throw (status_t); void Work();
protected: protected:
virtual void Group(RTF::Group *group); virtual void Group(RTF::Group *group);

14
src/add-ons/translators/rtf/convert.cpp
View File

@ -60,7 +60,7 @@ class TextOutput : public RTF::Worker {
virtual void Text(RTF::Text *text); virtual void Text(RTF::Text *text);
private: private:
void PrepareTextRun(text_run *current) throw (status_t); void PrepareTextRun(text_run *current);
BDataIO *fTarget; BDataIO *fTarget;
int32 fOffset; int32 fOffset;
@ -89,7 +89,7 @@ conversion_context::Reset()
static size_t static size_t
write_text(conversion_context &context, const char *text, size_t length, write_text(conversion_context &context, const char *text, size_t length,
BDataIO *target = NULL) throw (status_t) BDataIO *target = NULL)
{ {
size_t prefix = 0; size_t prefix = 0;
if (context.new_line) { if (context.new_line) {
@ -116,7 +116,7 @@ write_text(conversion_context &context, const char *text, size_t length,
static size_t static size_t
write_text(conversion_context &context, const char *text, 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); return write_text(context, text, strlen(text), target);
} }
@ -124,7 +124,7 @@ write_text(conversion_context &context, const char *text,
static size_t static size_t
next_line(conversion_context &context, const char *prefix, next_line(conversion_context &context, const char *prefix,
BDataIO *target) throw (status_t) BDataIO *target)
{ {
size_t length = strlen(prefix); size_t length = strlen(prefix);
context.new_line = true; context.new_line = true;
@ -143,7 +143,7 @@ next_line(conversion_context &context, const char *prefix,
static size_t static size_t
write_unicode_char(conversion_context &context, uint32 c, write_unicode_char(conversion_context &context, uint32 c,
BDataIO *target) throw (status_t) BDataIO *target)
{ {
size_t length = 1; size_t length = 1;
char bytes[4]; char bytes[4];
@ -173,7 +173,7 @@ write_unicode_char(conversion_context &context, uint32 c,
static size_t static size_t
process_command(conversion_context &context, RTF::Command *command, process_command(conversion_context &context, RTF::Command *command,
BDataIO *target) throw (status_t) BDataIO *target)
{ {
const char *name = command->Name(); const char *name = command->Name();
@ -374,7 +374,7 @@ TextOutput::FlattenedRunArray(int32 &_size)
void void
TextOutput::PrepareTextRun(text_run *run) throw (status_t) TextOutput::PrepareTextRun(text_run *run)
{ {
if (run != NULL && fOffset == run->offset) if (run != NULL && fOffset == run->offset)
return; return;