[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:48:15 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9c4c3ed2c829fb8e9e98171d5904251c6f564756
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 1 16:46:06 2001 +0000
Additions to this interface to support using borrowed KURL.
Also modified several interfaces to bring into line with with the "real"
QString has, due to the fact that the similar, but slightly different
interfaces caused some problems when the compiler tries to choose an
overloaded function.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@240 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 6108208..28a9ae9 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -150,6 +150,7 @@ public:
static QString number(long, int base=10);
static QString fromLatin1(const char *, int len=-1);
+ static QString fromLocal8Bit(const char *, int len=-1);
// constructors, copy constructors, and destructors ------------------------
@@ -173,6 +174,9 @@ public:
// member functions --------------------------------------------------------
+
+ QString copy() const;
+
bool isNull() const;
bool isEmpty() const;
uint length() const;
@@ -180,6 +184,7 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
+ ushort toUShort() const;
uint toUInt(bool *ok=0, int base=10) const;
long toLong(bool *ok=0, int base=10) const;
float toFloat(bool *b=0) const;
@@ -191,15 +196,19 @@ public:
int contains(const char *, bool cs=TRUE) const;
int contains(char) const;
- int find(char, int index=0) const;
- int find(const char *, int index=0, bool b=0) const;
- int find(const QString &, int index=0, bool b=0) const;
- int find(const QRegExp &, int index=0, bool b=0) const;
- int findRev(char, int index=0) const;
- int findRev(const char *, int index=0) const;
+ QChar at(uint) const;
+
+ int find(char, int index=0, bool cs=TRUE) const;
+ int find(QChar, int index=0, bool cs=TRUE) const;
+ int find(const QString &, int index=0, bool cs=TRUE) const;
+ int find(const QRegExp &, int index=0, bool cs=TRUE) const;
+ int findRev(char, int index=0, bool cs=TRUE) const;
+ int findRev(const char *, int index=0, bool cs=TRUE) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
+ QString &insert(uint, const QString &);
+ QString &insert(uint, QChar);
QString &insert(uint, char);
void truncate(uint pos);
void fill(QChar, int len=-1);
@@ -211,6 +220,8 @@ public:
QString right(uint) const;
QString mid(int, int len=0xffffffff) const;
+ int compare(const QString &) const;
+
const char *latin1() const;
const char *ascii() const;
const QChar *unicode() const;
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 70221cb..a42f8b1 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -170,6 +170,12 @@ QString &QString::operator=(char ch)
// member functions ------------------------------------------------------------
+QString QString::copy() const
+{
+ // FIXME: not yet implemented
+ return *this;
+}
+
uint QString::length() const
{
return s ? CFStringGetLength(s) : 0;
@@ -206,6 +212,12 @@ const QChar *QString::unicode() const
return reinterpret_cast<const QChar *>(ucs);
}
+QChar QString::at(uint) const
+{
+ // FIXME: not yet implemented
+ return QChar(0);
+}
+
const char *QString::latin1() const
{
char *chs = NULL;
@@ -268,6 +280,12 @@ bool QString::startsWith(const QString &) const
return FALSE;
}
+ushort QString::toUShort() const
+{
+ // FIXME: not yet implemented
+ return 0;
+}
+
int QString::toInt() const
{
// FIXME: not yet implemented
@@ -328,13 +346,13 @@ int QString::contains(char) const
return 0;
}
-int QString::find(char, int) const
+int QString::find(char, int, bool) const
{
// FIXME: not yet implemented
return 0;
}
-int QString::find(const char *, int, bool) const
+int QString::find(QChar, int, bool) const
{
// FIXME: not yet implemented
return 0;
@@ -352,13 +370,13 @@ int QString::find(const QRegExp &, int, bool) const
return 0;
}
-int QString::findRev(char, int) const
+int QString::findRev(char, int, bool) const
{
// FIXME: not yet implemented
return 0;
}
-int QString::findRev(const char *, int) const
+int QString::findRev(const char *, int, bool) const
{
// FIXME: not yet implemented
return 0;
@@ -382,6 +400,18 @@ QString &QString::insert(uint, char)
return *this;
}
+QString &QString::insert(uint, QChar)
+{
+ // FIXME: not yet implemented
+ return *this;
+}
+
+QString &QString::insert(uint, const QString &)
+{
+ // FIXME: not yet implemented
+ return *this;
+}
+
void QString::truncate(uint)
{
// FIXME: not yet implemented
@@ -422,12 +452,24 @@ QString QString::mid(int, int) const
return QString(*this);
}
+int QString::compare(const QString &) const
+{
+ // FIXME: not yet implemented
+ return 0;
+}
+
QString QString::fromLatin1(const char *, int)
{
// FIXME: not yet implemented
return QString();
}
+QString QString::fromLocal8Bit(const char *, int)
+{
+ // FIXME: not yet implemented
+ return QString();
+}
+
QCString QString::utf8() const
{
// FIXME: not yet implemented
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 6108208..28a9ae9 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -150,6 +150,7 @@ public:
static QString number(long, int base=10);
static QString fromLatin1(const char *, int len=-1);
+ static QString fromLocal8Bit(const char *, int len=-1);
// constructors, copy constructors, and destructors ------------------------
@@ -173,6 +174,9 @@ public:
// member functions --------------------------------------------------------
+
+ QString copy() const;
+
bool isNull() const;
bool isEmpty() const;
uint length() const;
@@ -180,6 +184,7 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
+ ushort toUShort() const;
uint toUInt(bool *ok=0, int base=10) const;
long toLong(bool *ok=0, int base=10) const;
float toFloat(bool *b=0) const;
@@ -191,15 +196,19 @@ public:
int contains(const char *, bool cs=TRUE) const;
int contains(char) const;
- int find(char, int index=0) const;
- int find(const char *, int index=0, bool b=0) const;
- int find(const QString &, int index=0, bool b=0) const;
- int find(const QRegExp &, int index=0, bool b=0) const;
- int findRev(char, int index=0) const;
- int findRev(const char *, int index=0) const;
+ QChar at(uint) const;
+
+ int find(char, int index=0, bool cs=TRUE) const;
+ int find(QChar, int index=0, bool cs=TRUE) const;
+ int find(const QString &, int index=0, bool cs=TRUE) const;
+ int find(const QRegExp &, int index=0, bool cs=TRUE) const;
+ int findRev(char, int index=0, bool cs=TRUE) const;
+ int findRev(const char *, int index=0, bool cs=TRUE) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
+ QString &insert(uint, const QString &);
+ QString &insert(uint, QChar);
QString &insert(uint, char);
void truncate(uint pos);
void fill(QChar, int len=-1);
@@ -211,6 +220,8 @@ public:
QString right(uint) const;
QString mid(int, int len=0xffffffff) const;
+ int compare(const QString &) const;
+
const char *latin1() const;
const char *ascii() const;
const QChar *unicode() const;
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index 70221cb..a42f8b1 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -170,6 +170,12 @@ QString &QString::operator=(char ch)
// member functions ------------------------------------------------------------
+QString QString::copy() const
+{
+ // FIXME: not yet implemented
+ return *this;
+}
+
uint QString::length() const
{
return s ? CFStringGetLength(s) : 0;
@@ -206,6 +212,12 @@ const QChar *QString::unicode() const
return reinterpret_cast<const QChar *>(ucs);
}
+QChar QString::at(uint) const
+{
+ // FIXME: not yet implemented
+ return QChar(0);
+}
+
const char *QString::latin1() const
{
char *chs = NULL;
@@ -268,6 +280,12 @@ bool QString::startsWith(const QString &) const
return FALSE;
}
+ushort QString::toUShort() const
+{
+ // FIXME: not yet implemented
+ return 0;
+}
+
int QString::toInt() const
{
// FIXME: not yet implemented
@@ -328,13 +346,13 @@ int QString::contains(char) const
return 0;
}
-int QString::find(char, int) const
+int QString::find(char, int, bool) const
{
// FIXME: not yet implemented
return 0;
}
-int QString::find(const char *, int, bool) const
+int QString::find(QChar, int, bool) const
{
// FIXME: not yet implemented
return 0;
@@ -352,13 +370,13 @@ int QString::find(const QRegExp &, int, bool) const
return 0;
}
-int QString::findRev(char, int) const
+int QString::findRev(char, int, bool) const
{
// FIXME: not yet implemented
return 0;
}
-int QString::findRev(const char *, int) const
+int QString::findRev(const char *, int, bool) const
{
// FIXME: not yet implemented
return 0;
@@ -382,6 +400,18 @@ QString &QString::insert(uint, char)
return *this;
}
+QString &QString::insert(uint, QChar)
+{
+ // FIXME: not yet implemented
+ return *this;
+}
+
+QString &QString::insert(uint, const QString &)
+{
+ // FIXME: not yet implemented
+ return *this;
+}
+
void QString::truncate(uint)
{
// FIXME: not yet implemented
@@ -422,12 +452,24 @@ QString QString::mid(int, int) const
return QString(*this);
}
+int QString::compare(const QString &) const
+{
+ // FIXME: not yet implemented
+ return 0;
+}
+
QString QString::fromLatin1(const char *, int)
{
// FIXME: not yet implemented
return QString();
}
+QString QString::fromLocal8Bit(const char *, int)
+{
+ // FIXME: not yet implemented
+ return QString();
+}
+
QCString QString::utf8() const
{
// FIXME: not yet implemented
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 6108208..28a9ae9 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -150,6 +150,7 @@ public:
static QString number(long, int base=10);
static QString fromLatin1(const char *, int len=-1);
+ static QString fromLocal8Bit(const char *, int len=-1);
// constructors, copy constructors, and destructors ------------------------
@@ -173,6 +174,9 @@ public:
// member functions --------------------------------------------------------
+
+ QString copy() const;
+
bool isNull() const;
bool isEmpty() const;
uint length() const;
@@ -180,6 +184,7 @@ public:
int toInt() const;
int toInt(bool *, int base=10) const;
+ ushort toUShort() const;
uint toUInt(bool *ok=0, int base=10) const;
long toLong(bool *ok=0, int base=10) const;
float toFloat(bool *b=0) const;
@@ -191,15 +196,19 @@ public:
int contains(const char *, bool cs=TRUE) const;
int contains(char) const;
- int find(char, int index=0) const;
- int find(const char *, int index=0, bool b=0) const;
- int find(const QString &, int index=0, bool b=0) const;
- int find(const QRegExp &, int index=0, bool b=0) const;
- int findRev(char, int index=0) const;
- int findRev(const char *, int index=0) const;
+ QChar at(uint) const;
+
+ int find(char, int index=0, bool cs=TRUE) const;
+ int find(QChar, int index=0, bool cs=TRUE) const;
+ int find(const QString &, int index=0, bool cs=TRUE) const;
+ int find(const QRegExp &, int index=0, bool cs=TRUE) const;
+ int findRev(char, int index=0, bool cs=TRUE) const;
+ int findRev(const char *, int index=0, bool cs=TRUE) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
+ QString &insert(uint, const QString &);
+ QString &insert(uint, QChar);
QString &insert(uint, char);
void truncate(uint pos);
void fill(QChar, int len=-1);
@@ -211,6 +220,8 @@ public:
QString right(uint) const;
QString mid(int, int len=0xffffffff) const;
+ int compare(const QString &) const;
+
const char *latin1() const;
const char *ascii() const;
const QChar *unicode() const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list