From 56160bf4dfe503631ef6373367b281f081bab2b4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:13 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77. --- kjs/internal.cpp | 2 +- kjs/lexer.cpp | 2 +- kjs/lexer.h | 2 +- kjs/regexp.cpp | 10 +++++----- kjs/regexp_object.cpp | 2 +- kjs/ustring.cpp | 6 +++--- kjs/ustring.h | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kjs') diff --git a/kjs/internal.cpp b/kjs/internal.cpp index 25f7b6e31..c796cddd5 100644 --- a/kjs/internal.cpp +++ b/kjs/internal.cpp @@ -52,7 +52,7 @@ extern int kjsyyparse(); using namespace KJS; namespace KJS { - /* work around some strict alignment requirements + /* work around some strict tqalignment requirements for double variables on some architectures (e.g. PA-RISC) */ typedef union { unsigned char b[8]; double d; } kjs_double_t; diff --git a/kjs/lexer.cpp b/kjs/lexer.cpp index 054defb88..55a6d8fa5 100644 --- a/kjs/lexer.cpp +++ b/kjs/lexer.cpp @@ -604,7 +604,7 @@ bool Lexer::isIdentLetter(unsigned short c) // Uppercase letter (Lu), Lowercase letter (Ll), // Titlecase letter (Lt)", Modifier letter (Lm), // Other letter (Lo), or Letter number (Nl). - // Also see: http://www.unicode.org/Public/UNIDATA/UnicodeData.txt */ + // Also see: http://www.tqunicode.org/Public/UNIDATA/UnicodeData.txt */ return (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || // A with grave - O with diaeresis diff --git a/kjs/lexer.h b/kjs/lexer.h index c6cb6aa88..da7c5ac7e 100644 --- a/kjs/lexer.h +++ b/kjs/lexer.h @@ -144,7 +144,7 @@ namespace KJS { int bol; // begin of line #endif - // current and following unicode characters (int to allow for -1 for end-of-file marker) + // current and following tqunicode characters (int to allow for -1 for end-of-file marker) int current, next1, next2, next3; UString **strings; diff --git a/kjs/regexp.cpp b/kjs/regexp.cpp index 06defcc53..c10911693 100644 --- a/kjs/regexp.cpp +++ b/kjs/regexp.cpp @@ -38,7 +38,7 @@ RegExp::UTF8SupportState RegExp::utf8Support = RegExp::Unknown; RegExp::RegExp(const UString &p, int f) : pat(p), flgs(f), m_notEmpty(false), valid(true), buffer(0), originalPos(0) { - // Determine whether libpcre has unicode support if need be.. + // Determine whether libpcre has tqunicode support if need be.. #ifdef PCRE_CONFIG_UTF8 if (utf8Support == Unknown) { int supported; @@ -64,13 +64,13 @@ RegExp::RegExp(const UString &p, int f) escape = false; // we only care about \u if (c == 'u') { - // standard unicode escape sequence looks like \uxxxx but + // standard tqunicode escape sequence looks like \uxxxx but // other browsers also accept less then 4 hex digits unsigned short u = 0; int j = 0; for (j = 0; j < 4; ++j) { - if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].unicode())) { - u = (u << 4) + Lexer::convertHex(p[i + 1].unicode()); + if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].tqunicode())) { + u = (u << 4) + Lexer::convertHex(p[i + 1].tqunicode()); ++i; } else { // sequence incomplete. restore index. @@ -222,7 +222,7 @@ void RegExp::prepareUtf8(const UString& s) int *posOut = originalPos; const UChar *d = s.data(); for (int i = 0; i != length; ++i) { - unsigned short c = d[i].unicode(); + unsigned short c = d[i].tqunicode(); int sequenceLen; if (c < 0x80) { diff --git a/kjs/regexp_object.cpp b/kjs/regexp_object.cpp index edd2bbeca..7ab223d73 100644 --- a/kjs/regexp_object.cpp +++ b/kjs/regexp_object.cpp @@ -292,7 +292,7 @@ RegExp* RegExpObjectImp::makeEngine(ExecState *exec, const UString &p, const Val // Check for validity of flags for (int pos = 0; pos < flags.size(); ++pos) { - switch (flags[pos].unicode()) { + switch (flags[pos].tqunicode()) { case 'g': case 'i': case 'm': diff --git a/kjs/ustring.cpp b/kjs/ustring.cpp index 36f201863..85eadc29c 100644 --- a/kjs/ustring.cpp +++ b/kjs/ustring.cpp @@ -134,7 +134,7 @@ static int statBufferSize = 0; UChar UChar::toLower() const { - // ### properly support unicode tolower + // ### properly support tqunicode tolower if (uc >= 256) return *this; @@ -746,7 +746,7 @@ unsigned int UString::toStrictUInt32(bool *ok) const if (len == 0) return 0; const UChar *p = rep->dat; - unsigned short c = p->unicode(); + unsigned short c = p->tqunicode(); // If the first digit is 0, only 0 itself is OK. if (c == '0') { @@ -782,7 +782,7 @@ unsigned int UString::toStrictUInt32(bool *ok) const } // Get next character. - c = (++p)->unicode(); + c = (++p)->tqunicode(); } } diff --git a/kjs/ustring.h b/kjs/ustring.h index 0cdfa3f0f..70dd3d7d7 100644 --- a/kjs/ustring.h +++ b/kjs/ustring.h @@ -79,7 +79,7 @@ namespace KJS { /** * @return the 16 bit Unicode value of the character */ - unsigned short unicode() const { return uc; } + unsigned short tqunicode() const { return uc; } public: /** * @return The character converted to lower case. @@ -132,7 +132,7 @@ namespace KJS { /** * @return Unicode value. */ - unsigned short unicode() const { return ref().uc; } + unsigned short tqunicode() const { return ref().uc; } /** * @return Lower byte. */ @@ -158,7 +158,7 @@ namespace KJS { int offset; }; - inline UChar::UChar(const UCharReference &c) : uc(c.unicode()) { } + inline UChar::UChar(const UCharReference &c) : uc(c.tqunicode()) { } /** * @short 8 bit char based string class -- cgit v1.2.1