yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 12:00:17 +02:00
Code Issues Releases Wiki Activity

enum member renamed: READ_SOMETHING => READ_TITLE_INFO

Browse source
This commit is contained in:
Nikolay Pultsin 2013-03-23 20:55:38 +04:00
parent aef32b160d
commit 0b0a8cabf5
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
jni/NativeFormats/fbreader/src/formats/fb2/FB2MetaInfoReader.cpp
View file

@ -66,25 +66,25 @@ void FB2MetaInfoReader::startElementHandler(int tag, const char **attributes) {
interrupt(); interrupt();
break; break;
case _TITLE_INFO: case _TITLE_INFO:
myReadState = READ_SOMETHING; myReadState = READ_TITLE_INFO;
break; break;
case _BOOK_TITLE: case _BOOK_TITLE:
if (myReadState == READ_SOMETHING) { if (myReadState == READ_TITLE_INFO) {
myReadState = READ_TITLE; myReadState = READ_TITLE;
} }
break; break;
case _GENRE: case _GENRE:
if (myReadState == READ_SOMETHING) { if (myReadState == READ_TITLE_INFO) {
myReadState = READ_GENRE; myReadState = READ_GENRE;
} }
break; break;
case _AUTHOR: case _AUTHOR:
if (myReadState == READ_SOMETHING) { if (myReadState == READ_TITLE_INFO) {
myReadState = READ_AUTHOR; myReadState = READ_AUTHOR;
} }
break; break;
case _LANG: case _LANG:
if (myReadState == READ_SOMETHING) { if (myReadState == READ_TITLE_INFO) {
myReadState = READ_LANGUAGE; myReadState = READ_LANGUAGE;
} }
break; break;
@ -104,7 +104,7 @@ void FB2MetaInfoReader::startElementHandler(int tag, const char **attributes) {
} }
break; break;
case _SEQUENCE: case _SEQUENCE:
if (myReadState == READ_SOMETHING) { if (myReadState == READ_TITLE_INFO) {
const char *name = attributeValue(attributes, "name"); const char *name = attributeValue(attributes, "name");
if (name != 0) { if (name != 0) {
std::string seriesTitle = name; std::string seriesTitle = name;
@ -128,7 +128,7 @@ void FB2MetaInfoReader::endElementHandler(int tag) {
if (myReadState == READ_TITLE) { if (myReadState == READ_TITLE) {
myBook.setTitle(myBuffer); myBook.setTitle(myBuffer);
myBuffer.erase(); myBuffer.erase();
myReadState = READ_SOMETHING; myReadState = READ_TITLE_INFO;
} }
break; break;
case _GENRE: case _GENRE:
@ -146,7 +146,7 @@ void FB2MetaInfoReader::endElementHandler(int tag) {
} }
myBuffer.erase(); myBuffer.erase();
} }
myReadState = READ_SOMETHING; myReadState = READ_TITLE_INFO;
} }
break; break;
case _AUTHOR: case _AUTHOR:
@ -167,14 +167,14 @@ void FB2MetaInfoReader::endElementHandler(int tag) {
myAuthorNames[0].erase(); myAuthorNames[0].erase();
myAuthorNames[1].erase(); myAuthorNames[1].erase();
myAuthorNames[2].erase(); myAuthorNames[2].erase();
myReadState = READ_SOMETHING; myReadState = READ_TITLE_INFO;
} }
break; break;
case _LANG: case _LANG:
if (myReadState == READ_LANGUAGE) { if (myReadState == READ_LANGUAGE) {
myBook.setLanguage(myBuffer); myBook.setLanguage(myBuffer);
myBuffer.erase(); myBuffer.erase();
myReadState = READ_SOMETHING; myReadState = READ_TITLE_INFO;
} }
break; break;
case _FIRST_NAME: case _FIRST_NAME:

2
jni/NativeFormats/fbreader/src/formats/fb2/FB2MetaInfoReader.h
View file

@ -43,7 +43,7 @@ private:
enum { enum {
READ_NOTHING, READ_NOTHING,
READ_SOMETHING, READ_TITLE_INFO,
READ_TITLE, READ_TITLE,
READ_AUTHOR, READ_AUTHOR,
READ_AUTHOR_NAME_0, READ_AUTHOR_NAME_0,