diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/misc/decoder.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/misc/decoder.cpp')
| -rw-r--r-- | khtml/misc/decoder.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp index 9e5808d9e..f227f4014 100644 --- a/khtml/misc/decoder.cpp +++ b/khtml/misc/decoder.cpp @@ -166,11 +166,11 @@ static void skipComment(const char *&ptr, const char *pEnd) } // Returns the position of the encoding string. -static int tqfindXMLEncoding(const TQCString &str, int &encodingLength) +static int findXMLEncoding(const TQCString &str, int &encodingLength) { int len = str.length(); - int pos = str.tqfind("encoding"); + int pos = str.find("encoding"); if (pos == -1) return -1; pos += 8; @@ -287,7 +287,7 @@ TQString Decoder::decode(const char *data, int len) buffer.append(data, len); #else if(m_codec->mibEnum() != 1000) { // utf16 - // tqreplace '\0' by spaces, for buggy pages + // replace '\0' by spaces, for buggy pages char *d = const_cast<char *>(data); int i = len - 1; while(i >= 0) { @@ -329,7 +329,7 @@ TQString Decoder::decode(const char *data, int len) break; TQCString str(ptr, end - ptr + 1); //+1 as it must include the \0 terminator int len; - int pos = tqfindXMLEncoding(str, len); + int pos = findXMLEncoding(str, len); if (pos != -1) { setEncoding(str.mid(pos, len), EncodingFromXMLHeader); if (m_type == EncodingFromXMLHeader) @@ -365,10 +365,10 @@ TQString Decoder::decode(const char *data, int len) TQCString str( ptr, (end-ptr)+1); str = str.lower(); int pos = 0; - //if( (pos = str.tqfind("http-equiv", pos)) == -1) break; - //if( (pos = str.tqfind("content-type", pos)) == -1) break; + //if( (pos = str.find("http-equiv", pos)) == -1) break; + //if( (pos = str.find("content-type", pos)) == -1) break; while( pos < ( int ) str.length() ) { - if( (pos = str.tqfind("charset", pos)) == -1) break; + if( (pos = str.find("charset", pos)) == -1) break; pos += 7; // skip whitespace.. while( pos < (int)str.length() && str[pos] <= ' ' ) pos++; |