[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:40:29 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 3b8c2c6412ee6438ebc45a561d5598f1aa709e24
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 28 23:16:45 2001 +0000

    More hacks....now most of the way through khtml/xml
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/MakeSystemChanges.sh b/JavaScriptCore/kjs/MakeSystemChanges.sh
index 841b34b..9e86deb 100644
--- a/JavaScriptCore/kjs/MakeSystemChanges.sh
+++ b/JavaScriptCore/kjs/MakeSystemChanges.sh
@@ -11,8 +11,13 @@ for file in $FILES; do
 	fi                    
 done
 
-if (! test -L "Makefile.in"); then
-	echo "Making link to Apple Makefile.in..."
-	ln -s Makefile.in.apple Makefile.in
+FILE=Makefile.in
+if (! test -L "$FILE"); then
+	if (test -f "$FILE"); then
+		echo "Removing spurious $FILE..."
+		rm -f $file
+	fi
+	echo "Making link to Apple $FILE..."
+	ln -s $FILE.apple $FILE
 fi
 
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/khtml/dom/Makefile.in.apple
index fdec022..9811ebc 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/dom/Makefile.in.apple
@@ -12,77 +12,49 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CXXYACCOBJECTS = grammar.cpp grammar.h
+ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+CXXOBJECTS = $(filter-out css_extensions.o,$(ALLOBJECTS))
 
-CXXOBJECTS = \
-	array_object.o \
-	bool_object.o \
-	collector.o \
-	date_object.o \
-	debugger.o \
-	error_object.o \
-	function.o \
-	function_object.o \
-	global_object.o \
-	grammar.o \
-	internal.o \
-	kjs.o \
-	lexer.o \
-	lookup.o \
-	math_object.o \
-	nodes.o \
-	number_object.o \
-	object.o \
-	object_object.o \
-	operations.o \
-	regexp.o \
-	regexp_object.o \
-	string_object.o \
-	types.o \
-	ustring.o \
-	$(NULL)
-
-PROGRAM = testkjs
-
-OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS) 
+OBJECTS = $(CXXOBJECTS) 
 
-LIBRARY = libkjs.a
+LIBRARY = libkhtmldom.a
 
 CLEAN_FILES = $(OBJECTS) \
-	grammar.h \
-	grammar.cpp \
-	grammar.cpp.h \
-	testkjs.o \
 	$(LIBRARY) \
-	$(PROGRAM) \
 	$(NULL)
 
 #----------------------------------------------------------------------
 # Set flags for this directory
 
-YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
+CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
+	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/src/kwq/dcop \
+	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kio \
+	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I../css \
+	-I../html \
+	-I../misc \
+	-I../xml \
+	-I.. \
+	-I. \
+	$(NULL)
 
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
+all: $(OBJECTS) $(LIBRARY)
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
-$(PROGRAM): testkjs.o
-	$(CC) $< -o $@ -L. -lkjs
-
-grammar.h: grammar.cpp.h
-	ln -s grammar.cpp.h grammar.h
-
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/khtml/xml/.cvsignore b/WebCore/khtml/xml/.cvsignore
index c74f620..b31bca8 100644
--- a/WebCore/khtml/xml/.cvsignore
+++ b/WebCore/khtml/xml/.cvsignore
@@ -3,3 +3,4 @@ Makefile.am
 Makefile.in
 *.kde
 *.dep
+*.moc
diff --git a/WebCore/khtml/xml/MakeSystemChanges.sh b/WebCore/khtml/xml/MakeSystemChanges.sh
index 66563a4..d3db378 100644
--- a/WebCore/khtml/xml/MakeSystemChanges.sh
+++ b/WebCore/khtml/xml/MakeSystemChanges.sh
@@ -11,8 +11,13 @@ for file in $FILES; do
 	fi                    
 done
 
-if (! test -L "Makefile.in"); then
-	echo "Making link to Apple Makefile.in..."
-	ln -s Makefile.in.apple Makefile.in
+FILE=Makefile.in
+if (! test -L "$FILE"); then
+	if (test -f "$FILE"); then
+		echo "Removing spurious $FILE..."
+		rm -f $file
+	fi
+	echo "Making link to Apple $FILE..."
+	ln -s $FILE.apple $FILE
 fi
 
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/khtml/xml/Makefile.in.apple
similarity index 58%
copy from WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
copy to WebCore/khtml/xml/Makefile.in.apple
index fdec022..c93b1bb 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/xml/Makefile.in.apple
@@ -12,77 +12,53 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CXXYACCOBJECTS = grammar.cpp grammar.h
-
 CXXOBJECTS = \
-	array_object.o \
-	bool_object.o \
-	collector.o \
-	date_object.o \
-	debugger.o \
-	error_object.o \
-	function.o \
-	function_object.o \
-	global_object.o \
-	grammar.o \
-	internal.o \
-	kjs.o \
-	lexer.o \
-	lookup.o \
-	math_object.o \
-	nodes.o \
-	number_object.o \
-	object.o \
-	object_object.o \
-	operations.o \
-	regexp.o \
-	regexp_object.o \
-	string_object.o \
-	types.o \
-	ustring.o \
+	dom2_eventsimpl.o \
+	dom2_rangeimpl.o \
+	dom2_traversalimpl.o \
+	dom2_viewsimpl.o \
+	dom_docimpl.o \
+	dom_elementimpl.o \
+	dom_nodeimpl.o \
+	dom_stringimpl.o \
+	dom_textimpl.o \
+	dom_xmlimpl.o \
+	xml_tokenizer.o \
 	$(NULL)
 
-PROGRAM = testkjs
-
-OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS) 
+OBJECTS = $(CXXOBJECTS) 
 
-LIBRARY = libkjs.a
+LIBRARY = libkhtmlxml.a
 
 CLEAN_FILES = $(OBJECTS) \
-	grammar.h \
-	grammar.cpp \
-	grammar.cpp.h \
-	testkjs.o \
 	$(LIBRARY) \
-	$(PROGRAM) \
 	$(NULL)
 
 #----------------------------------------------------------------------
 # Set flags for this directory
 
-YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
+CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
+        -I$(TOPSRCDIR)/src/kwq/qt \
+        -I.. \
+        -I. \
+        $(NULL)
+
 
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
+all: $(OBJECTS) $(LIBRARY)
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
-$(PROGRAM): testkjs.o
-	$(CC) $< -o $@ -L. -lkjs
-
-grammar.h: grammar.cpp.h
-	ln -s grammar.cpp.h grammar.h
-
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/kwq/KWQCollection.h
similarity index 91%
copy from WebCore/src/kwq/qt/qwidget.h
copy to WebCore/kwq/KWQCollection.h
index ffd761e..38cd0a4 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/kwq/KWQCollection.h
@@ -23,12 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QWIDGET_H_
-#define QWIDGET_H_
+#ifndef QCOLLECTION_H_
+#define QCOLLECTION_H_
 
-class QWidget {
+class QCollection {
 public:
-	int winId() const;
+	typedef void *Item;
+protected:
+	virtual Item newItem(Item);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/KWQDateTime.h
index ca8a604..85028b1 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/KWQDateTime.h
@@ -27,9 +27,29 @@
 #define QDATETIME_H_
 
 class QTime {
+public:
+	QTime();
+	QTime(int h, int m);
+	QTime(const QTime &other);
+
+	void start();
+	int msec() const;
+};
+
+class QDate {
+public:
+	QDate(int y, int m, int d);
 };
 
 class QDateTime {
+public:
+	QDateTime();
+	QDateTime(QDate date, QTime time);
+
+	static QDateTime currentDateTime();
+
+	int secsTo(const QDateTime &) const;
+	QTime time() const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index 1c18bd0..14a9818 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -26,6 +26,8 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+#include "qregion.h"
+
 // all the following events added to support khtmlview.h 
 class QEvent {};
 class QFocusEvent : public QEvent {};
diff --git a/WebCore/kwq/KWQFont.h b/WebCore/kwq/KWQFont.h
index bb0b35e..77c0823 100644
--- a/WebCore/kwq/KWQFont.h
+++ b/WebCore/kwq/KWQFont.h
@@ -26,10 +26,14 @@
 #ifndef QFONT_H_
 #define QFONT_H_
 
+class QString;
+
 class QFont {
 public:
+	void setFamily( const QString &);
 	bool operator==(const QFont &x) const;
 	bool operator!=(const QFont &x) const;
+	enum CharSet {};
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKCharsets.h
index 9f03da8..2d94f3f 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKCharsets.h
@@ -26,4 +26,12 @@
 #ifndef KCHARSETS_H_
 #define KCHARSETS_H_
 
+class QFont;
+class QString;
+
+class KCharsets {
+public:
+	void setQFont(QFont &f, QString charset) const;
+};
+
 #endif
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
index ac11a99..7b48d1a 100644
--- a/WebCore/kwq/KWQKDebug.h
+++ b/WebCore/kwq/KWQKDebug.h
@@ -41,6 +41,7 @@ public:
 
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
 
+kdbgstream kdDebug(int area = 0);
 kdbgstream kdWarning(int area = 0);
 kdbgstream kdWarning(bool cond, int area = 0);
 kdbgstream kdError(int area = 0);
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index ab74075..5e0284d 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -26,4 +26,9 @@
 #ifndef KGLOBAL_H_
 #define KGLOBAL_H_
 
+class KGlobal {
+public:
+	static KCharsets *charsets();
+};
+
 #endif
diff --git a/WebCore/kwq/KWQKGlobalSettings.h b/WebCore/kwq/KWQKGlobalSettings.h
index 7fb138d..8384006 100644
--- a/WebCore/kwq/KWQKGlobalSettings.h
+++ b/WebCore/kwq/KWQKGlobalSettings.h
@@ -26,4 +26,11 @@
 #ifndef KGLOBALSETTINGS_H_
 #define KGLOBALSETTINGS_H_
 
+class QFont;
+
+class KGlobalSettings {
+public:
+	static QFont generalFont();
+};
+
 #endif
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index a87579b..042a3b6 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -26,7 +26,12 @@
 #ifndef KURL_H_
 #define KURL_H_
 
+class QString;
+
 class KURL {
+public:
+	QString url() const;
+	bool isEmpty() const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 6845bfe..90d9e78 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -37,6 +37,7 @@
 #define SIGNAL(x) x
 #define emit
 #define Q_OBJECT
+#define connect(arg1,arg2,arg3,arg4)
 
 class QObject {
 };
diff --git a/WebCore/kwq/KWQPaintDevice.h b/WebCore/kwq/KWQPaintDevice.h
index 5842e65..bc7282f 100644
--- a/WebCore/kwq/KWQPaintDevice.h
+++ b/WebCore/kwq/KWQPaintDevice.h
@@ -28,4 +28,8 @@
 
 #include "qrect.h"
 
+class QPaintDevice {
+	friend class QPaintDeviceMetrics;
+};
+
 #endif
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.h b/WebCore/kwq/KWQPaintDeviceMetrics.h
index fc861d7..a74abb8 100644
--- a/WebCore/kwq/KWQPaintDeviceMetrics.h
+++ b/WebCore/kwq/KWQPaintDeviceMetrics.h
@@ -26,4 +26,12 @@
 #ifndef QPAINTDEVICEMETRICS_H_
 #define QPAINTDEVICEMETRICS_H_
 
+class QPaintDevice;
+
+class QPaintDeviceMetrics {
+public:
+	QPaintDeviceMetrics(const QPaintDevice *);
+	int logicalDpiY() const;
+};
+
 #endif
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 6a775c2..9dc2571 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -27,6 +27,7 @@
 #define QLIST_H_
 
 #include <kwq.h>
+#include "qcollection.h"
 
 template <class T> class QList {
 public:
@@ -36,10 +37,12 @@ public:
     T *at(uint);
     void append(const T *);
     void setAutoDelete(bool);
+    bool remove(const T *d);
     bool removeLast();
     T *first();
     T *next();
     T *last();
+    void clear();
     bool isEmpty() const;
     bool removeRef(const T *);
 };
@@ -50,6 +53,7 @@ public:
     T *toLast();
     T *current() const;
     T *operator--();
+    T *operator++();
 };
 
 #endif
diff --git a/WebCore/kwq/KWQPtrStack.h b/WebCore/kwq/KWQPtrStack.h
index 38f3e2f..e386ae2 100644
--- a/WebCore/kwq/KWQPtrStack.h
+++ b/WebCore/kwq/KWQPtrStack.h
@@ -26,4 +26,11 @@
 #ifndef QSTACK_H_
 #define QSTACK_H_
 
+template<class T> class QStack {
+public:
+	bool isEmpty() const;
+	void push(const T *d);
+	T *pop();
+};
+
 #endif
diff --git a/WebCore/kwq/KWQPtrVector.h b/WebCore/kwq/KWQPtrVector.h
index fda5a7a..d61ee85 100644
--- a/WebCore/kwq/KWQPtrVector.h
+++ b/WebCore/kwq/KWQPtrVector.h
@@ -26,4 +26,9 @@
 #ifndef QVECTOR_H_
 #define QVECTOR_H_
 
+typedef void *Item;
+
+template<class type> class QVector {
+};
+
 #endif
diff --git a/WebCore/kwq/KWQRegExp.h b/WebCore/kwq/KWQRegExp.h
index b5f4418..761e15a 100644
--- a/WebCore/kwq/KWQRegExp.h
+++ b/WebCore/kwq/KWQRegExp.h
@@ -27,6 +27,9 @@
 #define QREGEXP_H_
 
 class QRegExp {
+public:
+	QRegExp(const QString &);
+	QRegExp(const QRegExp &);	
 };
 
 #endif
diff --git a/WebCore/kwq/KWQSortedList.h b/WebCore/kwq/KWQSortedList.h
index 80edf43..8c2926b 100644
--- a/WebCore/kwq/KWQSortedList.h
+++ b/WebCore/kwq/KWQSortedList.h
@@ -26,4 +26,7 @@
 #ifndef QSORTEDLIST_H_
 #define QSORTEDLIST_H_
 
+template<class T> class QSortedList : public QList<T> {
+};
+
 #endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 729f755..1d7a0f4 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -31,16 +31,26 @@
 
 #include "qcstring.h"
 
+class QRegExp;
+
 class QChar {
 public:
+    QChar();
     QChar(char);
     QChar(const QChar &);
     QChar lower() const;
     char latin1() const;
+    bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
     friend inline int operator==(QChar, QChar);
     friend inline int operator!=(QChar, QChar);
+
+    enum Direction {
+	DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+	DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
+    };
+
 };
 
 class QString {
@@ -58,6 +68,12 @@ public:
     QString stripWhiteSpace() const;
     bool isEmpty() const;
     int contains(const char *) const;
+    int find(char c, int index) const;
+    int find(const char *s, int index, bool b=0) const;
+    int find(const QRegExp &regexp, int index, bool b=0) const;
+    QString mid(int index, int len=0xffffffff) const;
+
+    const char* latin1() const;
     const char *ascii() const;
     // FIXME: is there a standard parameter type for overloaded operators?
     QChar operator[](int) const;
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index ef1df64..0630ef3 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -26,10 +26,20 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
+template<class T> class QValueListIterator {
+};
+
 template <class T> class QValueList {
 public:
+	typedef QValueListIterator<T> Iterator;
+	bool isEmpty() const;
 	void append(const T& x);
 	void remove(const T& x);
+	Iterator remove(Iterator it);
+	const T& first() const;
+	const T& last() const;
+	Iterator begin();
+	T& operator[] (uint i);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index ffd761e..b9cba86 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -26,7 +26,9 @@
 #ifndef QWIDGET_H_
 #define QWIDGET_H_
 
-class QWidget {
+#include "qpaintdevice.h"
+
+class QWidget : public QPaintDevice {
 public:
 	int winId() const;
 };
diff --git a/WebCore/kwq/KWQXml.h b/WebCore/kwq/KWQXml.h
index 4f72b8c..aaa35ed 100644
--- a/WebCore/kwq/KWQXml.h
+++ b/WebCore/kwq/KWQXml.h
@@ -32,4 +32,8 @@ class QXmlDefaultHandler {
 class QXmlAttributes {
 };
 
+class QXmlParseException {
+};
+
+
 #endif
diff --git a/WebCore/kwq/kdecore/kcharsets.h b/WebCore/kwq/kdecore/kcharsets.h
index 9f03da8..2d94f3f 100644
--- a/WebCore/kwq/kdecore/kcharsets.h
+++ b/WebCore/kwq/kdecore/kcharsets.h
@@ -26,4 +26,12 @@
 #ifndef KCHARSETS_H_
 #define KCHARSETS_H_
 
+class QFont;
+class QString;
+
+class KCharsets {
+public:
+	void setQFont(QFont &f, QString charset) const;
+};
+
 #endif
diff --git a/WebCore/kwq/kdecore/kdebug.h b/WebCore/kwq/kdecore/kdebug.h
index ac11a99..7b48d1a 100644
--- a/WebCore/kwq/kdecore/kdebug.h
+++ b/WebCore/kwq/kdecore/kdebug.h
@@ -41,6 +41,7 @@ public:
 
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
 
+kdbgstream kdDebug(int area = 0);
 kdbgstream kdWarning(int area = 0);
 kdbgstream kdWarning(bool cond, int area = 0);
 kdbgstream kdError(int area = 0);
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
index ab74075..5e0284d 100644
--- a/WebCore/kwq/kdecore/kglobal.h
+++ b/WebCore/kwq/kdecore/kglobal.h
@@ -26,4 +26,9 @@
 #ifndef KGLOBAL_H_
 #define KGLOBAL_H_
 
+class KGlobal {
+public:
+	static KCharsets *charsets();
+};
+
 #endif
diff --git a/WebCore/kwq/kdecore/kglobalsettings.h b/WebCore/kwq/kdecore/kglobalsettings.h
index 7fb138d..8384006 100644
--- a/WebCore/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/kwq/kdecore/kglobalsettings.h
@@ -26,4 +26,11 @@
 #ifndef KGLOBALSETTINGS_H_
 #define KGLOBALSETTINGS_H_
 
+class QFont;
+
+class KGlobalSettings {
+public:
+	static QFont generalFont();
+};
+
 #endif
diff --git a/WebCore/kwq/kdecore/kurl.h b/WebCore/kwq/kdecore/kurl.h
index a87579b..042a3b6 100644
--- a/WebCore/kwq/kdecore/kurl.h
+++ b/WebCore/kwq/kdecore/kurl.h
@@ -26,7 +26,12 @@
 #ifndef KURL_H_
 #define KURL_H_
 
+class QString;
+
 class KURL {
+public:
+	QString url() const;
+	bool isEmpty() const;
 };
 
 #endif
diff --git a/WebCore/kwq/kwq.h b/WebCore/kwq/kwq.h
index ed18c29..5a7931f 100644
--- a/WebCore/kwq/kwq.h
+++ b/WebCore/kwq/kwq.h
@@ -29,8 +29,10 @@
 #include <qsize.h>
 #include <qcolor.h>
 
+typedef unsigned char uchar;
 typedef unsigned short ushort;
 typedef unsigned uint;
+typedef unsigned int Q_UINT32;  
 
 // FIXME: bogus forward declaration hack for parse error at line 47 of
 // "dom/css_extensions.h"
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/kwq/qt/qcollection.h
similarity index 91%
copy from WebCore/src/kwq/qt/qwidget.h
copy to WebCore/kwq/qt/qcollection.h
index ffd761e..38cd0a4 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qcollection.h
@@ -23,12 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QWIDGET_H_
-#define QWIDGET_H_
+#ifndef QCOLLECTION_H_
+#define QCOLLECTION_H_
 
-class QWidget {
+class QCollection {
 public:
-	int winId() const;
+	typedef void *Item;
+protected:
+	virtual Item newItem(Item);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qdatetime.h b/WebCore/kwq/qt/qdatetime.h
index ca8a604..85028b1 100644
--- a/WebCore/kwq/qt/qdatetime.h
+++ b/WebCore/kwq/qt/qdatetime.h
@@ -27,9 +27,29 @@
 #define QDATETIME_H_
 
 class QTime {
+public:
+	QTime();
+	QTime(int h, int m);
+	QTime(const QTime &other);
+
+	void start();
+	int msec() const;
+};
+
+class QDate {
+public:
+	QDate(int y, int m, int d);
 };
 
 class QDateTime {
+public:
+	QDateTime();
+	QDateTime(QDate date, QTime time);
+
+	static QDateTime currentDateTime();
+
+	int secsTo(const QDateTime &) const;
+	QTime time() const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index 1c18bd0..14a9818 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -26,6 +26,8 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+#include "qregion.h"
+
 // all the following events added to support khtmlview.h 
 class QEvent {};
 class QFocusEvent : public QEvent {};
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
index bb0b35e..77c0823 100644
--- a/WebCore/kwq/qt/qfont.h
+++ b/WebCore/kwq/qt/qfont.h
@@ -26,10 +26,14 @@
 #ifndef QFONT_H_
 #define QFONT_H_
 
+class QString;
+
 class QFont {
 public:
+	void setFamily( const QString &);
 	bool operator==(const QFont &x) const;
 	bool operator!=(const QFont &x) const;
+	enum CharSet {};
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 6a775c2..9dc2571 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -27,6 +27,7 @@
 #define QLIST_H_
 
 #include <kwq.h>
+#include "qcollection.h"
 
 template <class T> class QList {
 public:
@@ -36,10 +37,12 @@ public:
     T *at(uint);
     void append(const T *);
     void setAutoDelete(bool);
+    bool remove(const T *d);
     bool removeLast();
     T *first();
     T *next();
     T *last();
+    void clear();
     bool isEmpty() const;
     bool removeRef(const T *);
 };
@@ -50,6 +53,7 @@ public:
     T *toLast();
     T *current() const;
     T *operator--();
+    T *operator++();
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 6845bfe..90d9e78 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -37,6 +37,7 @@
 #define SIGNAL(x) x
 #define emit
 #define Q_OBJECT
+#define connect(arg1,arg2,arg3,arg4)
 
 class QObject {
 };
diff --git a/WebCore/kwq/qt/qpaintdevice.h b/WebCore/kwq/qt/qpaintdevice.h
index 5842e65..bc7282f 100644
--- a/WebCore/kwq/qt/qpaintdevice.h
+++ b/WebCore/kwq/qt/qpaintdevice.h
@@ -28,4 +28,8 @@
 
 #include "qrect.h"
 
+class QPaintDevice {
+	friend class QPaintDeviceMetrics;
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qpaintdevicemetrics.h b/WebCore/kwq/qt/qpaintdevicemetrics.h
index fc861d7..a74abb8 100644
--- a/WebCore/kwq/qt/qpaintdevicemetrics.h
+++ b/WebCore/kwq/qt/qpaintdevicemetrics.h
@@ -26,4 +26,12 @@
 #ifndef QPAINTDEVICEMETRICS_H_
 #define QPAINTDEVICEMETRICS_H_
 
+class QPaintDevice;
+
+class QPaintDeviceMetrics {
+public:
+	QPaintDeviceMetrics(const QPaintDevice *);
+	int logicalDpiY() const;
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qregexp.h b/WebCore/kwq/qt/qregexp.h
index b5f4418..761e15a 100644
--- a/WebCore/kwq/qt/qregexp.h
+++ b/WebCore/kwq/qt/qregexp.h
@@ -27,6 +27,9 @@
 #define QREGEXP_H_
 
 class QRegExp {
+public:
+	QRegExp(const QString &);
+	QRegExp(const QRegExp &);	
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qsortedlist.h b/WebCore/kwq/qt/qsortedlist.h
index 80edf43..8c2926b 100644
--- a/WebCore/kwq/qt/qsortedlist.h
+++ b/WebCore/kwq/qt/qsortedlist.h
@@ -26,4 +26,7 @@
 #ifndef QSORTEDLIST_H_
 #define QSORTEDLIST_H_
 
+template<class T> class QSortedList : public QList<T> {
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qstack.h b/WebCore/kwq/qt/qstack.h
index 38f3e2f..e386ae2 100644
--- a/WebCore/kwq/qt/qstack.h
+++ b/WebCore/kwq/qt/qstack.h
@@ -26,4 +26,11 @@
 #ifndef QSTACK_H_
 #define QSTACK_H_
 
+template<class T> class QStack {
+public:
+	bool isEmpty() const;
+	void push(const T *d);
+	T *pop();
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 729f755..1d7a0f4 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -31,16 +31,26 @@
 
 #include "qcstring.h"
 
+class QRegExp;
+
 class QChar {
 public:
+    QChar();
     QChar(char);
     QChar(const QChar &);
     QChar lower() const;
     char latin1() const;
+    bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
     friend inline int operator==(QChar, QChar);
     friend inline int operator!=(QChar, QChar);
+
+    enum Direction {
+	DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+	DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
+    };
+
 };
 
 class QString {
@@ -58,6 +68,12 @@ public:
     QString stripWhiteSpace() const;
     bool isEmpty() const;
     int contains(const char *) const;
+    int find(char c, int index) const;
+    int find(const char *s, int index, bool b=0) const;
+    int find(const QRegExp &regexp, int index, bool b=0) const;
+    QString mid(int index, int len=0xffffffff) const;
+
+    const char* latin1() const;
     const char *ascii() const;
     // FIXME: is there a standard parameter type for overloaded operators?
     QChar operator[](int) const;
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index ef1df64..0630ef3 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -26,10 +26,20 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
+template<class T> class QValueListIterator {
+};
+
 template <class T> class QValueList {
 public:
+	typedef QValueListIterator<T> Iterator;
+	bool isEmpty() const;
 	void append(const T& x);
 	void remove(const T& x);
+	Iterator remove(Iterator it);
+	const T& first() const;
+	const T& last() const;
+	Iterator begin();
+	T& operator[] (uint i);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qvector.h b/WebCore/kwq/qt/qvector.h
index fda5a7a..d61ee85 100644
--- a/WebCore/kwq/qt/qvector.h
+++ b/WebCore/kwq/qt/qvector.h
@@ -26,4 +26,9 @@
 #ifndef QVECTOR_H_
 #define QVECTOR_H_
 
+typedef void *Item;
+
+template<class type> class QVector {
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index ffd761e..b9cba86 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -26,7 +26,9 @@
 #ifndef QWIDGET_H_
 #define QWIDGET_H_
 
-class QWidget {
+#include "qpaintdevice.h"
+
+class QWidget : public QPaintDevice {
 public:
 	int winId() const;
 };
diff --git a/WebCore/kwq/qt/qxml.h b/WebCore/kwq/qt/qxml.h
index 4f72b8c..aaa35ed 100644
--- a/WebCore/kwq/qt/qxml.h
+++ b/WebCore/kwq/qt/qxml.h
@@ -32,4 +32,8 @@ class QXmlDefaultHandler {
 class QXmlAttributes {
 };
 
+class QXmlParseException {
+};
+
+
 #endif
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
index fdec022..9811ebc 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
@@ -12,77 +12,49 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CXXYACCOBJECTS = grammar.cpp grammar.h
+ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+CXXOBJECTS = $(filter-out css_extensions.o,$(ALLOBJECTS))
 
-CXXOBJECTS = \
-	array_object.o \
-	bool_object.o \
-	collector.o \
-	date_object.o \
-	debugger.o \
-	error_object.o \
-	function.o \
-	function_object.o \
-	global_object.o \
-	grammar.o \
-	internal.o \
-	kjs.o \
-	lexer.o \
-	lookup.o \
-	math_object.o \
-	nodes.o \
-	number_object.o \
-	object.o \
-	object_object.o \
-	operations.o \
-	regexp.o \
-	regexp_object.o \
-	string_object.o \
-	types.o \
-	ustring.o \
-	$(NULL)
-
-PROGRAM = testkjs
-
-OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS) 
+OBJECTS = $(CXXOBJECTS) 
 
-LIBRARY = libkjs.a
+LIBRARY = libkhtmldom.a
 
 CLEAN_FILES = $(OBJECTS) \
-	grammar.h \
-	grammar.cpp \
-	grammar.cpp.h \
-	testkjs.o \
 	$(LIBRARY) \
-	$(PROGRAM) \
 	$(NULL)
 
 #----------------------------------------------------------------------
 # Set flags for this directory
 
-YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
+CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
+	-I$(TOPSRCDIR)/src/kwq/qt \
+	-I$(TOPSRCDIR)/src/kwq/dcop \
+	-I$(TOPSRCDIR)/src/kwq/kdecore \
+	-I$(TOPSRCDIR)/src/kwq/kio \
+	-I$(TOPSRCDIR)/src/kwq/kparts \
+	-I../css \
+	-I../html \
+	-I../misc \
+	-I../xml \
+	-I.. \
+	-I. \
+	$(NULL)
 
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
+all: $(OBJECTS) $(LIBRARY)
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
-$(PROGRAM): testkjs.o
-	$(CC) $< -o $@ -L. -lkjs
-
-grammar.h: grammar.cpp.h
-	ln -s grammar.cpp.h grammar.h
-
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kdelibs/khtml/xml/.cvsignore b/WebCore/src/kdelibs/khtml/xml/.cvsignore
index c74f620..b31bca8 100644
--- a/WebCore/src/kdelibs/khtml/xml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/xml/.cvsignore
@@ -3,3 +3,4 @@ Makefile.am
 Makefile.in
 *.kde
 *.dep
+*.moc
diff --git a/WebCore/src/kdelibs/khtml/xml/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/xml/MakeSystemChanges.sh
index 66563a4..d3db378 100644
--- a/WebCore/src/kdelibs/khtml/xml/MakeSystemChanges.sh
+++ b/WebCore/src/kdelibs/khtml/xml/MakeSystemChanges.sh
@@ -11,8 +11,13 @@ for file in $FILES; do
 	fi                    
 done
 
-if (! test -L "Makefile.in"); then
-	echo "Making link to Apple Makefile.in..."
-	ln -s Makefile.in.apple Makefile.in
+FILE=Makefile.in
+if (! test -L "$FILE"); then
+	if (test -f "$FILE"); then
+		echo "Removing spurious $FILE..."
+		rm -f $file
+	fi
+	echo "Making link to Apple $FILE..."
+	ln -s $FILE.apple $FILE
 fi
 
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
similarity index 58%
copy from WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
copy to WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
index fdec022..c93b1bb 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
@@ -12,77 +12,53 @@
 # include make vars boilerplate
 #
 
-TOPSRCDIR = ../../..
+TOPSRCDIR = ../../../..
 include $(TOPSRCDIR)/Makefile.vars
 
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CXXYACCOBJECTS = grammar.cpp grammar.h
-
 CXXOBJECTS = \
-	array_object.o \
-	bool_object.o \
-	collector.o \
-	date_object.o \
-	debugger.o \
-	error_object.o \
-	function.o \
-	function_object.o \
-	global_object.o \
-	grammar.o \
-	internal.o \
-	kjs.o \
-	lexer.o \
-	lookup.o \
-	math_object.o \
-	nodes.o \
-	number_object.o \
-	object.o \
-	object_object.o \
-	operations.o \
-	regexp.o \
-	regexp_object.o \
-	string_object.o \
-	types.o \
-	ustring.o \
+	dom2_eventsimpl.o \
+	dom2_rangeimpl.o \
+	dom2_traversalimpl.o \
+	dom2_viewsimpl.o \
+	dom_docimpl.o \
+	dom_elementimpl.o \
+	dom_nodeimpl.o \
+	dom_stringimpl.o \
+	dom_textimpl.o \
+	dom_xmlimpl.o \
+	xml_tokenizer.o \
 	$(NULL)
 
-PROGRAM = testkjs
-
-OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS) 
+OBJECTS = $(CXXOBJECTS) 
 
-LIBRARY = libkjs.a
+LIBRARY = libkhtmlxml.a
 
 CLEAN_FILES = $(OBJECTS) \
-	grammar.h \
-	grammar.cpp \
-	grammar.cpp.h \
-	testkjs.o \
 	$(LIBRARY) \
-	$(PROGRAM) \
 	$(NULL)
 
 #----------------------------------------------------------------------
 # Set flags for this directory
 
-YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
+CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
+        -I$(TOPSRCDIR)/src/kwq/qt \
+        -I.. \
+        -I. \
+        $(NULL)
+
 
 #----------------------------------------------------------------------
 # Set targets for this directory
 
-all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
+all: $(OBJECTS) $(LIBRARY)
 
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
 
-$(PROGRAM): testkjs.o
-	$(CC) $< -o $@ -L. -lkjs
-
-grammar.h: grammar.cpp.h
-	ln -s grammar.cpp.h grammar.h
-
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kdelibs/kjs/MakeSystemChanges.sh b/WebCore/src/kdelibs/kjs/MakeSystemChanges.sh
index 841b34b..9e86deb 100644
--- a/WebCore/src/kdelibs/kjs/MakeSystemChanges.sh
+++ b/WebCore/src/kdelibs/kjs/MakeSystemChanges.sh
@@ -11,8 +11,13 @@ for file in $FILES; do
 	fi                    
 done
 
-if (! test -L "Makefile.in"); then
-	echo "Making link to Apple Makefile.in..."
-	ln -s Makefile.in.apple Makefile.in
+FILE=Makefile.in
+if (! test -L "$FILE"); then
+	if (test -f "$FILE"); then
+		echo "Removing spurious $FILE..."
+		rm -f $file
+	fi
+	echo "Making link to Apple $FILE..."
+	ln -s $FILE.apple $FILE
 fi
 
diff --git a/WebCore/src/kwq/kdecore/kcharsets.h b/WebCore/src/kwq/kdecore/kcharsets.h
index 9f03da8..2d94f3f 100644
--- a/WebCore/src/kwq/kdecore/kcharsets.h
+++ b/WebCore/src/kwq/kdecore/kcharsets.h
@@ -26,4 +26,12 @@
 #ifndef KCHARSETS_H_
 #define KCHARSETS_H_
 
+class QFont;
+class QString;
+
+class KCharsets {
+public:
+	void setQFont(QFont &f, QString charset) const;
+};
+
 #endif
diff --git a/WebCore/src/kwq/kdecore/kdebug.h b/WebCore/src/kwq/kdecore/kdebug.h
index ac11a99..7b48d1a 100644
--- a/WebCore/src/kwq/kdecore/kdebug.h
+++ b/WebCore/src/kwq/kdecore/kdebug.h
@@ -41,6 +41,7 @@ public:
 
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
 
+kdbgstream kdDebug(int area = 0);
 kdbgstream kdWarning(int area = 0);
 kdbgstream kdWarning(bool cond, int area = 0);
 kdbgstream kdError(int area = 0);
diff --git a/WebCore/src/kwq/kdecore/kglobal.h b/WebCore/src/kwq/kdecore/kglobal.h
index ab74075..5e0284d 100644
--- a/WebCore/src/kwq/kdecore/kglobal.h
+++ b/WebCore/src/kwq/kdecore/kglobal.h
@@ -26,4 +26,9 @@
 #ifndef KGLOBAL_H_
 #define KGLOBAL_H_
 
+class KGlobal {
+public:
+	static KCharsets *charsets();
+};
+
 #endif
diff --git a/WebCore/src/kwq/kdecore/kglobalsettings.h b/WebCore/src/kwq/kdecore/kglobalsettings.h
index 7fb138d..8384006 100644
--- a/WebCore/src/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/src/kwq/kdecore/kglobalsettings.h
@@ -26,4 +26,11 @@
 #ifndef KGLOBALSETTINGS_H_
 #define KGLOBALSETTINGS_H_
 
+class QFont;
+
+class KGlobalSettings {
+public:
+	static QFont generalFont();
+};
+
 #endif
diff --git a/WebCore/src/kwq/kdecore/kurl.h b/WebCore/src/kwq/kdecore/kurl.h
index a87579b..042a3b6 100644
--- a/WebCore/src/kwq/kdecore/kurl.h
+++ b/WebCore/src/kwq/kdecore/kurl.h
@@ -26,7 +26,12 @@
 #ifndef KURL_H_
 #define KURL_H_
 
+class QString;
+
 class KURL {
+public:
+	QString url() const;
+	bool isEmpty() const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/kwq.h b/WebCore/src/kwq/kwq.h
index ed18c29..5a7931f 100644
--- a/WebCore/src/kwq/kwq.h
+++ b/WebCore/src/kwq/kwq.h
@@ -29,8 +29,10 @@
 #include <qsize.h>
 #include <qcolor.h>
 
+typedef unsigned char uchar;
 typedef unsigned short ushort;
 typedef unsigned uint;
+typedef unsigned int Q_UINT32;  
 
 // FIXME: bogus forward declaration hack for parse error at line 47 of
 // "dom/css_extensions.h"
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qcollection.h
similarity index 91%
copy from WebCore/src/kwq/qt/qwidget.h
copy to WebCore/src/kwq/qt/qcollection.h
index ffd761e..38cd0a4 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qcollection.h
@@ -23,12 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef QWIDGET_H_
-#define QWIDGET_H_
+#ifndef QCOLLECTION_H_
+#define QCOLLECTION_H_
 
-class QWidget {
+class QCollection {
 public:
-	int winId() const;
+	typedef void *Item;
+protected:
+	virtual Item newItem(Item);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qdatetime.h b/WebCore/src/kwq/qt/qdatetime.h
index ca8a604..85028b1 100644
--- a/WebCore/src/kwq/qt/qdatetime.h
+++ b/WebCore/src/kwq/qt/qdatetime.h
@@ -27,9 +27,29 @@
 #define QDATETIME_H_
 
 class QTime {
+public:
+	QTime();
+	QTime(int h, int m);
+	QTime(const QTime &other);
+
+	void start();
+	int msec() const;
+};
+
+class QDate {
+public:
+	QDate(int y, int m, int d);
 };
 
 class QDateTime {
+public:
+	QDateTime();
+	QDateTime(QDate date, QTime time);
+
+	static QDateTime currentDateTime();
+
+	int secsTo(const QDateTime &) const;
+	QTime time() const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index 1c18bd0..14a9818 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -26,6 +26,8 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+#include "qregion.h"
+
 // all the following events added to support khtmlview.h 
 class QEvent {};
 class QFocusEvent : public QEvent {};
diff --git a/WebCore/src/kwq/qt/qfont.h b/WebCore/src/kwq/qt/qfont.h
index bb0b35e..77c0823 100644
--- a/WebCore/src/kwq/qt/qfont.h
+++ b/WebCore/src/kwq/qt/qfont.h
@@ -26,10 +26,14 @@
 #ifndef QFONT_H_
 #define QFONT_H_
 
+class QString;
+
 class QFont {
 public:
+	void setFamily( const QString &);
 	bool operator==(const QFont &x) const;
 	bool operator!=(const QFont &x) const;
+	enum CharSet {};
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 6a775c2..9dc2571 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -27,6 +27,7 @@
 #define QLIST_H_
 
 #include <kwq.h>
+#include "qcollection.h"
 
 template <class T> class QList {
 public:
@@ -36,10 +37,12 @@ public:
     T *at(uint);
     void append(const T *);
     void setAutoDelete(bool);
+    bool remove(const T *d);
     bool removeLast();
     T *first();
     T *next();
     T *last();
+    void clear();
     bool isEmpty() const;
     bool removeRef(const T *);
 };
@@ -50,6 +53,7 @@ public:
     T *toLast();
     T *current() const;
     T *operator--();
+    T *operator++();
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 6845bfe..90d9e78 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -37,6 +37,7 @@
 #define SIGNAL(x) x
 #define emit
 #define Q_OBJECT
+#define connect(arg1,arg2,arg3,arg4)
 
 class QObject {
 };
diff --git a/WebCore/src/kwq/qt/qpaintdevice.h b/WebCore/src/kwq/qt/qpaintdevice.h
index 5842e65..bc7282f 100644
--- a/WebCore/src/kwq/qt/qpaintdevice.h
+++ b/WebCore/src/kwq/qt/qpaintdevice.h
@@ -28,4 +28,8 @@
 
 #include "qrect.h"
 
+class QPaintDevice {
+	friend class QPaintDeviceMetrics;
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qpaintdevicemetrics.h b/WebCore/src/kwq/qt/qpaintdevicemetrics.h
index fc861d7..a74abb8 100644
--- a/WebCore/src/kwq/qt/qpaintdevicemetrics.h
+++ b/WebCore/src/kwq/qt/qpaintdevicemetrics.h
@@ -26,4 +26,12 @@
 #ifndef QPAINTDEVICEMETRICS_H_
 #define QPAINTDEVICEMETRICS_H_
 
+class QPaintDevice;
+
+class QPaintDeviceMetrics {
+public:
+	QPaintDeviceMetrics(const QPaintDevice *);
+	int logicalDpiY() const;
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qregexp.h b/WebCore/src/kwq/qt/qregexp.h
index b5f4418..761e15a 100644
--- a/WebCore/src/kwq/qt/qregexp.h
+++ b/WebCore/src/kwq/qt/qregexp.h
@@ -27,6 +27,9 @@
 #define QREGEXP_H_
 
 class QRegExp {
+public:
+	QRegExp(const QString &);
+	QRegExp(const QRegExp &);	
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qsortedlist.h b/WebCore/src/kwq/qt/qsortedlist.h
index 80edf43..8c2926b 100644
--- a/WebCore/src/kwq/qt/qsortedlist.h
+++ b/WebCore/src/kwq/qt/qsortedlist.h
@@ -26,4 +26,7 @@
 #ifndef QSORTEDLIST_H_
 #define QSORTEDLIST_H_
 
+template<class T> class QSortedList : public QList<T> {
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qstack.h b/WebCore/src/kwq/qt/qstack.h
index 38f3e2f..e386ae2 100644
--- a/WebCore/src/kwq/qt/qstack.h
+++ b/WebCore/src/kwq/qt/qstack.h
@@ -26,4 +26,11 @@
 #ifndef QSTACK_H_
 #define QSTACK_H_
 
+template<class T> class QStack {
+public:
+	bool isEmpty() const;
+	void push(const T *d);
+	T *pop();
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 729f755..1d7a0f4 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -31,16 +31,26 @@
 
 #include "qcstring.h"
 
+class QRegExp;
+
 class QChar {
 public:
+    QChar();
     QChar(char);
     QChar(const QChar &);
     QChar lower() const;
     char latin1() const;
+    bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
     friend inline int operator==(QChar, QChar);
     friend inline int operator!=(QChar, QChar);
+
+    enum Direction {
+	DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+	DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
+    };
+
 };
 
 class QString {
@@ -58,6 +68,12 @@ public:
     QString stripWhiteSpace() const;
     bool isEmpty() const;
     int contains(const char *) const;
+    int find(char c, int index) const;
+    int find(const char *s, int index, bool b=0) const;
+    int find(const QRegExp &regexp, int index, bool b=0) const;
+    QString mid(int index, int len=0xffffffff) const;
+
+    const char* latin1() const;
     const char *ascii() const;
     // FIXME: is there a standard parameter type for overloaded operators?
     QChar operator[](int) const;
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index ef1df64..0630ef3 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -26,10 +26,20 @@
 #ifndef QVALUELIST_H_
 #define QVALUELIST_H_
 
+template<class T> class QValueListIterator {
+};
+
 template <class T> class QValueList {
 public:
+	typedef QValueListIterator<T> Iterator;
+	bool isEmpty() const;
 	void append(const T& x);
 	void remove(const T& x);
+	Iterator remove(Iterator it);
+	const T& first() const;
+	const T& last() const;
+	Iterator begin();
+	T& operator[] (uint i);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qvector.h b/WebCore/src/kwq/qt/qvector.h
index fda5a7a..d61ee85 100644
--- a/WebCore/src/kwq/qt/qvector.h
+++ b/WebCore/src/kwq/qt/qvector.h
@@ -26,4 +26,9 @@
 #ifndef QVECTOR_H_
 #define QVECTOR_H_
 
+typedef void *Item;
+
+template<class type> class QVector {
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index ffd761e..b9cba86 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -26,7 +26,9 @@
 #ifndef QWIDGET_H_
 #define QWIDGET_H_
 
-class QWidget {
+#include "qpaintdevice.h"
+
+class QWidget : public QPaintDevice {
 public:
 	int winId() const;
 };
diff --git a/WebCore/src/kwq/qt/qxml.h b/WebCore/src/kwq/qt/qxml.h
index 4f72b8c..aaa35ed 100644
--- a/WebCore/src/kwq/qt/qxml.h
+++ b/WebCore/src/kwq/qt/qxml.h
@@ -32,4 +32,8 @@ class QXmlDefaultHandler {
 class QXmlAttributes {
 };
 
+class QXmlParseException {
+};
+
+
 #endif

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list