[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:49:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1952e29232cd5f579c1c0f9769159a59a79beb5e
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 5 02:12:50 2001 +0000
Still more implementation
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index d5b64c6..f05acd8 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -242,20 +242,18 @@ public:
QString &sprintf(const char *, ...);
QString &prepend(const QString &);
- QString &append(const char *);
QString &append(const QString &);
-
- QString &remove(uint, uint);
- QString &replace(const QRegExp &, const QString &);
QString &insert(uint, const QString &);
QString &insert(uint, QChar);
QString &insert(uint, char);
+ QString &remove(uint, uint);
+ QString &replace(const QRegExp &, const QString &);
- void truncate(uint pos);
+ void truncate(uint);
void fill(QChar, int len=-1);
void compose();
- QString visual(int index=0, int len=-1);
+ QString visual();
// operators ---------------------------------------------------------------
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index c460200..9ce6c34 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -25,9 +25,7 @@
// FIXME: obviously many functions here can be made inline
-//#ifdef _KWQ_DEBUG_
#include <Foundation/Foundation.h>
-//#endif
#include <qstring.h>
#include <qregexp.h>
#include <stdio.h>
@@ -695,17 +693,17 @@ float QString::toFloat(bool *ok) const
QString QString::arg(const QString &replacement, int padding) const
{
- QString modified(*this);
- if (!modified.s) {
- modified.s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
}
- if (modified.s) {
+ if (qs.s) {
CFIndex pos = 0;
UniChar found = 0;
- CFIndex len = CFStringGetLength(modified.s);
+ CFIndex len = CFStringGetLength(qs.s);
if (len) {
CFStringInlineBuffer buf;
- CFStringInitInlineBuffer(modified.s, &buf, CFRangeMake(0, len));
+ CFStringInitInlineBuffer(qs.s, &buf, CFRangeMake(0, len));
// find position of lowest numerical position marker
for (CFIndex i = 0; i < len; i++) {
UniChar uc = CFStringGetCharacterFromInlineBuffer(&buf, i);
@@ -726,16 +724,16 @@ QString QString::arg(const QString &replacement, int padding) const
rlen = 2;
} else {
// append space and then replacement text at end of string
- CFStringAppend(modified.s, CFSTR(" "));
+ CFStringAppend(qs.s, CFSTR(" "));
pos = len + 1;
rlen = 0;
}
if (replacement.s) {
- CFStringReplace(modified.s, CFRangeMake(pos, rlen), replacement.s);
+ CFStringReplace(qs.s, CFRangeMake(pos, rlen), replacement.s);
if (padding) {
- CFMutableStringRef p =
+ CFMutableStringRef tmp =
CFStringCreateMutable(kCFAllocatorDefault, 0);
- if (p) {
+ if (tmp) {
CFIndex plen;
if (padding < 0) {
plen = -padding;
@@ -743,14 +741,14 @@ QString QString::arg(const QString &replacement, int padding) const
} else {
plen = padding;
}
- CFStringPad(p, CFSTR(" "), plen, 0);
- CFStringInsert(modified.s, pos, p);
- CFRelease(p);
+ CFStringPad(tmp, CFSTR(" "), plen, 0);
+ CFStringInsert(qs.s, pos, tmp);
+ CFRelease(tmp);
}
}
}
}
- return modified;
+ return qs;
}
QString QString::arg(int replacement, int padding) const
@@ -758,28 +756,76 @@ QString QString::arg(int replacement, int padding) const
return arg(number(replacement), padding);
}
-QString QString::left(uint) const
+QString QString::left(uint width) const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s) {
+ CFIndex len = CFStringGetLength(s);
+ if (len && width) {
+ if (len > width) {
+ CFStringRef tmp = CFStringCreateWithSubstring(
+ kCFAllocatorDefault, s, CFRangeMake(0, width));
+ if (tmp) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
+ tmp);
+ CFRelease(tmp);
+ }
+ } else {
+ CFRetain(s);
+ qs.s = s;
+ }
+ }
+ }
+ return qs;
}
-QString QString::right(uint) const
+QString QString::right(uint width) const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s) {
+ CFIndex len = CFStringGetLength(s);
+ if (len && width) {
+ if (len > width) {
+ CFStringRef tmp = CFStringCreateWithSubstring(
+ kCFAllocatorDefault, s, CFRangeMake(len - width, len));
+ if (tmp) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
+ tmp);
+ CFRelease(tmp);
+ }
+ } else {
+ CFRetain(s);
+ qs.s = s;
+ }
+ }
+ }
+ return qs;
}
-QString QString::mid(int, int) const
+QString QString::mid(int index, int width) const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s) {
+ CFIndex len = CFStringGetLength(s);
+ if (len && (index >= 0) && (index < len) && width) {
+ if (!((index == 0) && (width >= len))) {
+ if (width > (len - index)) {
+ width = len - index;
+ }
+ CFStringRef tmp = CFStringCreateWithSubstring(
+ kCFAllocatorDefault, s, CFRangeMake(index, width));
+ if (tmp) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
+ tmp);
+ CFRelease(tmp);
+ }
+ } else {
+ CFRetain(s);
+ qs.s = s;
+ }
+ }
+ }
+ return qs;
}
#ifdef USING_BORROWED_KURL
@@ -791,34 +837,82 @@ QString QString::copy() const
QString QString::lower() const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+ }
+ if (qs.s) {
+ CFStringLowercase(qs.s, NULL);
+ }
+ return qs;
}
QString QString::stripWhiteSpace() const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+ }
+ if (qs.s) {
+ CFStringTrimWhitespace(qs.s);
+ }
+ return qs;
}
QString QString::simplifyWhiteSpace() const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+ }
+ if (qs.s) {
+ CFStringTrimWhitespace(qs.s);
+ CFCharacterSetRef wscs = CFCharacterSetGetPredefined(
+ kCFCharacterSetWhitespaceAndNewline);
+ CFIndex pos = 0;
+ CFIndex len = CFStringGetLength(qs.s);
+ while (pos < len) {
+ if (CFCharacterSetIsCharacterMember(wscs,
+ CFStringGetCharacterAtIndex(s, pos))) {
+ CFIndex pos2;
+ for (pos2 = pos + 1; pos2 < len; pos2++) {
+ if (!CFCharacterSetIsCharacterMember(wscs,
+ CFStringGetCharacterAtIndex(s, pos2))) {
+ break;
+ }
+ }
+ CFStringReplace(qs.s, CFRangeMake(pos, pos2 - pos), CFSTR(" "));
+ pos = pos2;
+ len = CFStringGetLength(qs.s);
+ } else {
+ pos++;
+ }
+ }
+ }
+ return qs;
}
-QString &QString::setUnicode(const QChar *, uint)
+QString &QString::setUnicode(const QChar *qcs, uint len)
{
flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
+ if (!s && len) {
+ s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+ }
+ if (s) {
+ if (len) {
+ if (qcs) {
+ CFStringRef tmp = CFStringCreateWithCharactersNoCopy(
+ kCFAllocatorDefault, &qcs->c, len, kCFAllocatorNull);
+ if (tmp) {
+ CFStringReplaceAll(s, tmp);
+ CFRelease(tmp);
+ }
+ }
+ } else {
+ CFRelease(s);
+ s = NULL;
+ }
+ }
return *this;
}
@@ -837,7 +931,7 @@ QString &QString::setNum(int n)
kCFAllocatorDefault, buf, kCFStringEncodingISOLatin1,
kCFAllocatorDefault);
if (tmp) {
- CFStringReplace(s, CFRangeMake(0, CFStringGetLength(s)), tmp);
+ CFStringReplaceAll(s, tmp);
CFRelease(tmp);
}
}
@@ -853,34 +947,17 @@ QString &QString::sprintf(const char *, ...)
return *this;
}
-QString &QString::prepend(const QString &)
+QString &QString::prepend(const QString &qs)
{
- flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return *this;
+ return insert(0, qs);
}
-QString &QString::append(const char *)
+QString &QString::append(const QString &qs)
{
- flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return *this;
+ return operator+=(qs);
}
-QString &QString::append(const QString &)
-{
- flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return *this;
-}
-
-QString &QString::remove(uint, uint)
+QString &QString::insert(uint, const QString &)
{
flushCache();
// FIXME: not yet implemented
@@ -889,7 +966,7 @@ QString &QString::remove(uint, uint)
return *this;
}
-QString &QString::replace(const QRegExp &, const QString &)
+QString &QString::insert(uint, QChar)
{
flushCache();
// FIXME: not yet implemented
@@ -907,7 +984,7 @@ QString &QString::insert(uint, char)
return *this;
}
-QString &QString::insert(uint, QChar)
+QString &QString::remove(uint, uint)
{
flushCache();
// FIXME: not yet implemented
@@ -916,7 +993,7 @@ QString &QString::insert(uint, QChar)
return *this;
}
-QString &QString::insert(uint, const QString &)
+QString &QString::replace(const QRegExp &, const QString &)
{
flushCache();
// FIXME: not yet implemented
@@ -948,12 +1025,12 @@ void QString::compose()
__LINE__);
}
-QString QString::visual(int index, int len)
+QString QString::visual()
{
// FIXME: unimplemented because we don't do BIDI yet
NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
__LINE__);
- return mid(index, len);
+ return QString(*this);
}
// operators -------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index d5b64c6..f05acd8 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -242,20 +242,18 @@ public:
QString &sprintf(const char *, ...);
QString &prepend(const QString &);
- QString &append(const char *);
QString &append(const QString &);
-
- QString &remove(uint, uint);
- QString &replace(const QRegExp &, const QString &);
QString &insert(uint, const QString &);
QString &insert(uint, QChar);
QString &insert(uint, char);
+ QString &remove(uint, uint);
+ QString &replace(const QRegExp &, const QString &);
- void truncate(uint pos);
+ void truncate(uint);
void fill(QChar, int len=-1);
void compose();
- QString visual(int index=0, int len=-1);
+ QString visual();
// operators ---------------------------------------------------------------
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index c460200..9ce6c34 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -25,9 +25,7 @@
// FIXME: obviously many functions here can be made inline
-//#ifdef _KWQ_DEBUG_
#include <Foundation/Foundation.h>
-//#endif
#include <qstring.h>
#include <qregexp.h>
#include <stdio.h>
@@ -695,17 +693,17 @@ float QString::toFloat(bool *ok) const
QString QString::arg(const QString &replacement, int padding) const
{
- QString modified(*this);
- if (!modified.s) {
- modified.s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
}
- if (modified.s) {
+ if (qs.s) {
CFIndex pos = 0;
UniChar found = 0;
- CFIndex len = CFStringGetLength(modified.s);
+ CFIndex len = CFStringGetLength(qs.s);
if (len) {
CFStringInlineBuffer buf;
- CFStringInitInlineBuffer(modified.s, &buf, CFRangeMake(0, len));
+ CFStringInitInlineBuffer(qs.s, &buf, CFRangeMake(0, len));
// find position of lowest numerical position marker
for (CFIndex i = 0; i < len; i++) {
UniChar uc = CFStringGetCharacterFromInlineBuffer(&buf, i);
@@ -726,16 +724,16 @@ QString QString::arg(const QString &replacement, int padding) const
rlen = 2;
} else {
// append space and then replacement text at end of string
- CFStringAppend(modified.s, CFSTR(" "));
+ CFStringAppend(qs.s, CFSTR(" "));
pos = len + 1;
rlen = 0;
}
if (replacement.s) {
- CFStringReplace(modified.s, CFRangeMake(pos, rlen), replacement.s);
+ CFStringReplace(qs.s, CFRangeMake(pos, rlen), replacement.s);
if (padding) {
- CFMutableStringRef p =
+ CFMutableStringRef tmp =
CFStringCreateMutable(kCFAllocatorDefault, 0);
- if (p) {
+ if (tmp) {
CFIndex plen;
if (padding < 0) {
plen = -padding;
@@ -743,14 +741,14 @@ QString QString::arg(const QString &replacement, int padding) const
} else {
plen = padding;
}
- CFStringPad(p, CFSTR(" "), plen, 0);
- CFStringInsert(modified.s, pos, p);
- CFRelease(p);
+ CFStringPad(tmp, CFSTR(" "), plen, 0);
+ CFStringInsert(qs.s, pos, tmp);
+ CFRelease(tmp);
}
}
}
}
- return modified;
+ return qs;
}
QString QString::arg(int replacement, int padding) const
@@ -758,28 +756,76 @@ QString QString::arg(int replacement, int padding) const
return arg(number(replacement), padding);
}
-QString QString::left(uint) const
+QString QString::left(uint width) const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s) {
+ CFIndex len = CFStringGetLength(s);
+ if (len && width) {
+ if (len > width) {
+ CFStringRef tmp = CFStringCreateWithSubstring(
+ kCFAllocatorDefault, s, CFRangeMake(0, width));
+ if (tmp) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
+ tmp);
+ CFRelease(tmp);
+ }
+ } else {
+ CFRetain(s);
+ qs.s = s;
+ }
+ }
+ }
+ return qs;
}
-QString QString::right(uint) const
+QString QString::right(uint width) const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s) {
+ CFIndex len = CFStringGetLength(s);
+ if (len && width) {
+ if (len > width) {
+ CFStringRef tmp = CFStringCreateWithSubstring(
+ kCFAllocatorDefault, s, CFRangeMake(len - width, len));
+ if (tmp) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
+ tmp);
+ CFRelease(tmp);
+ }
+ } else {
+ CFRetain(s);
+ qs.s = s;
+ }
+ }
+ }
+ return qs;
}
-QString QString::mid(int, int) const
+QString QString::mid(int index, int width) const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s) {
+ CFIndex len = CFStringGetLength(s);
+ if (len && (index >= 0) && (index < len) && width) {
+ if (!((index == 0) && (width >= len))) {
+ if (width > (len - index)) {
+ width = len - index;
+ }
+ CFStringRef tmp = CFStringCreateWithSubstring(
+ kCFAllocatorDefault, s, CFRangeMake(index, width));
+ if (tmp) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0,
+ tmp);
+ CFRelease(tmp);
+ }
+ } else {
+ CFRetain(s);
+ qs.s = s;
+ }
+ }
+ }
+ return qs;
}
#ifdef USING_BORROWED_KURL
@@ -791,34 +837,82 @@ QString QString::copy() const
QString QString::lower() const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+ }
+ if (qs.s) {
+ CFStringLowercase(qs.s, NULL);
+ }
+ return qs;
}
QString QString::stripWhiteSpace() const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+ }
+ if (qs.s) {
+ CFStringTrimWhitespace(qs.s);
+ }
+ return qs;
}
QString QString::simplifyWhiteSpace() const
{
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return QString(*this);
+ QString qs;
+ if (s && CFStringGetLength(s)) {
+ qs.s = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, s);
+ }
+ if (qs.s) {
+ CFStringTrimWhitespace(qs.s);
+ CFCharacterSetRef wscs = CFCharacterSetGetPredefined(
+ kCFCharacterSetWhitespaceAndNewline);
+ CFIndex pos = 0;
+ CFIndex len = CFStringGetLength(qs.s);
+ while (pos < len) {
+ if (CFCharacterSetIsCharacterMember(wscs,
+ CFStringGetCharacterAtIndex(s, pos))) {
+ CFIndex pos2;
+ for (pos2 = pos + 1; pos2 < len; pos2++) {
+ if (!CFCharacterSetIsCharacterMember(wscs,
+ CFStringGetCharacterAtIndex(s, pos2))) {
+ break;
+ }
+ }
+ CFStringReplace(qs.s, CFRangeMake(pos, pos2 - pos), CFSTR(" "));
+ pos = pos2;
+ len = CFStringGetLength(qs.s);
+ } else {
+ pos++;
+ }
+ }
+ }
+ return qs;
}
-QString &QString::setUnicode(const QChar *, uint)
+QString &QString::setUnicode(const QChar *qcs, uint len)
{
flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
+ if (!s && len) {
+ s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+ }
+ if (s) {
+ if (len) {
+ if (qcs) {
+ CFStringRef tmp = CFStringCreateWithCharactersNoCopy(
+ kCFAllocatorDefault, &qcs->c, len, kCFAllocatorNull);
+ if (tmp) {
+ CFStringReplaceAll(s, tmp);
+ CFRelease(tmp);
+ }
+ }
+ } else {
+ CFRelease(s);
+ s = NULL;
+ }
+ }
return *this;
}
@@ -837,7 +931,7 @@ QString &QString::setNum(int n)
kCFAllocatorDefault, buf, kCFStringEncodingISOLatin1,
kCFAllocatorDefault);
if (tmp) {
- CFStringReplace(s, CFRangeMake(0, CFStringGetLength(s)), tmp);
+ CFStringReplaceAll(s, tmp);
CFRelease(tmp);
}
}
@@ -853,34 +947,17 @@ QString &QString::sprintf(const char *, ...)
return *this;
}
-QString &QString::prepend(const QString &)
+QString &QString::prepend(const QString &qs)
{
- flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return *this;
+ return insert(0, qs);
}
-QString &QString::append(const char *)
+QString &QString::append(const QString &qs)
{
- flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return *this;
+ return operator+=(qs);
}
-QString &QString::append(const QString &)
-{
- flushCache();
- // FIXME: not yet implemented
- NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
- __LINE__);
- return *this;
-}
-
-QString &QString::remove(uint, uint)
+QString &QString::insert(uint, const QString &)
{
flushCache();
// FIXME: not yet implemented
@@ -889,7 +966,7 @@ QString &QString::remove(uint, uint)
return *this;
}
-QString &QString::replace(const QRegExp &, const QString &)
+QString &QString::insert(uint, QChar)
{
flushCache();
// FIXME: not yet implemented
@@ -907,7 +984,7 @@ QString &QString::insert(uint, char)
return *this;
}
-QString &QString::insert(uint, QChar)
+QString &QString::remove(uint, uint)
{
flushCache();
// FIXME: not yet implemented
@@ -916,7 +993,7 @@ QString &QString::insert(uint, QChar)
return *this;
}
-QString &QString::insert(uint, const QString &)
+QString &QString::replace(const QRegExp &, const QString &)
{
flushCache();
// FIXME: not yet implemented
@@ -948,12 +1025,12 @@ void QString::compose()
__LINE__);
}
-QString QString::visual(int index, int len)
+QString QString::visual()
{
// FIXME: unimplemented because we don't do BIDI yet
NSLog(@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__,
__LINE__);
- return mid(index, len);
+ return QString(*this);
}
// operators -------------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index d5b64c6..f05acd8 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -242,20 +242,18 @@ public:
QString &sprintf(const char *, ...);
QString &prepend(const QString &);
- QString &append(const char *);
QString &append(const QString &);
-
- QString &remove(uint, uint);
- QString &replace(const QRegExp &, const QString &);
QString &insert(uint, const QString &);
QString &insert(uint, QChar);
QString &insert(uint, char);
+ QString &remove(uint, uint);
+ QString &replace(const QRegExp &, const QString &);
- void truncate(uint pos);
+ void truncate(uint);
void fill(QChar, int len=-1);
void compose();
- QString visual(int index=0, int len=-1);
+ QString visual();
// operators ---------------------------------------------------------------
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list