[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:51 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6e00c5691dbe1e2da9f876e2531626613dc61850
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 6 01:51:24 2001 +0000
Fun with operator+
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 527190c..9648643 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -316,14 +316,6 @@ private:
friend bool operator==(const QString &, const char *);
friend bool operator==(const char *, const QString &);
- friend bool operator!=(const QString &, const QString &);
- friend bool operator!=(const QString &, const char *);
- friend bool operator!=(const char *, const QString &);
-
- friend QString operator+(const QString &, const QString &);
- friend QString operator+(const QString &, const char *);
- friend QString operator+(const char *, const QString &);
-
friend class QConstString;
friend class QGDict;
@@ -342,7 +334,11 @@ bool operator!=(const char *, const QString &);
QString operator+(const QString &, const QString &);
QString operator+(const QString &, const char *);
+QString operator+(const QString &, QChar);
+QString operator+(const QString &, char);
QString operator+(const char *, const QString &);
+QString operator+(QChar, const QString &);
+QString operator+(char, const QString &);
// class QConstString ==========================================================
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 3a86ea5..b3066de 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -188,7 +188,6 @@ QString::QString(const char *chs)
if (chs && *chs) {
s = CFStringCreateMutable(kCFAllocatorDefault, 0);
if (s) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringAppendCString(s, chs, kCFStringEncodingISOLatin1);
}
} else {
@@ -295,7 +294,6 @@ const char *QString::latin1() const
char *chs = NULL;
uint len = length();
if (len) {
- // FIXME: is ISO Latin-1 the correct encoding?
chs = const_cast<char *>(CFStringGetCStringPtr(s,
kCFStringEncodingISOLatin1));
if (!chs) {
@@ -307,7 +305,6 @@ const char *QString::latin1() const
flushCache();
cache = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
if (cache) {
- // FIXME: is ISO Latin-1 the correct encoding?
if (!CFStringGetCString(s, cache, len + 1,
kCFStringEncodingISOLatin1)) {
#ifdef _KWQ_DEBUG_
@@ -436,7 +433,6 @@ int QString::find(const char *chs, int index, bool cs) const
index += len;
}
if (len && (index >= 0) && (index < len)) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -497,7 +493,6 @@ int QString::findRev(const char *chs, int index) const
index += len;
}
if (len && (index <= len)) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -536,7 +531,6 @@ int QString::contains(const char *chs, bool cs) const
{
int c = 0;
if (s && chs) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -1348,7 +1342,6 @@ bool operator==(const QString &qs, const char *chs)
{
bool result = FALSE;
if (qs.s && chs) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -1394,6 +1387,22 @@ QString operator+(const QString &qs, const char *chs)
return tmp;
}
+QString operator+(const QString &qs, QChar qc)
+{
+ QString tmp(qs);
+ QString tmp2 = QString(qc);
+ tmp += tmp2;
+ return tmp;
+}
+
+QString operator+(const QString &qs, char ch)
+{
+ QString tmp(qs);
+ QString tmp2 = QString(QChar(ch));
+ tmp += tmp2;
+ return tmp;
+}
+
QString operator+(const char *chs, const QString &qs)
{
QString tmp(chs);
@@ -1401,6 +1410,20 @@ QString operator+(const char *chs, const QString &qs)
return tmp;
}
+QString operator+(QChar qc, const QString &qs)
+{
+ QString tmp = QString(qc);
+ tmp += qs;
+ return tmp;
+}
+
+QString operator+(char ch, const QString &qs)
+{
+ QString tmp = QString(QChar(ch));
+ tmp += qs;
+ return tmp;
+}
+
// class QConstString ==========================================================
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 527190c..9648643 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -316,14 +316,6 @@ private:
friend bool operator==(const QString &, const char *);
friend bool operator==(const char *, const QString &);
- friend bool operator!=(const QString &, const QString &);
- friend bool operator!=(const QString &, const char *);
- friend bool operator!=(const char *, const QString &);
-
- friend QString operator+(const QString &, const QString &);
- friend QString operator+(const QString &, const char *);
- friend QString operator+(const char *, const QString &);
-
friend class QConstString;
friend class QGDict;
@@ -342,7 +334,11 @@ bool operator!=(const char *, const QString &);
QString operator+(const QString &, const QString &);
QString operator+(const QString &, const char *);
+QString operator+(const QString &, QChar);
+QString operator+(const QString &, char);
QString operator+(const char *, const QString &);
+QString operator+(QChar, const QString &);
+QString operator+(char, const QString &);
// class QConstString ==========================================================
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 3a86ea5..b3066de 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -188,7 +188,6 @@ QString::QString(const char *chs)
if (chs && *chs) {
s = CFStringCreateMutable(kCFAllocatorDefault, 0);
if (s) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringAppendCString(s, chs, kCFStringEncodingISOLatin1);
}
} else {
@@ -295,7 +294,6 @@ const char *QString::latin1() const
char *chs = NULL;
uint len = length();
if (len) {
- // FIXME: is ISO Latin-1 the correct encoding?
chs = const_cast<char *>(CFStringGetCStringPtr(s,
kCFStringEncodingISOLatin1));
if (!chs) {
@@ -307,7 +305,6 @@ const char *QString::latin1() const
flushCache();
cache = CFAllocatorAllocate(kCFAllocatorDefault, len + 1, 0);
if (cache) {
- // FIXME: is ISO Latin-1 the correct encoding?
if (!CFStringGetCString(s, cache, len + 1,
kCFStringEncodingISOLatin1)) {
#ifdef _KWQ_DEBUG_
@@ -436,7 +433,6 @@ int QString::find(const char *chs, int index, bool cs) const
index += len;
}
if (len && (index >= 0) && (index < len)) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -497,7 +493,6 @@ int QString::findRev(const char *chs, int index) const
index += len;
}
if (len && (index <= len)) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -536,7 +531,6 @@ int QString::contains(const char *chs, bool cs) const
{
int c = 0;
if (s && chs) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -1348,7 +1342,6 @@ bool operator==(const QString &qs, const char *chs)
{
bool result = FALSE;
if (qs.s && chs) {
- // FIXME: is ISO Latin-1 the correct encoding?
CFStringRef tmp = CFStringCreateWithCStringNoCopy(
kCFAllocatorDefault, chs, kCFStringEncodingISOLatin1,
kCFAllocatorNull);
@@ -1394,6 +1387,22 @@ QString operator+(const QString &qs, const char *chs)
return tmp;
}
+QString operator+(const QString &qs, QChar qc)
+{
+ QString tmp(qs);
+ QString tmp2 = QString(qc);
+ tmp += tmp2;
+ return tmp;
+}
+
+QString operator+(const QString &qs, char ch)
+{
+ QString tmp(qs);
+ QString tmp2 = QString(QChar(ch));
+ tmp += tmp2;
+ return tmp;
+}
+
QString operator+(const char *chs, const QString &qs)
{
QString tmp(chs);
@@ -1401,6 +1410,20 @@ QString operator+(const char *chs, const QString &qs)
return tmp;
}
+QString operator+(QChar qc, const QString &qs)
+{
+ QString tmp = QString(qc);
+ tmp += qs;
+ return tmp;
+}
+
+QString operator+(char ch, const QString &qs)
+{
+ QString tmp = QString(QChar(ch));
+ tmp += qs;
+ return tmp;
+}
+
// class QConstString ==========================================================
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 527190c..9648643 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -316,14 +316,6 @@ private:
friend bool operator==(const QString &, const char *);
friend bool operator==(const char *, const QString &);
- friend bool operator!=(const QString &, const QString &);
- friend bool operator!=(const QString &, const char *);
- friend bool operator!=(const char *, const QString &);
-
- friend QString operator+(const QString &, const QString &);
- friend QString operator+(const QString &, const char *);
- friend QString operator+(const char *, const QString &);
-
friend class QConstString;
friend class QGDict;
@@ -342,7 +334,11 @@ bool operator!=(const char *, const QString &);
QString operator+(const QString &, const QString &);
QString operator+(const QString &, const char *);
+QString operator+(const QString &, QChar);
+QString operator+(const QString &, char);
QString operator+(const char *, const QString &);
+QString operator+(QChar, const QString &);
+QString operator+(char, const QString &);
// class QConstString ==========================================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list