diff options
Diffstat (limited to 'libkmime/kmime_parsers.cpp')
| -rw-r--r-- | libkmime/kmime_parsers.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libkmime/kmime_parsers.cpp b/libkmime/kmime_parsers.cpp index 6527c9912..446f1af7c 100644 --- a/libkmime/kmime_parsers.cpp +++ b/libkmime/kmime_parsers.cpp @@ -149,11 +149,11 @@ bool UUEncoded::parse() while (success) { int beginPos=currentPos, uuStart=currentPos, endPos=0, lineCount=0, MCount=0, pos=0, len=0; - bool containsBegin=false, containsEnd=false; + bool tqcontainsBegin=false, tqcontainsEnd=false; TQCString tmp,fileName; if( (beginPos=s_rc.find(TQRegExp("begin [0-9][0-9][0-9]"),currentPos))>-1 && (beginPos==0 || s_rc.at(beginPos-1)=='\n') ) { - containsBegin=true; + tqcontainsBegin=true; uuStart=s_rc.find('\n', beginPos); if(uuStart==-1) {//no more line breaks found, we give up success = false; @@ -166,9 +166,9 @@ bool UUEncoded::parse() if ( (endPos=s_rc.find("\nend",(uuStart>0)? uuStart-1:0))==-1 ) endPos=s_rc.length(); //no end found else - containsEnd=true; + tqcontainsEnd=true; - if ((containsBegin && containsEnd) || firstIteration) { + if ((tqcontainsBegin && tqcontainsEnd) || firstIteration) { //printf("beginPos=%d , uuStart=%d , endPos=%d\n", beginPos, uuStart, endPos); //all lines in a uuencoded text start with 'M' @@ -183,12 +183,12 @@ bool UUEncoded::parse() //printf("lineCount=%d , MCount=%d\n", lineCount, MCount); if( MCount==0 || (lineCount-MCount)>10 || - ((!containsBegin || !containsEnd) && (MCount<15)) ) { // harder check for splitted-articles + ((!tqcontainsBegin || !tqcontainsEnd) && (MCount<15)) ) { // harder check for splitted-articles success = false; break; //too many "non-M-Lines" found, we give up } - if( (!containsBegin || !containsEnd) && s_ubject) { // message may be split up => parse subject + if( (!tqcontainsBegin || !tqcontainsEnd) && s_ubject) { // message may be split up => parse subject TQRegExp rx("[0-9]+/[0-9]+"); pos=rx.search(TQString(s_ubject), 0); len=rx.matchedLength(); @@ -207,7 +207,7 @@ bool UUEncoded::parse() if(beginPos>0) t_ext.append(s_rc.mid(currentPos,beginPos-currentPos)); - if(containsBegin) + if(tqcontainsBegin) fileName = s_rc.mid(beginPos+10, uuStart-beginPos-11); //everything between "begin ### " and the next LF is considered as the filename else fileName = ""; @@ -281,7 +281,7 @@ bool YENCEncoded::parse() while (success) { int beginPos=currentPos, yencStart=currentPos; - bool containsPart=false; + bool tqcontainsPart=false; TQCString fileName,mimeType; if ((beginPos=s_rc.find("=ybegin ", currentPos))>-1 && ( beginPos==0 || s_rc.at( beginPos-1)=='\n') ) { @@ -292,7 +292,7 @@ bool YENCEncoded::parse() } else { yencStart++; if (s_rc.find("=ypart", yencStart)==yencStart) { - containsPart=true; + tqcontainsPart=true; yencStart=s_rc.find( '\n', yencStart); if ( yencStart== -1) { success=false; @@ -332,7 +332,7 @@ bool YENCEncoded::parse() } int partBegin, partEnd; - if (containsPart) { + if (tqcontainsPart) { if (!yencMeta(meta, "part", &p_artNr)) { success=false; break; @@ -355,7 +355,7 @@ bool YENCEncoded::parse() int len=s_rc.length(); bool lineStart=true; int lineLength=0; - bool containsEnd=false; + bool tqcontainsEnd=false; TQByteArray binary = TQByteArray(yencSize); while (pos<len) { int ch=s_rc.at(pos); @@ -382,7 +382,7 @@ bool YENCEncoded::parse() ch=s_rc.at( pos+1); if (lineStart && ch=='y') { - containsEnd=true; + tqcontainsEnd=true; break; } pos+=2; @@ -412,7 +412,7 @@ bool YENCEncoded::parse() } } - if (!containsEnd) + if (!tqcontainsEnd) { success=false; break; |