[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:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 992a7e645e7d5a6f3e11815eea93a0565f24ee5d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 1 18:02:19 2001 +0000
Moved some functions and their definitions, and marked them as only
needed when compiling with USING_BORROWED_KURL
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@242 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 28a9ae9..1c5d08a 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -150,7 +150,9 @@ public:
static QString number(long, int base=10);
static QString fromLatin1(const char *, int len=-1);
+#ifdef USING_BORROWED_KURL
static QString fromLocal8Bit(const char *, int len=-1);
+#endif
// constructors, copy constructors, and destructors ------------------------
@@ -175,7 +177,11 @@ public:
// member functions --------------------------------------------------------
+#ifdef USING_BORROWED_KURL
QString copy() const;
+ ushort toUShort() const;
+ QChar at(uint) const;
+#endif
bool isNull() const;
bool isEmpty() const;
@@ -184,7 +190,6 @@ 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;
@@ -195,8 +200,6 @@ public:
int contains(const char *, bool cs=TRUE) const;
int contains(char) 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;
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index a42f8b1..2555821 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -34,6 +34,7 @@
// constants -------------------------------------------------------------------
+const QChar QChar::null;
const QString QString::null;
// constructors, copy constructors, and destructors ----------------------------
@@ -170,11 +171,28 @@ QString &QString::operator=(char ch)
// member functions ------------------------------------------------------------
+#ifdef USING_BORROWED_KURL
QString QString::copy() const
{
// FIXME: not yet implemented
return *this;
}
+ushort QString::toUShort() const
+{
+ // FIXME: not yet implemented
+ return 0;
+}
+QChar QString::at(uint) const
+{
+ // FIXME: not yet implemented
+ return QChar(0);
+}
+QString QString::fromLocal8Bit(const char *, int)
+{
+ // FIXME: not yet implemented
+ return QString();
+}
+#endif // USING_BORROWED_KURL
uint QString::length() const
{
@@ -212,12 +230,6 @@ 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;
@@ -280,12 +292,6 @@ 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
@@ -464,12 +470,6 @@ QString QString::fromLatin1(const char *, int)
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 28a9ae9..1c5d08a 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -150,7 +150,9 @@ public:
static QString number(long, int base=10);
static QString fromLatin1(const char *, int len=-1);
+#ifdef USING_BORROWED_KURL
static QString fromLocal8Bit(const char *, int len=-1);
+#endif
// constructors, copy constructors, and destructors ------------------------
@@ -175,7 +177,11 @@ public:
// member functions --------------------------------------------------------
+#ifdef USING_BORROWED_KURL
QString copy() const;
+ ushort toUShort() const;
+ QChar at(uint) const;
+#endif
bool isNull() const;
bool isEmpty() const;
@@ -184,7 +190,6 @@ 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;
@@ -195,8 +200,6 @@ public:
int contains(const char *, bool cs=TRUE) const;
int contains(char) 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;
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index a42f8b1..2555821 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -34,6 +34,7 @@
// constants -------------------------------------------------------------------
+const QChar QChar::null;
const QString QString::null;
// constructors, copy constructors, and destructors ----------------------------
@@ -170,11 +171,28 @@ QString &QString::operator=(char ch)
// member functions ------------------------------------------------------------
+#ifdef USING_BORROWED_KURL
QString QString::copy() const
{
// FIXME: not yet implemented
return *this;
}
+ushort QString::toUShort() const
+{
+ // FIXME: not yet implemented
+ return 0;
+}
+QChar QString::at(uint) const
+{
+ // FIXME: not yet implemented
+ return QChar(0);
+}
+QString QString::fromLocal8Bit(const char *, int)
+{
+ // FIXME: not yet implemented
+ return QString();
+}
+#endif // USING_BORROWED_KURL
uint QString::length() const
{
@@ -212,12 +230,6 @@ 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;
@@ -280,12 +292,6 @@ 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
@@ -464,12 +470,6 @@ QString QString::fromLatin1(const char *, int)
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 28a9ae9..1c5d08a 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -150,7 +150,9 @@ public:
static QString number(long, int base=10);
static QString fromLatin1(const char *, int len=-1);
+#ifdef USING_BORROWED_KURL
static QString fromLocal8Bit(const char *, int len=-1);
+#endif
// constructors, copy constructors, and destructors ------------------------
@@ -175,7 +177,11 @@ public:
// member functions --------------------------------------------------------
+#ifdef USING_BORROWED_KURL
QString copy() const;
+ ushort toUShort() const;
+ QChar at(uint) const;
+#endif
bool isNull() const;
bool isEmpty() const;
@@ -184,7 +190,6 @@ 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;
@@ -195,8 +200,6 @@ public:
int contains(const char *, bool cs=TRUE) const;
int contains(char) 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;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list