summaryrefslogtreecommitdiffstats
path: root/khtml/misc/decoder.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 04:12:51 +0000
commit560378aaca1784ba19806a0414a32b20c744de39 (patch)
treece0dfd7c3febf2a1adc7603d1019a8be2083c415 /khtml/misc/decoder.cpp
parentd4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff)
downloadtdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz
tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/misc/decoder.cpp')
-rw-r--r--khtml/misc/decoder.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp
index f227f4014..9e5808d9e 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 findXMLEncoding(const TQCString &str, int &encodingLength)
+static int tqfindXMLEncoding(const TQCString &str, int &encodingLength)
{
int len = str.length();
- int pos = str.find("encoding");
+ int pos = str.tqfind("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
- // replace '\0' by spaces, for buggy pages
+ // tqreplace '\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 = findXMLEncoding(str, len);
+ int pos = tqfindXMLEncoding(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.find("http-equiv", pos)) == -1) break;
- //if( (pos = str.find("content-type", pos)) == -1) break;
+ //if( (pos = str.tqfind("http-equiv", pos)) == -1) break;
+ //if( (pos = str.tqfind("content-type", pos)) == -1) break;
while( pos < ( int ) str.length() ) {
- if( (pos = str.find("charset", pos)) == -1) break;
+ if( (pos = str.tqfind("charset", pos)) == -1) break;
pos += 7;
// skip whitespace..
while( pos < (int)str.length() && str[pos] <= ' ' ) pos++;