summaryrefslogtreecommitdiffstats
path: root/kjs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:22:15 -0600
commit1180237ab336226ad932d767a6cb56208314988f (patch)
tree0a29b4d5d237f445dc87cb65b00d604ad4aa686d /kjs
parenta51cd9949c4e6c726a84a61de3cfadd30cefb5c7 (diff)
downloadtdelibs-1180237ab336226ad932d767a6cb56208314988f.tar.gz
tdelibs-1180237ab336226ad932d767a6cb56208314988f.zip
Rename obsolete tq methods to standard names
Diffstat (limited to 'kjs')
-rw-r--r--kjs/lexer.cpp2
-rw-r--r--kjs/lexer.h2
-rw-r--r--kjs/regexp.cpp10
-rw-r--r--kjs/regexp_object.cpp2
-rw-r--r--kjs/ustring.cpp6
-rw-r--r--kjs/ustring.h6
6 files changed, 14 insertions, 14 deletions
diff --git a/kjs/lexer.cpp b/kjs/lexer.cpp
index 55a6d8fa5..054defb88 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.tqunicode.org/Public/UNIDATA/UnicodeData.txt */
+ // Also see: http://www.unicode.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 da7c5ac7e..c6cb6aa88 100644
--- a/kjs/lexer.h
+++ b/kjs/lexer.h
@@ -144,7 +144,7 @@ namespace KJS {
int bol; // begin of line
#endif
- // current and following tqunicode characters (int to allow for -1 for end-of-file marker)
+ // current and following unicode 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 c10911693..06defcc53 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 tqunicode support if need be..
+ // Determine whether libpcre has unicode 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 tqunicode escape sequence looks like \uxxxx but
+ // standard unicode 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].tqunicode())) {
- u = (u << 4) + Lexer::convertHex(p[i + 1].tqunicode());
+ if (i + 1 < p.size() && Lexer::isHexDigit(p[i + 1].unicode())) {
+ u = (u << 4) + Lexer::convertHex(p[i + 1].unicode());
++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].tqunicode();
+ unsigned short c = d[i].unicode();
int sequenceLen;
if (c < 0x80) {
diff --git a/kjs/regexp_object.cpp b/kjs/regexp_object.cpp
index 7ab223d73..edd2bbeca 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].tqunicode()) {
+ switch (flags[pos].unicode()) {
case 'g':
case 'i':
case 'm':
diff --git a/kjs/ustring.cpp b/kjs/ustring.cpp
index 85eadc29c..36f201863 100644
--- a/kjs/ustring.cpp
+++ b/kjs/ustring.cpp
@@ -134,7 +134,7 @@ static int statBufferSize = 0;
UChar UChar::toLower() const
{
- // ### properly support tqunicode tolower
+ // ### properly support unicode 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->tqunicode();
+ unsigned short c = p->unicode();
// 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)->tqunicode();
+ c = (++p)->unicode();
}
}
diff --git a/kjs/ustring.h b/kjs/ustring.h
index 70dd3d7d7..0cdfa3f0f 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 tqunicode() const { return uc; }
+ unsigned short unicode() const { return uc; }
public:
/**
* @return The character converted to lower case.
@@ -132,7 +132,7 @@ namespace KJS {
/**
* @return Unicode value.
*/
- unsigned short tqunicode() const { return ref().uc; }
+ unsigned short unicode() const { return ref().uc; }
/**
* @return Lower byte.
*/
@@ -158,7 +158,7 @@ namespace KJS {
int offset;
};
- inline UChar::UChar(const UCharReference &c) : uc(c.tqunicode()) { }
+ inline UChar::UChar(const UCharReference &c) : uc(c.unicode()) { }
/**
* @short 8 bit char based string class