[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:45:55 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 40e9531af67f59000eb9ce8037064f41fcb38036
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 21 01:35:22 2001 +0000
Created from QChar implementation in KWQString.mm
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@163 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQChar.mm
similarity index 79%
copy from WebCore/kwq/KWQString.mm
copy to WebCore/kwq/KWQChar.mm
index a6372d1..ee53cca 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQChar.mm
@@ -25,10 +25,7 @@
// FIXME: obviously many functions here can be made inline
-// FIXME: should QChar and QConstString be in separate source files?
-
#include <qstring.h>
-#include <ctype.h>
static UniChar scratchUniChar;
@@ -86,27 +83,24 @@ QChar::QChar(const QChar &qc)
QChar::~QChar()
{
- // do nothing
+ // do nothing because the single data member is a UniChar
}
-QChar QChar::lower() const
+ushort QChar::unicode() const
{
- scratchUniChar = c;
- CFStringLowercase(GetScratchUniCharString(), NULL);
- if (scratchUniChar) {
- return QChar(scratchUniChar);
- }
- return *this;
+ return c;
}
-QChar QChar::upper() const
+uchar QChar::cell() const
{
- scratchUniChar = c;
- CFStringUppercase(GetScratchUniCharString(), NULL);
- if (scratchUniChar) {
- return QChar(scratchUniChar);
- }
- return *this;
+ // return least significant byte
+ return c & 0xff;
+}
+
+uchar QChar::row() const
+{
+ // return most significant byte
+ return (c & 0xff00) >> 8;
}
char QChar::latin1() const
@@ -114,26 +108,34 @@ char QChar::latin1() const
return row() ? 0 : cell();
}
-bool QChar::isNull() const
+QChar::operator char() const
{
- return c == 0;
+ return latin1();
}
-bool QChar::isDigit() const
+bool QChar::isNull() const
{
- return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
- kCFCharacterSetDecimalDigit), c);
+ return c == 0;
}
bool QChar::isSpace() const
{
+ // FIXME: should we use this optimization?
+#if 0
if (!row()) {
return isspace(c);
}
+#endif
return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
kCFCharacterSetWhitespaceAndNewline), c);
}
+bool QChar::isDigit() const
+{
+ return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
+ kCFCharacterSetDecimalDigit), c);
+}
+
bool QChar::isLetter() const
{
return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
@@ -152,16 +154,24 @@ bool QChar::isPunct() const
kCFCharacterSetPunctuation), c);
}
-uchar QChar::cell() const
+QChar QChar::lower() const
{
- // return least significant byte
- return c & 0xff;
+ scratchUniChar = c;
+ CFStringLowercase(GetScratchUniCharString(), NULL);
+ if (scratchUniChar) {
+ return QChar(scratchUniChar);
+ }
+ return *this;
}
-uchar QChar::row() const
+QChar QChar::upper() const
{
- // return most significant byte
- return (c & 0xff00) >> 8;
+ scratchUniChar = c;
+ CFStringUppercase(GetScratchUniCharString(), NULL);
+ if (scratchUniChar) {
+ return QChar(scratchUniChar);
+ }
+ return *this;
}
QChar::Direction QChar::direction() const
@@ -185,11 +195,6 @@ QChar QChar::mirroredChar() const
return *this;
}
-ushort QChar::unicode() const
-{
- return c;
-}
-
int operator==(QChar qc1, QChar qc2)
{
return qc1.c == qc2.c;
@@ -219,62 +224,3 @@ int operator!=(char ch, QChar qc)
{
return ch != qc.c;
}
-
-QChar::operator char() const
-{
- return latin1();
-}
-
-QString::QString()
-{
- s = NULL;
-}
-
-QString::QString(QChar qc)
-{
- s = CFStringCreateMutable(NULL, 0);
- CFStringAppendCharacters(s, &qc.c, 1);
-}
-
-QString::QString(const QChar *qc, uint len)
-{
- if (qc || len) {
- s = CFStringCreateMutable(NULL, 0);
- CFStringAppendCharacters(s, &qc->c, len);
- } else {
- s = NULL;
- }
-}
-
-QString::QString(const char *ch)
-{
- if (ch) {
- s = CFStringCreateMutable(NULL, 0);
- // FIXME: is ISO Latin-1 the correct encoding?
- CFStringAppendCString(s, ch, kCFStringEncodingISOLatin1);
- } else {
- s = NULL;
- }
-}
-
-QString::~QString()
-{
- CFRelease(s);
-}
-
-QConstString::QConstString(QChar *qc, uint len)
-{
- if (qc || len) {
- // NOTE: use instead of CFStringCreateWithCharactersNoCopy function to
- // guarantee backing store is not copied even though string is mutable
- s = CFStringCreateMutableWithExternalCharactersNoCopy(NULL, &qc->c,
- len, len, kCFAllocatorNull);
- } else {
- s = NULL;
- }
-}
-
-const QString &QConstString::string() const
-{
- return *this;
-}
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/src/kwq/KWQChar.mm
similarity index 79%
copy from WebCore/kwq/KWQString.mm
copy to WebCore/src/kwq/KWQChar.mm
index a6372d1..ee53cca 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQChar.mm
@@ -25,10 +25,7 @@
// FIXME: obviously many functions here can be made inline
-// FIXME: should QChar and QConstString be in separate source files?
-
#include <qstring.h>
-#include <ctype.h>
static UniChar scratchUniChar;
@@ -86,27 +83,24 @@ QChar::QChar(const QChar &qc)
QChar::~QChar()
{
- // do nothing
+ // do nothing because the single data member is a UniChar
}
-QChar QChar::lower() const
+ushort QChar::unicode() const
{
- scratchUniChar = c;
- CFStringLowercase(GetScratchUniCharString(), NULL);
- if (scratchUniChar) {
- return QChar(scratchUniChar);
- }
- return *this;
+ return c;
}
-QChar QChar::upper() const
+uchar QChar::cell() const
{
- scratchUniChar = c;
- CFStringUppercase(GetScratchUniCharString(), NULL);
- if (scratchUniChar) {
- return QChar(scratchUniChar);
- }
- return *this;
+ // return least significant byte
+ return c & 0xff;
+}
+
+uchar QChar::row() const
+{
+ // return most significant byte
+ return (c & 0xff00) >> 8;
}
char QChar::latin1() const
@@ -114,26 +108,34 @@ char QChar::latin1() const
return row() ? 0 : cell();
}
-bool QChar::isNull() const
+QChar::operator char() const
{
- return c == 0;
+ return latin1();
}
-bool QChar::isDigit() const
+bool QChar::isNull() const
{
- return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
- kCFCharacterSetDecimalDigit), c);
+ return c == 0;
}
bool QChar::isSpace() const
{
+ // FIXME: should we use this optimization?
+#if 0
if (!row()) {
return isspace(c);
}
+#endif
return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
kCFCharacterSetWhitespaceAndNewline), c);
}
+bool QChar::isDigit() const
+{
+ return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
+ kCFCharacterSetDecimalDigit), c);
+}
+
bool QChar::isLetter() const
{
return CFCharacterSetIsCharacterMember(CFCharacterSetGetPredefined(
@@ -152,16 +154,24 @@ bool QChar::isPunct() const
kCFCharacterSetPunctuation), c);
}
-uchar QChar::cell() const
+QChar QChar::lower() const
{
- // return least significant byte
- return c & 0xff;
+ scratchUniChar = c;
+ CFStringLowercase(GetScratchUniCharString(), NULL);
+ if (scratchUniChar) {
+ return QChar(scratchUniChar);
+ }
+ return *this;
}
-uchar QChar::row() const
+QChar QChar::upper() const
{
- // return most significant byte
- return (c & 0xff00) >> 8;
+ scratchUniChar = c;
+ CFStringUppercase(GetScratchUniCharString(), NULL);
+ if (scratchUniChar) {
+ return QChar(scratchUniChar);
+ }
+ return *this;
}
QChar::Direction QChar::direction() const
@@ -185,11 +195,6 @@ QChar QChar::mirroredChar() const
return *this;
}
-ushort QChar::unicode() const
-{
- return c;
-}
-
int operator==(QChar qc1, QChar qc2)
{
return qc1.c == qc2.c;
@@ -219,62 +224,3 @@ int operator!=(char ch, QChar qc)
{
return ch != qc.c;
}
-
-QChar::operator char() const
-{
- return latin1();
-}
-
-QString::QString()
-{
- s = NULL;
-}
-
-QString::QString(QChar qc)
-{
- s = CFStringCreateMutable(NULL, 0);
- CFStringAppendCharacters(s, &qc.c, 1);
-}
-
-QString::QString(const QChar *qc, uint len)
-{
- if (qc || len) {
- s = CFStringCreateMutable(NULL, 0);
- CFStringAppendCharacters(s, &qc->c, len);
- } else {
- s = NULL;
- }
-}
-
-QString::QString(const char *ch)
-{
- if (ch) {
- s = CFStringCreateMutable(NULL, 0);
- // FIXME: is ISO Latin-1 the correct encoding?
- CFStringAppendCString(s, ch, kCFStringEncodingISOLatin1);
- } else {
- s = NULL;
- }
-}
-
-QString::~QString()
-{
- CFRelease(s);
-}
-
-QConstString::QConstString(QChar *qc, uint len)
-{
- if (qc || len) {
- // NOTE: use instead of CFStringCreateWithCharactersNoCopy function to
- // guarantee backing store is not copied even though string is mutable
- s = CFStringCreateMutableWithExternalCharactersNoCopy(NULL, &qc->c,
- len, len, kCFAllocatorNull);
- } else {
- s = NULL;
- }
-}
-
-const QString &QConstString::string() const
-{
- return *this;
-}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list