[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:42:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0bdef0626e0382cdb0eb69fa7274c55e1e352476
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 18:27:34 2001 +0000
Fixes for khtml/html, specifically html_formimpl.cpp
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 4dd3592..8fd4e10 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -18,6 +18,7 @@ include $(TOPSRCDIR)/Makefile.vars
SUBDIRS = \
src/kdelibs/kjs \
+ src/kdelibs/kdecore \
src/kdelibs/khtml/misc \
src/kdelibs/khtml/css \
src/kdelibs/khtml/dom \
diff --git a/WebCore/Makefile.vars.in b/WebCore/Makefile.vars.in
index e245795..33e4396 100644
--- a/WebCore/Makefile.vars.in
+++ b/WebCore/Makefile.vars.in
@@ -35,6 +35,7 @@ YACC = @YACC@
RANLIB = @RANLIB@
SED = @SED@
INSTALL = @INSTALL@
+GPERF = gperf
#----------------------------------------------------------------------
# Flags
diff --git a/WebCore/configure b/WebCore/configure
index 28b59e1..4842d30 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -2448,6 +2448,7 @@ trap 'rm -fr `echo "Makefile
Makefile.vars
Makefile.rules
src/kdelibs/kjs/Makefile
+ src/kdelibs/kdecore/Makefile
src/kdelibs/khtml/misc/Makefile
src/kdelibs/khtml/css/Makefile
src/kdelibs/khtml/dom/Makefile
@@ -2555,6 +2556,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
Makefile.vars
Makefile.rules
src/kdelibs/kjs/Makefile
+ src/kdelibs/kdecore/Makefile
src/kdelibs/khtml/misc/Makefile
src/kdelibs/khtml/css/Makefile
src/kdelibs/khtml/dom/Makefile
diff --git a/WebCore/configure.in b/WebCore/configure.in
index 944136e..43a8c21 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -192,6 +192,7 @@ AC_OUTPUT(
Makefile.vars
Makefile.rules
src/kdelibs/kjs/Makefile
+ src/kdelibs/kdecore/Makefile
src/kdelibs/khtml/misc/Makefile
src/kdelibs/khtml/css/Makefile
src/kdelibs/khtml/dom/Makefile
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 42c6474..6845c2b 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -35,7 +35,13 @@ class QChar {
public:
QChar();
QChar(char);
+ QChar(uchar);
QChar(const QChar &);
+ QChar(ushort);
+ QChar(short);
+ QChar(uint);
+ QChar(int);
+
QChar lower() const;
QChar upper() const;
char latin1() const;
@@ -46,6 +52,7 @@ public:
bool isLetterOrNumber() const;
uchar cell() const;
uchar row() const;
+ friend inline int operator==(char, QChar);
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
friend inline int operator!=(QChar, QChar);
@@ -69,10 +76,16 @@ public:
QString();
QString(QChar);
+ QString(const QString&);
+ QString(const QByteArray&);
QString(const QChar *, uint);
QString(const char *);
- QString(const QByteArray&);
- QString(const QString&);
+
+ QString &operator=(const QString&);
+ QString &operator=(const char *);
+ QString &operator=(const QCString&);
+ QString &operator=(QChar);
+ QString &operator=(char);
int toInt() const;
int toInt(bool *, int base=10) const;
@@ -113,6 +126,8 @@ public:
const char* latin1() const;
const char *ascii() const;
// FIXME: is there a standard parameter type for overloaded operators?
+ bool operator!() const;
+ operator const char *() const;
QChar operator[](int) const;
QString &operator+(char);
QString &operator+(QChar);
@@ -136,9 +151,7 @@ public:
static QString number(long, int base = 10);
- // FIXME: bogus constructor hack for "conversion from int to non-scalar
- // type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
- QString(int);
+ operator QChar () const;
};
QString &operator+(const char *, const QString &);
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/kwq/KWQStringList.h
index 6324054..662588a 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/kwq/KWQStringList.h
@@ -32,6 +32,7 @@
class QStringList : public QValueList<QString> {
public:
static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
+ static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
QString join(const QString &sepx ) const;
};
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 42c6474..6845c2b 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -35,7 +35,13 @@ class QChar {
public:
QChar();
QChar(char);
+ QChar(uchar);
QChar(const QChar &);
+ QChar(ushort);
+ QChar(short);
+ QChar(uint);
+ QChar(int);
+
QChar lower() const;
QChar upper() const;
char latin1() const;
@@ -46,6 +52,7 @@ public:
bool isLetterOrNumber() const;
uchar cell() const;
uchar row() const;
+ friend inline int operator==(char, QChar);
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
friend inline int operator!=(QChar, QChar);
@@ -69,10 +76,16 @@ public:
QString();
QString(QChar);
+ QString(const QString&);
+ QString(const QByteArray&);
QString(const QChar *, uint);
QString(const char *);
- QString(const QByteArray&);
- QString(const QString&);
+
+ QString &operator=(const QString&);
+ QString &operator=(const char *);
+ QString &operator=(const QCString&);
+ QString &operator=(QChar);
+ QString &operator=(char);
int toInt() const;
int toInt(bool *, int base=10) const;
@@ -113,6 +126,8 @@ public:
const char* latin1() const;
const char *ascii() const;
// FIXME: is there a standard parameter type for overloaded operators?
+ bool operator!() const;
+ operator const char *() const;
QChar operator[](int) const;
QString &operator+(char);
QString &operator+(QChar);
@@ -136,9 +151,7 @@ public:
static QString number(long, int base = 10);
- // FIXME: bogus constructor hack for "conversion from int to non-scalar
- // type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
- QString(int);
+ operator QChar () const;
};
QString &operator+(const char *, const QString &);
diff --git a/WebCore/kwq/qt/qstringlist.h b/WebCore/kwq/qt/qstringlist.h
index 6324054..662588a 100644
--- a/WebCore/kwq/qt/qstringlist.h
+++ b/WebCore/kwq/qt/qstringlist.h
@@ -32,6 +32,7 @@
class QStringList : public QValueList<QString> {
public:
static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
+ static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
QString join(const QString &sepx ) const;
};
diff --git a/WebCore/src/kdelibs/kdecore/.cvsignore b/WebCore/src/kdelibs/kdecore/.cvsignore
new file mode 100644
index 0000000..dce8357
--- /dev/null
+++ b/WebCore/src/kdelibs/kdecore/.cvsignore
@@ -0,0 +1 @@
+kentities.c
diff --git a/WebCore/src/kdelibs/kdecore/Makefile.in b/WebCore/src/kdelibs/kdecore/Makefile.in
new file mode 100644
index 0000000..dab7779
--- /dev/null
+++ b/WebCore/src/kdelibs/kdecore/Makefile.in
@@ -0,0 +1,37 @@
+#======================================================================
+#
+# Makefile
+#
+# $RCSfile$
+#
+#======================================================================
+# set top source dir relative to this directory
+# include make vars boilerplate
+#
+
+TOPSRCDIR = ../../..
+include $(TOPSRCDIR)/Makefile.vars
+
+#----------------------------------------------------------------------
+# Set variables for this directory
+
+CLEAN_FILES = kentities.c
+
+#----------------------------------------------------------------------
+# Set targets for this directory
+
+all: kentities.c
+
+depend:
+
+kentities.c: kentities.gperf
+ $(GPERF) -a -L "ANSI-C" -C -G -c -o -t -k '*' -NfindEntity -D -s 2 $< > $@
+
+#----------------------------------------------------------------------
+# include make rules boilerplate
+
+include $(TOPSRCDIR)/Makefile.rules
+
+#======================================================================
+# end
+#======================================================================
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 42c6474..6845c2b 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -35,7 +35,13 @@ class QChar {
public:
QChar();
QChar(char);
+ QChar(uchar);
QChar(const QChar &);
+ QChar(ushort);
+ QChar(short);
+ QChar(uint);
+ QChar(int);
+
QChar lower() const;
QChar upper() const;
char latin1() const;
@@ -46,6 +52,7 @@ public:
bool isLetterOrNumber() const;
uchar cell() const;
uchar row() const;
+ friend inline int operator==(char, QChar);
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
friend inline int operator!=(QChar, QChar);
@@ -69,10 +76,16 @@ public:
QString();
QString(QChar);
+ QString(const QString&);
+ QString(const QByteArray&);
QString(const QChar *, uint);
QString(const char *);
- QString(const QByteArray&);
- QString(const QString&);
+
+ QString &operator=(const QString&);
+ QString &operator=(const char *);
+ QString &operator=(const QCString&);
+ QString &operator=(QChar);
+ QString &operator=(char);
int toInt() const;
int toInt(bool *, int base=10) const;
@@ -113,6 +126,8 @@ public:
const char* latin1() const;
const char *ascii() const;
// FIXME: is there a standard parameter type for overloaded operators?
+ bool operator!() const;
+ operator const char *() const;
QChar operator[](int) const;
QString &operator+(char);
QString &operator+(QChar);
@@ -136,9 +151,7 @@ public:
static QString number(long, int base = 10);
- // FIXME: bogus constructor hack for "conversion from int to non-scalar
- // type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
- QString(int);
+ operator QChar () const;
};
QString &operator+(const char *, const QString &);
diff --git a/WebCore/src/kwq/qt/qstringlist.h b/WebCore/src/kwq/qt/qstringlist.h
index 6324054..662588a 100644
--- a/WebCore/src/kwq/qt/qstringlist.h
+++ b/WebCore/src/kwq/qt/qstringlist.h
@@ -32,6 +32,7 @@
class QStringList : public QValueList<QString> {
public:
static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
+ static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE );
QString join(const QString &sepx ) const;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list