yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

std:: prefix

Browse source
This commit is contained in:
Nikolay Pultsin 2014-01-31 20:56:26 +00:00
parent 4ff636253f
commit 93ea82e5c2
10 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jni/NativeFormats/fbreader/src/formats/css/StyleSheetParser.cpp
View file

@ -65,7 +65,7 @@ void StyleSheetTableParser::processAtRule(const std::string &name, const StyleSh
shared_ptr<ZLTextStyleEntry> StyleSheetSingleStyleParser::parseString(const char *text) { shared_ptr<ZLTextStyleEntry> StyleSheetSingleStyleParser::parseString(const char *text) {
myReadState = WAITING_FOR_ATTRIBUTE; myReadState = WAITING_FOR_ATTRIBUTE;
parse(text, strlen(text), true); parse(text, std::strlen(text), true);
shared_ptr<ZLTextStyleEntry> control = StyleSheetTable::createControl(myMap); shared_ptr<ZLTextStyleEntry> control = StyleSheetTable::createControl(myMap);
reset(); reset();
return control; return control;
@ -106,7 +106,7 @@ void StyleSheetParser::parse(const char *text, int len, bool final) {
const char *start = text; const char *start = text;
const char *end = text + len; const char *end = text + len;
for (const char *ptr = start; ptr != end; ++ptr) { for (const char *ptr = start; ptr != end; ++ptr) {
if (isspace(*ptr)) { if (std::isspace(*ptr)) {
if (start != ptr) { if (start != ptr) {
myWord.append(start, ptr - start); myWord.append(start, ptr - start);
} }

6
jni/NativeFormats/fbreader/src/formats/css/StyleSheetTable.cpp
View file

@ -57,7 +57,7 @@ void StyleSheetTable::addMap(const std::string &tag, const std::string &aClass,
static bool parseLength(const std::string &toParse, short &size, ZLTextStyleEntry::SizeUnit &unit) { static bool parseLength(const std::string &toParse, short &size, ZLTextStyleEntry::SizeUnit &unit) {
if (ZLStringUtil::stringEndsWith(toParse, "%")) { if (ZLStringUtil::stringEndsWith(toParse, "%")) {
unit = ZLTextStyleEntry::SIZE_UNIT_PERCENT; unit = ZLTextStyleEntry::SIZE_UNIT_PERCENT;
size = atoi(toParse.c_str()); size = std::atoi(toParse.c_str());
return true; return true;
} else if (ZLStringUtil::stringEndsWith(toParse, "em")) { } else if (ZLStringUtil::stringEndsWith(toParse, "em")) {
unit = ZLTextStyleEntry::SIZE_UNIT_EM_100; unit = ZLTextStyleEntry::SIZE_UNIT_EM_100;
@ -69,11 +69,11 @@ static bool parseLength(const std::string &toParse, short &size, ZLTextStyleEntr
return true; return true;
} else if (ZLStringUtil::stringEndsWith(toParse, "px")) { } else if (ZLStringUtil::stringEndsWith(toParse, "px")) {
unit = ZLTextStyleEntry::SIZE_UNIT_PIXEL; unit = ZLTextStyleEntry::SIZE_UNIT_PIXEL;
size = atoi(toParse.c_str()); size = std::atoi(toParse.c_str());
return true; return true;
} else if (ZLStringUtil::stringEndsWith(toParse, "pt")) { } else if (ZLStringUtil::stringEndsWith(toParse, "pt")) {
unit = ZLTextStyleEntry::SIZE_UNIT_POINT; unit = ZLTextStyleEntry::SIZE_UNIT_POINT;
size = atoi(toParse.c_str()); size = std::atoi(toParse.c_str());
return true; return true;
} }
return false; return false;

10
jni/NativeFormats/fbreader/src/formats/html/HtmlBookReader.cpp
View file

@ -404,7 +404,7 @@ HtmlBookReader::~HtmlBookReader() {
void HtmlBookReader::addConvertedDataToBuffer(const char *text, std::size_t len, bool convert) { void HtmlBookReader::addConvertedDataToBuffer(const char *text, std::size_t len, bool convert) {
if (len > 0) { if (len > 0) {
if (myDontBreakParagraph) { if (myDontBreakParagraph) {
while ((len > 0) && isspace(*text)) { while (len > 0 && std::isspace(*text)) {
--len; --len;
++text; ++text;
} }
@ -464,7 +464,7 @@ void HtmlBookReader::preformattedCharacterDataHandler(const char *text, std::siz
myBookReader.beginParagraph(); myBookReader.beginParagraph();
start = ptr + 1; start = ptr + 1;
} else if (mySpaceCounter >= 0) { } else if (mySpaceCounter >= 0) {
if (isspace((unsigned char)*ptr)) { if (std::isspace((unsigned char)*ptr)) {
++mySpaceCounter; ++mySpaceCounter;
} else { } else {
myBookReader.addFixedHSpace(mySpaceCounter); myBookReader.addFixedHSpace(mySpaceCounter);
@ -475,7 +475,7 @@ void HtmlBookReader::preformattedCharacterDataHandler(const char *text, std::siz
addConvertedDataToBuffer(start, end - start, convert); addConvertedDataToBuffer(start, end - start, convert);
} else if (breakType & PlainTextFormat::BREAK_PARAGRAPH_AT_LINE_WITH_INDENT) { } else if (breakType & PlainTextFormat::BREAK_PARAGRAPH_AT_LINE_WITH_INDENT) {
for (const char *ptr = text; ptr != end; ++ptr) { for (const char *ptr = text; ptr != end; ++ptr) {
if (isspace((unsigned char)*ptr)) { if (std::isspace((unsigned char)*ptr)) {
if (*ptr == '\n') { if (*ptr == '\n') {
mySpaceCounter = 0; mySpaceCounter = 0;
} else if (mySpaceCounter >= 0) { } else if (mySpaceCounter >= 0) {
@ -499,7 +499,7 @@ void HtmlBookReader::preformattedCharacterDataHandler(const char *text, std::siz
} }
} else if (breakType & PlainTextFormat::BREAK_PARAGRAPH_AT_EMPTY_LINE) { } else if (breakType & PlainTextFormat::BREAK_PARAGRAPH_AT_EMPTY_LINE) {
for (const char *ptr = start; ptr != end; ++ptr) { for (const char *ptr = start; ptr != end; ++ptr) {
if (isspace((unsigned char)*ptr)) { if (std::isspace((unsigned char)*ptr)) {
if (*ptr == '\n') { if (*ptr == '\n') {
++myBreakCounter; ++myBreakCounter;
} }
@ -536,7 +536,7 @@ bool HtmlBookReader::characterDataHandler(const char *text, std::size_t len, boo
const char *end = text + len; const char *end = text + len;
if (!myIsStarted) { if (!myIsStarted) {
for (; ptr != end; ++ptr) { for (; ptr != end; ++ptr) {
if (!isspace((unsigned char)*ptr)) { if (!std::isspace((unsigned char)*ptr)) {
myIsStarted = true; myIsStarted = true;
break; break;
} }

4
jni/NativeFormats/fbreader/src/formats/html/HtmlEntityCollection.cpp
View file

@ -64,8 +64,8 @@ void CollectionReader::startElementHandler(const char *tag, const char **attribu
} }
static const std::string _name = "name"; static const std::string _name = "name";
static const std::string _number = "number"; static const std::string _number = "number";
if ((_name == attributes[0]) && (_number == attributes[2])) { if (_name == attributes[0] && _number == attributes[2]) {
myCollection[attributes[1]] = atoi(attributes[3]); myCollection[attributes[1]] = std::atoi(attributes[3]);
} }
} }
} }

30
jni/NativeFormats/fbreader/src/formats/html/HtmlReader.cpp
View file

@ -52,7 +52,7 @@ void HtmlReader::setTag(HtmlTag &tag, const std::string &name) {
const std::size_t len = tag.Name.length(); const std::size_t len = tag.Name.length();
for (std::size_t i = 0; i < len; ++i) { for (std::size_t i = 0; i < len; ++i) {
tag.Name[i] = toupper(tag.Name[i]); tag.Name[i] = std::toupper(tag.Name[i]);
} }
} }
@ -79,9 +79,9 @@ enum SpecialType {
static bool allowSymbol(SpecialType type, char ch) { static bool allowSymbol(SpecialType type, char ch) {
return return
((type == ST_NAME) && isalpha(ch)) || (type == ST_NAME && std::isalpha(ch)) ||
((type == ST_DEC) && isdigit(ch)) || (type == ST_DEC && std::isdigit(ch)) ||
((type == ST_HEX) && isxdigit(ch)); (type == ST_HEX && std::isxdigit(ch));
} }
static int specialSymbolNumber(SpecialType type, const std::string &txt) { static int specialSymbolNumber(SpecialType type, const std::string &txt) {
@ -90,9 +90,9 @@ static int specialSymbolNumber(SpecialType type, const std::string &txt) {
case ST_NAME: case ST_NAME:
return HtmlEntityCollection::symbolNumber(txt); return HtmlEntityCollection::symbolNumber(txt);
case ST_DEC: case ST_DEC:
return strtol(txt.c_str() + 1, &end, 10); return std::strtol(txt.c_str() + 1, &end, 10);
case ST_HEX: case ST_HEX:
return strtol(txt.c_str() + 2, &end, 16); return std::strtol(txt.c_str() + 2, &end, 16);
default: default:
return 0; return 0;
} }
@ -157,7 +157,7 @@ void HtmlReader::readDocument(ZLInputStream &stream) {
if (state_special == ST_UNKNOWN) { if (state_special == ST_UNKNOWN) {
if (*ptr == '#') { if (*ptr == '#') {
state_special = ST_NUM; state_special = ST_NUM;
} else if (isalpha(*ptr)) { } else if (std::isalpha(*ptr)) {
state_special = ST_NAME; state_special = ST_NAME;
} else { } else {
start = ptr; start = ptr;
@ -166,7 +166,7 @@ void HtmlReader::readDocument(ZLInputStream &stream) {
} else if (state_special == ST_NUM) { } else if (state_special == ST_NUM) {
if (*ptr == 'x') { if (*ptr == 'x') {
state_special = ST_HEX; state_special = ST_HEX;
} else if (isdigit(*ptr)) { } else if (std::isdigit(*ptr)) {
state_special = ST_DEC; state_special = ST_DEC;
} else { } else {
start = ptr; start = ptr;
@ -231,13 +231,13 @@ void HtmlReader::readDocument(ZLInputStream &stream) {
} }
break; break;
case PS_TAGNAME: case PS_TAGNAME:
if ((*ptr == '>') || (*ptr == '/') || isspace((unsigned char)*ptr)) { if (*ptr == '>' || *ptr == '/' || std::isspace((unsigned char)*ptr)) {
currentString.append(start, ptr - start); currentString.append(start, ptr - start);
start = ptr + 1; start = ptr + 1;
setTag(currentTag, currentString); setTag(currentTag, currentString);
currentString.erase(); currentString.erase();
if (currentTag.Name == "") { if (currentTag.Name == "") {
state = (*ptr == '>') ? PS_TEXT : PS_SKIPTAG; state = *ptr == '>' ? PS_TEXT : PS_SKIPTAG;
} else { } else {
if (*ptr == '>') { if (*ptr == '>') {
if (!tagHandler(currentTag)) { if (!tagHandler(currentTag)) {
@ -260,11 +260,11 @@ void HtmlReader::readDocument(ZLInputStream &stream) {
} }
break; break;
case PS_ATTRIBUTENAME: case PS_ATTRIBUTENAME:
if ((*ptr == '>') || (*ptr == '/') || (*ptr == '=') || isspace((unsigned char)*ptr)) { if (*ptr == '>' || *ptr == '/' || *ptr == '=' || std::isspace((unsigned char)*ptr)) {
if ((ptr != start) || !currentString.empty()) { if (ptr != start || !currentString.empty()) {
currentString.append(start, ptr - start); currentString.append(start, ptr - start);
for (unsigned int i = 0; i < currentString.length(); ++i) { for (unsigned int i = 0; i < currentString.length(); ++i) {
currentString[i] = toupper(currentString[i]); currentString[i] = std::toupper(currentString[i]);
} }
currentTag.addAttribute(currentString); currentTag.addAttribute(currentString);
currentString.erase(); currentString.erase();
@ -300,8 +300,8 @@ void HtmlReader::readDocument(ZLInputStream &stream) {
appendString(attributeValueString, currentString); appendString(attributeValueString, currentString);
state = PS_SPECIAL_IN_ATTRIBUTEVALUE; state = PS_SPECIAL_IN_ATTRIBUTEVALUE;
state_special = ST_UNKNOWN; state_special = ST_UNKNOWN;
} else if ((quotationCounter != 1) && ((*ptr == '>') || (*ptr == '/') || isspace((unsigned char)*ptr))) { } else if (quotationCounter != 1 && (*ptr == '>' || *ptr == '/' || std::isspace((unsigned char)*ptr))) {
if ((ptr != start) || !currentString.empty()) { if (ptr != start || !currentString.empty()) {
currentString.append(start, ptr - start); currentString.append(start, ptr - start);
appendString(attributeValueString, currentString); appendString(attributeValueString, currentString);
if (attributeValueString[0] == '"') { if (attributeValueString[0] == '"') {

4
jni/NativeFormats/fbreader/src/formats/oeb/NCXReader.cpp
View file

@ -47,14 +47,14 @@ void NCXReader::startElementHandler(const char *fullTag, const char **attributes
case READ_MAP: case READ_MAP:
if (TAG_NAVPOINT == tag) { if (TAG_NAVPOINT == tag) {
const char *order = attributeValue(attributes, "playOrder"); const char *order = attributeValue(attributes, "playOrder");
myPointStack.push_back(NavPoint((order != 0) ? atoi(order) : myPlayIndex++, myPointStack.size())); myPointStack.push_back(NavPoint(order != 0 ? std::atoi(order) : myPlayIndex++, myPointStack.size()));
myReadState = READ_POINT; myReadState = READ_POINT;
} }
break; break;
case READ_POINT: case READ_POINT:
if (TAG_NAVPOINT == tag) { if (TAG_NAVPOINT == tag) {
const char *order = attributeValue(attributes, "playOrder"); const char *order = attributeValue(attributes, "playOrder");
myPointStack.push_back(NavPoint((order != 0) ? atoi(order) : myPlayIndex++, myPointStack.size())); myPointStack.push_back(NavPoint(order != 0 ? std::atoi(order) : myPlayIndex++, myPointStack.size()));
} else if (TAG_NAVLABEL == tag) { } else if (TAG_NAVLABEL == tag) {
myReadState = READ_LABEL; myReadState = READ_LABEL;
} else if (TAG_CONTENT == tag) { } else if (TAG_CONTENT == tag) {

12
jni/NativeFormats/fbreader/src/formats/rtf/RtfReader.cpp
View file

@ -236,7 +236,7 @@ bool RtfReader::parseDocument() {
while (ptr != end) { while (ptr != end) {
switch (parserState) { switch (parserState) {
case READ_END_OF_FILE: case READ_END_OF_FILE:
if (*ptr != '}' && !isspace(*ptr)) { if (*ptr != '}' && !std::isspace(*ptr)) {
return false; return false;
} }
break; break;
@ -332,7 +332,7 @@ bool RtfReader::parseDocument() {
case READ_HEX_SYMBOL: case READ_HEX_SYMBOL:
hexString += *ptr; hexString += *ptr;
if (hexString.size() == 2) { if (hexString.size() == 2) {
char ch = strtol(hexString.c_str(), 0, 16); char ch = std::strtol(hexString.c_str(), 0, 16);
hexString.erase(); hexString.erase();
processCharData(&ch, 1); processCharData(&ch, 1);
parserState = READ_NORMAL_DATA; parserState = READ_NORMAL_DATA;
@ -340,7 +340,7 @@ bool RtfReader::parseDocument() {
} }
break; break;
case READ_KEYWORD: case READ_KEYWORD:
if (!isalpha(*ptr)) { if (!std::isalpha(*ptr)) {
if (ptr == dataStart && keyword.empty()) { if (ptr == dataStart && keyword.empty()) {
if (*ptr == '\'') { if (*ptr == '\'') {
parserState = READ_HEX_SYMBOL; parserState = READ_HEX_SYMBOL;
@ -352,7 +352,7 @@ bool RtfReader::parseDocument() {
dataStart = ptr + 1; dataStart = ptr + 1;
} else { } else {
keyword.append(dataStart, ptr - dataStart); keyword.append(dataStart, ptr - dataStart);
if (*ptr == '-' || isdigit(*ptr)) { if (*ptr == '-' || std::isdigit(*ptr)) {
dataStart = ptr; dataStart = ptr;
parserState = READ_KEYWORD_PARAMETER; parserState = READ_KEYWORD_PARAMETER;
} else { } else {
@ -365,9 +365,9 @@ bool RtfReader::parseDocument() {
} }
break; break;
case READ_KEYWORD_PARAMETER: case READ_KEYWORD_PARAMETER:
if (!isdigit(*ptr)) { if (!std::isdigit(*ptr)) {
parameterString.append(dataStart, ptr - dataStart); parameterString.append(dataStart, ptr - dataStart);
int parameter = atoi(parameterString.c_str()); int parameter = std::atoi(parameterString.c_str());
parameterString.erase(); parameterString.erase();
readNextChar = *ptr == ' '; readNextChar = *ptr == ' ';
if (keyword == "bin" && parameter > 0) { if (keyword == "bin" && parameter > 0) {

2
jni/NativeFormats/fbreader/src/formats/txt/PlainTextFormat.cpp
View file

@ -133,7 +133,7 @@ void PlainTextFormatDetector::detect(ZLInputStream &stream, PlainTextFormat &for
currentLineIndent = 0; currentLineIndent = 0;
} else if (*ptr == '\r') { } else if (*ptr == '\r') {
continue; continue;
} else if (isspace((unsigned char)*ptr)) { } else if (std::isspace((unsigned char)*ptr)) {
if (currentLineIsEmpty) { if (currentLineIsEmpty) {
++currentLineIndent; ++currentLineIndent;
} }

2
jni/NativeFormats/fbreader/src/formats/txt/TxtBookReader.cpp
View file

@ -39,7 +39,7 @@ bool TxtBookReader::characterDataHandler(std::string &str) {
const char *ptr = str.data(); const char *ptr = str.data();
const char *end = ptr + str.length(); const char *end = ptr + str.length();
for (; ptr != end; ++ptr) { for (; ptr != end; ++ptr) {
if (isspace((unsigned char)*ptr)) { if (std::isspace((unsigned char)*ptr)) {
if (*ptr != '\t') { if (*ptr != '\t') {
++mySpaceCounter; ++mySpaceCounter;
} else { } else {

2
jni/NativeFormats/fbreader/src/formats/util/MiscUtil.cpp
View file

@ -81,7 +81,7 @@ std::string MiscUtil::decodeHtmlURL(const std::string &encoded) {
if ((encoded[i] == '%') && (i < len - 2)) { if ((encoded[i] == '%') && (i < len - 2)) {
buffer[0] = *(encoded.data() + i + 1); buffer[0] = *(encoded.data() + i + 1);
buffer[1] = *(encoded.data() + i + 2); buffer[1] = *(encoded.data() + i + 2);
decoded += (char)strtol(buffer, 0, 16); decoded += (char)std::strtol(buffer, 0, 16);
i += 2; i += 2;
} else { } else {
decoded += encoded[i]; decoded += encoded[i];