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

The following commit has been merged in the debian/unstable branch:
commit 25d4a8e9285b43fbcb15935b556fef799a4c805f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 29 16:33:19 2001 +0000

    Finished getting khtml/xml to compile
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@41 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/configure b/WebCore/configure
index 05e1e93..2cbda4b 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -557,6 +557,7 @@ CONFIG_ERR=`pwd`/config.err
 SUBDIRS='
 	src/kdelibs/kjs
 	src/kdelibs/khtml/dom
+	src/kdelibs/khtml/xml
 '
 for subdir in $SUBDIRS; do
 	if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -595,7 +596,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:599: checking host system type" >&5
+echo "configure:600: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -626,7 +627,7 @@ esac
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:630: checking for $ac_word" >&5
+echo "configure:631: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -656,7 +657,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:660: checking for $ac_word" >&5
+echo "configure:661: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -707,7 +708,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:711: checking for $ac_word" >&5
+echo "configure:712: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -739,7 +740,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:743: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:744: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -750,12 +751,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 754 "configure"
+#line 755 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -781,12 +782,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:790: checking whether we are using GNU C" >&5
+echo "configure:791: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -795,7 +796,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -814,7 +815,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:818: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:819: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -855,7 +856,7 @@ CXXFLAGS=$CFLAGS
  
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:859: checking how to run the C preprocessor" >&5
+echo "configure:860: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -870,13 +871,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 874 "configure"
+#line 875 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -887,13 +888,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 891 "configure"
+#line 892 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -904,13 +905,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 908 "configure"
+#line 909 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -937,7 +938,7 @@ echo "$ac_t""$CPP" 1>&6
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:941: checking for $ac_word" >&5
+echo "configure:942: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -971,7 +972,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:975: checking for yywrap in -l$ac_lib" >&5
+echo "configure:976: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -979,7 +980,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 983 "configure"
+#line 984 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -990,7 +991,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1013,7 +1014,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1017: checking lex output file root" >&5
+echo "configure:1018: checking lex output file root" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1034,7 +1035,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:1038: checking whether yytext is a pointer" >&5
+echo "configure:1039: checking whether yytext is a pointer" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1046,14 +1047,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 1050 "configure"
+#line 1051 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -1079,7 +1080,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1083: checking for $ac_word" >&5
+echo "configure:1084: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1120,7 +1121,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1124: checking for $ac_word" >&5
+echo "configure:1125: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1159,7 +1160,7 @@ YACCFLAGS="-d"
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1163: checking for $ac_word" >&5
+echo "configure:1164: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1195,7 +1196,7 @@ ARFLAGS="cr"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1199: checking for $ac_word" >&5
+echo "configure:1200: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1232,7 +1233,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1236: checking for $ac_word" >&5
+echo "configure:1237: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_SED'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1267,7 +1268,7 @@ if test -z "$ac_cv_prog_SED"; then
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1271: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1272: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1305,7 +1306,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1309: checking for a BSD compatible install" >&5
+echo "configure:1310: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1384,12 +1385,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1388: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1389: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1393 "configure"
+#line 1394 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1397,7 +1398,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -1422,7 +1423,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1426: checking for opendir in -ldir" >&5
+echo "configure:1427: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1430,7 +1431,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1434 "configure"
+#line 1435 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1441,7 +1442,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1463,7 +1464,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1467: checking for opendir in -lx" >&5
+echo "configure:1468: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1471,7 +1472,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1475 "configure"
+#line 1476 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1482,7 +1483,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1505,12 +1506,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1509: checking for ANSI C header files" >&5
+echo "configure:1510: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1514 "configure"
+#line 1515 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1518,7 +1519,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1535,7 +1536,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1539 "configure"
+#line 1540 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1553,7 +1554,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1557 "configure"
+#line 1558 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1574,7 +1575,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1578 "configure"
+#line 1579 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1585,7 +1586,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1612,17 +1613,17 @@ for ac_hdr in sys/param.h sys/mman.h sys/time.h sys/cdefs.h fnmatch.h sysent.h s
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1616: checking for $ac_hdr" >&5
+echo "configure:1617: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1621 "configure"
+#line 1622 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1651,12 +1652,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1655: checking for working const" >&5
+echo "configure:1656: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1660 "configure"
+#line 1661 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1705,7 +1706,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1726,21 +1727,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1730: checking for inline" >&5
+echo "configure:1731: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 1738 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1766,12 +1767,12 @@ EOF
 esac
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1770: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1771: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1775 "configure"
+#line 1776 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1780,7 +1781,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1805,12 +1806,12 @@ fi
 for ac_func in socket vsnprintf seteuid setegid random strfmon stpcpy mkstemp gettimeofday setenv unsetenv mkstemps
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1809: checking for $ac_func" >&5
+echo "configure:1810: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1814 "configure"
+#line 1815 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1833,7 +1834,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1866,12 +1867,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1870: checking for pid_t" >&5
+echo "configure:1871: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1875 "configure"
+#line 1876 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1900,17 +1901,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1904: checking for vfork.h" >&5
+echo "configure:1905: checking for vfork.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1909 "configure"
+#line 1910 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1935,18 +1936,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1939: checking for working vfork" >&5
+echo "configure:1940: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:1945: checking for vfork" >&5
+echo "configure:1946: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1950 "configure"
+#line 1951 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -1969,7 +1970,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -1991,7 +1992,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 1995 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2086,7 +2087,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -2113,17 +2114,17 @@ for ac_hdr in ieeefp.h float.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2117: checking for $ac_hdr" >&5
+echo "configure:2118: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2122 "configure"
+#line 2123 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2150,7 +2151,7 @@ fi
 done
 
 echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2154: checking for isinf in -lm" >&5
+echo "configure:2155: checking for isinf in -lm" >&5
 ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2158,7 +2159,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2162 "configure"
+#line 2163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2169,7 +2170,7 @@ int main() {
 isinf()
 ; return 0; }
 EOF
-if { (eval echo configure:2173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2195,7 +2196,7 @@ else
 fi
 
 echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2199: checking for finite in -lm" >&5
+echo "configure:2200: checking for finite in -lm" >&5
 ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2203,7 +2204,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2207 "configure"
+#line 2208 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2214,7 +2215,7 @@ int main() {
 finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2240,7 +2241,7 @@ else
 fi
 
 echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2244: checking for _finite in -lm" >&5
+echo "configure:2245: checking for _finite in -lm" >&5
 ac_lib_var=`echo m'_'_finite | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2248,7 +2249,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2252 "configure"
+#line 2253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2259,7 +2260,7 @@ int main() {
 _finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2285,7 +2286,7 @@ else
 fi
 
 echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2289: checking for isnan in -lm" >&5
+echo "configure:2290: checking for isnan in -lm" >&5
 ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2293,7 +2294,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2297 "configure"
+#line 2298 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2304,7 +2305,7 @@ int main() {
 isnan()
 ; return 0; }
 EOF
-if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2437,6 +2438,7 @@ trap 'rm -fr `echo "Makefile
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/xml/Makefile
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -2539,6 +2541,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/xml/Makefile
 "}
 EOF
diff --git a/WebCore/configure.in b/WebCore/configure.in
index b6f87ee..8740984 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -41,6 +41,7 @@ dnl
 SUBDIRS='
 	src/kdelibs/kjs
 	src/kdelibs/khtml/dom
+	src/kdelibs/khtml/xml
 '
 for subdir in $SUBDIRS; do
 	if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -181,6 +182,7 @@ AC_OUTPUT(
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/xml/Makefile
 )
 
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/khtml/xml/Makefile.in.apple
index c93b1bb..b4799b9 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/khtml/xml/Makefile.in.apple
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #======================================================================
 #
 # Makefile
@@ -38,6 +39,7 @@ LIBRARY = libkhtmlxml.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
+	*.moc \
 	$(NULL)
 
 #----------------------------------------------------------------------
@@ -45,6 +47,11 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
         -I$(TOPSRCDIR)/src/kwq/qt \
+        -I$(TOPSRCDIR)/src/kwq/kdecore \
+        -I../css \
+        -I../dom \
+        -I../html \
+        -I../misc \
         -I.. \
         -I. \
         $(NULL)
@@ -55,6 +62,13 @@ CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
 
 all: $(OBJECTS) $(LIBRARY)
 
+dom_docimpl.cpp: dom_docimpl.moc
+dom_docimpl.moc:
+	touch $@
+xml_tokenizer.cpp: xml_tokenizer.moc
+xml_tokenizer.moc:
+	touch $@
+
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index ea3ff6f..891264b 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -35,7 +35,7 @@ typedef QArray<char> QByteArray;
 class QCString {
 };
 
-inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
-inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
+bool operator!=(const char *s1, const QCString &s2);
+bool operator!=(const QCString &s1, const char *s2);
 
 #endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index 14a9818..24dea55 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -26,10 +26,30 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+#include "qnamespace.h"
 #include "qregion.h"
 
-// all the following events added to support khtmlview.h 
-class QEvent {};
+class QEvent : public Qt {
+public:
+	enum Type {
+		MouseButtonPress,
+		MouseButtonRelease,
+		MouseButtonDblClick,
+		MouseMove,
+	};
+	Type type() const;
+};
+
+class QMouseEvent : public QEvent {
+public:
+	int x();
+	int y();
+	int globalX();
+	int globalY();
+	ButtonState button();
+	ButtonState state();
+};
+
 class QFocusEvent : public QEvent {};
 class QHideEvent : public QEvent {};
 class QKeyEvent : public QEvent {};
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
index 7b48d1a..b7a29fa 100644
--- a/WebCore/kwq/KWQKDebug.h
+++ b/WebCore/kwq/KWQKDebug.h
@@ -34,6 +34,7 @@ typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
 class kdbgstream {
 public:
 	kdbgstream &operator<<(const char *string);
+	kdbgstream &operator<<(const void *p);
 	kdbgstream &operator<<(const QString& string);
 	kdbgstream &operator<<(const QCString& string);
 	kdbgstream &operator<<(KDBGFUNC f);
diff --git a/WebCore/kwq/KWQKLocale.h b/WebCore/kwq/KWQKLocale.h
index 227164f..6cb302b 100644
--- a/WebCore/kwq/KWQKLocale.h
+++ b/WebCore/kwq/KWQKLocale.h
@@ -26,4 +26,6 @@
 #ifndef KLOCALE_H_
 #define KLOCALE_H_
 
+QString i18n(const char* text);
+
 #endif
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index f8a52c0..a2609ac 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -27,6 +27,7 @@
 #define PART_H_
 
 #include <kurl.h>
+#include <qvariant.h>
 
 // added to help in compilation of khtml/khtml_part.h:867
 namespace KIO {
@@ -36,9 +37,6 @@ class Job;
 // forward declaration hack to help in compilation of khtml/khtml_part.h:166
 class QWidget;
 
-// forward declaration hack to help in compilation of khtml/khtml_part.h:249
-class QVariant;
-
 // forward declaration hack to help in compilation of khtml/khtml_part.h:552
 class QCursor;
 
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index 38a6616..34af2a6 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -26,4 +26,16 @@
 #ifndef QNAMESPACE_H_
 #define QNAMESPACE_H_
 
+class Qt {
+public:
+	enum ButtonState {
+		LeftButton,
+		MidButton,
+		RightButton,
+		ControlButton,
+		AltButton,
+		ShiftButton,
+	};
+};
+
 #endif
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 9dc2571..f1eb8cf 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -39,6 +39,8 @@ public:
     void setAutoDelete(bool);
     bool remove(const T *d);
     bool removeLast();
+    void prepend(const T *d);
+    T *take(uint i);
     T *first();
     T *next();
     T *last();
@@ -50,6 +52,7 @@ public:
 template <class T> class QListIterator {
 public:
     QListIterator(const QList<T> &);
+    T *toFirst();
     T *toLast();
     T *current() const;
     T *operator--();
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 6b80e59..1765ab7 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -27,6 +27,9 @@
 #define QRECT_H_
 
 class QRect {
+public:
+	QRect();
+	QRect(int l, int t, int w, int h);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 5f487fb..db3ae02 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -32,6 +32,7 @@
 #include "qcstring.h"
 
 class QRegExp;
+class QString;
 
 class QChar {
 public:
@@ -39,14 +40,20 @@ public:
     QChar(char);
     QChar(const QChar &);
     QChar lower() const;
+    QChar upper() const;
     char latin1() const;
     bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
-    friend int operator==(QChar, QChar);
-    friend int operator!=(QChar, QChar);
+    bool isLetterOrNumber() const;
+    friend inline int operator==(QChar, QChar);
+    friend inline int operator!=(QChar, QChar);
+    friend inline int operator!=(char, QChar);
+    friend inline int operator!=(QChar, char);
     operator char() const;
 
+	static const QChar null;
+
     enum Direction {
         // NOTE: alphabetical order
         DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
@@ -63,22 +70,34 @@ public:
     int toInt(bool *) const;
     bool isNull() const;
     const QChar *unicode() const;
+	bool contains(const char *s, bool b) const;
     uint length() const;
     QString &sprintf(const char *format, ...);
     QString lower() const;
     QString stripWhiteSpace() const;
+    QString simplifyWhiteSpace() 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;
+    int findRev(char c) const;
+
+    QString arg(const QString& a, int fieldwidth=0) const;
+
     QString mid(int index, int len=0xffffffff) const;
+    void fill(QChar c, int len = -1);
+
+    float toFloat(bool *b=0) const;
 
     const char* latin1() const;
     const char *ascii() const;
     // FIXME: is there a standard parameter type for overloaded operators?
     QChar operator[](int) const;
+    QString &operator+(QChar c);
+    QString &operator+(const QString &s);
     QString &operator+=(QChar c);
+    QString &operator+=(const QString &s);
 
     QString &append(const char *);
     QString &append(const QString &);
@@ -94,6 +113,13 @@ public:
     QString(int);
 };
 
+QString &operator+(const char *s1, const QString &s2);
+QString &operator+(QChar c1, const QString &s2);
+bool operator!=(const QString &s1, QChar c2);
+bool operator!=(const QString &s1, const QString &s2);
+bool operator!=(const QString &s1, const char *s2);
+bool operator!=(const char *s1, const QString &s2);
+
 class QConstString {
 public:
     QConstString(QChar *, uint);
diff --git a/WebCore/kwq/KWQTextStream.h b/WebCore/kwq/KWQTextStream.h
index dded77d..4de233e 100644
--- a/WebCore/kwq/KWQTextStream.h
+++ b/WebCore/kwq/KWQTextStream.h
@@ -26,4 +26,13 @@
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
+class QTextStream {
+};
+
+class QTextIStream : public QTextStream {
+public:
+    QTextIStream(QString *);
+    QString readLine();
+};
+
 #endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index 0630ef3..fd9eca5 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -27,6 +27,10 @@
 #define QVALUELIST_H_
 
 template<class T> class QValueListIterator {
+public: 
+    QValueListIterator operator++();
+    bool operator!=(const QValueListIterator<T>& it);
+    T& operator*();
 };
 
 template <class T> class QValueList {
@@ -39,6 +43,7 @@ public:
 	const T& first() const;
 	const T& last() const;
 	Iterator begin();
+	Iterator end();
 	T& operator[] (uint i);
 };
 
diff --git a/WebCore/kwq/KWQVariant.h b/WebCore/kwq/KWQVariant.h
index 7274cd3..d4ebd51 100644
--- a/WebCore/kwq/KWQVariant.h
+++ b/WebCore/kwq/KWQVariant.h
@@ -26,4 +26,7 @@
 #ifndef QVARIANT_H_
 #define QVARIANT_H_
 
+class QVariant {
+};
+
 #endif
diff --git a/WebCore/kwq/KWQXml.h b/WebCore/kwq/KWQXml.h
index aaa35ed..f7a536e 100644
--- a/WebCore/kwq/KWQXml.h
+++ b/WebCore/kwq/KWQXml.h
@@ -26,14 +26,53 @@
 #ifndef QXML_H_
 #define QXML_H_
 
-class QXmlDefaultHandler {
-};
+class QString;
 
 class QXmlAttributes {
+public:
+	QString value(const QString& qName) const;
+	int length() const;
+	QString localName(int index) const;
 };
 
-class QXmlParseException {
+class QXmlInputSource {
+public:
+	virtual void setData(const QString& data);
+};
+
+class QXmlDTDHandler {
+};
+
+class QXmlDeclHandler {
+};
+
+class QXmlErrorHandler {
+};
+
+class QXmlLexicalHandler {
+};
+
+class QXmlContentHandler {
+};
+
+class QXmlDefaultHandler : public QXmlContentHandler, public QXmlLexicalHandler, public QXmlErrorHandler, public QXmlDeclHandler, public QXmlDTDHandler {
 };
 
+class QXmlSimpleReader {
+public:
+	void setContentHandler(QXmlContentHandler* handler);
+	bool parse(const QXmlInputSource& input);
+    void setLexicalHandler(QXmlLexicalHandler* handler);
+    void setDTDHandler(QXmlDTDHandler* handler);
+    void setDeclHandler(QXmlDeclHandler* handler);
+    void setErrorHandler(QXmlErrorHandler* handler);
+};
+
+class QXmlParseException {
+public:
+	QString message() const;
+	int columnNumber() const;
+	int lineNumber() const;
+};
 
 #endif
diff --git a/WebCore/kwq/kdecore/kdebug.h b/WebCore/kwq/kdecore/kdebug.h
index 7b48d1a..b7a29fa 100644
--- a/WebCore/kwq/kdecore/kdebug.h
+++ b/WebCore/kwq/kdecore/kdebug.h
@@ -34,6 +34,7 @@ typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
 class kdbgstream {
 public:
 	kdbgstream &operator<<(const char *string);
+	kdbgstream &operator<<(const void *p);
 	kdbgstream &operator<<(const QString& string);
 	kdbgstream &operator<<(const QCString& string);
 	kdbgstream &operator<<(KDBGFUNC f);
diff --git a/WebCore/kwq/kdecore/klocale.h b/WebCore/kwq/kdecore/klocale.h
index 227164f..6cb302b 100644
--- a/WebCore/kwq/kdecore/klocale.h
+++ b/WebCore/kwq/kdecore/klocale.h
@@ -26,4 +26,6 @@
 #ifndef KLOCALE_H_
 #define KLOCALE_H_
 
+QString i18n(const char* text);
+
 #endif
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
index f8a52c0..a2609ac 100644
--- a/WebCore/kwq/kparts/part.h
+++ b/WebCore/kwq/kparts/part.h
@@ -27,6 +27,7 @@
 #define PART_H_
 
 #include <kurl.h>
+#include <qvariant.h>
 
 // added to help in compilation of khtml/khtml_part.h:867
 namespace KIO {
@@ -36,9 +37,6 @@ class Job;
 // forward declaration hack to help in compilation of khtml/khtml_part.h:166
 class QWidget;
 
-// forward declaration hack to help in compilation of khtml/khtml_part.h:249
-class QVariant;
-
 // forward declaration hack to help in compilation of khtml/khtml_part.h:552
 class QCursor;
 
diff --git a/WebCore/kwq/kwq.h b/WebCore/kwq/kwq.h
index 5a7931f..fe01d9e 100644
--- a/WebCore/kwq/kwq.h
+++ b/WebCore/kwq/kwq.h
@@ -38,4 +38,8 @@ typedef unsigned int Q_UINT32;
 // "dom/css_extensions.h"
 class CSS2AzimuthImpl;
 
+#define QMAX(a,b) ((a) > (b) ? (a) : (b))
+#define TRUE (1)
+#define FALSE (0)
+
 #endif
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index ea3ff6f..891264b 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -35,7 +35,7 @@ typedef QArray<char> QByteArray;
 class QCString {
 };
 
-inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
-inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
+bool operator!=(const char *s1, const QCString &s2);
+bool operator!=(const QCString &s1, const char *s2);
 
 #endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index 14a9818..24dea55 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -26,10 +26,30 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+#include "qnamespace.h"
 #include "qregion.h"
 
-// all the following events added to support khtmlview.h 
-class QEvent {};
+class QEvent : public Qt {
+public:
+	enum Type {
+		MouseButtonPress,
+		MouseButtonRelease,
+		MouseButtonDblClick,
+		MouseMove,
+	};
+	Type type() const;
+};
+
+class QMouseEvent : public QEvent {
+public:
+	int x();
+	int y();
+	int globalX();
+	int globalY();
+	ButtonState button();
+	ButtonState state();
+};
+
 class QFocusEvent : public QEvent {};
 class QHideEvent : public QEvent {};
 class QKeyEvent : public QEvent {};
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 9dc2571..f1eb8cf 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -39,6 +39,8 @@ public:
     void setAutoDelete(bool);
     bool remove(const T *d);
     bool removeLast();
+    void prepend(const T *d);
+    T *take(uint i);
     T *first();
     T *next();
     T *last();
@@ -50,6 +52,7 @@ public:
 template <class T> class QListIterator {
 public:
     QListIterator(const QList<T> &);
+    T *toFirst();
     T *toLast();
     T *current() const;
     T *operator--();
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index 38a6616..34af2a6 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -26,4 +26,16 @@
 #ifndef QNAMESPACE_H_
 #define QNAMESPACE_H_
 
+class Qt {
+public:
+	enum ButtonState {
+		LeftButton,
+		MidButton,
+		RightButton,
+		ControlButton,
+		AltButton,
+		ShiftButton,
+	};
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 6b80e59..1765ab7 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -27,6 +27,9 @@
 #define QRECT_H_
 
 class QRect {
+public:
+	QRect();
+	QRect(int l, int t, int w, int h);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 5f487fb..db3ae02 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -32,6 +32,7 @@
 #include "qcstring.h"
 
 class QRegExp;
+class QString;
 
 class QChar {
 public:
@@ -39,14 +40,20 @@ public:
     QChar(char);
     QChar(const QChar &);
     QChar lower() const;
+    QChar upper() const;
     char latin1() const;
     bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
-    friend int operator==(QChar, QChar);
-    friend int operator!=(QChar, QChar);
+    bool isLetterOrNumber() const;
+    friend inline int operator==(QChar, QChar);
+    friend inline int operator!=(QChar, QChar);
+    friend inline int operator!=(char, QChar);
+    friend inline int operator!=(QChar, char);
     operator char() const;
 
+	static const QChar null;
+
     enum Direction {
         // NOTE: alphabetical order
         DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
@@ -63,22 +70,34 @@ public:
     int toInt(bool *) const;
     bool isNull() const;
     const QChar *unicode() const;
+	bool contains(const char *s, bool b) const;
     uint length() const;
     QString &sprintf(const char *format, ...);
     QString lower() const;
     QString stripWhiteSpace() const;
+    QString simplifyWhiteSpace() 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;
+    int findRev(char c) const;
+
+    QString arg(const QString& a, int fieldwidth=0) const;
+
     QString mid(int index, int len=0xffffffff) const;
+    void fill(QChar c, int len = -1);
+
+    float toFloat(bool *b=0) const;
 
     const char* latin1() const;
     const char *ascii() const;
     // FIXME: is there a standard parameter type for overloaded operators?
     QChar operator[](int) const;
+    QString &operator+(QChar c);
+    QString &operator+(const QString &s);
     QString &operator+=(QChar c);
+    QString &operator+=(const QString &s);
 
     QString &append(const char *);
     QString &append(const QString &);
@@ -94,6 +113,13 @@ public:
     QString(int);
 };
 
+QString &operator+(const char *s1, const QString &s2);
+QString &operator+(QChar c1, const QString &s2);
+bool operator!=(const QString &s1, QChar c2);
+bool operator!=(const QString &s1, const QString &s2);
+bool operator!=(const QString &s1, const char *s2);
+bool operator!=(const char *s1, const QString &s2);
+
 class QConstString {
 public:
     QConstString(QChar *, uint);
diff --git a/WebCore/kwq/qt/qtextstream.h b/WebCore/kwq/qt/qtextstream.h
index dded77d..4de233e 100644
--- a/WebCore/kwq/qt/qtextstream.h
+++ b/WebCore/kwq/qt/qtextstream.h
@@ -26,4 +26,13 @@
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
+class QTextStream {
+};
+
+class QTextIStream : public QTextStream {
+public:
+    QTextIStream(QString *);
+    QString readLine();
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index 0630ef3..fd9eca5 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -27,6 +27,10 @@
 #define QVALUELIST_H_
 
 template<class T> class QValueListIterator {
+public: 
+    QValueListIterator operator++();
+    bool operator!=(const QValueListIterator<T>& it);
+    T& operator*();
 };
 
 template <class T> class QValueList {
@@ -39,6 +43,7 @@ public:
 	const T& first() const;
 	const T& last() const;
 	Iterator begin();
+	Iterator end();
 	T& operator[] (uint i);
 };
 
diff --git a/WebCore/kwq/qt/qvariant.h b/WebCore/kwq/qt/qvariant.h
index 7274cd3..d4ebd51 100644
--- a/WebCore/kwq/qt/qvariant.h
+++ b/WebCore/kwq/qt/qvariant.h
@@ -26,4 +26,7 @@
 #ifndef QVARIANT_H_
 #define QVARIANT_H_
 
+class QVariant {
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qxml.h b/WebCore/kwq/qt/qxml.h
index aaa35ed..f7a536e 100644
--- a/WebCore/kwq/qt/qxml.h
+++ b/WebCore/kwq/qt/qxml.h
@@ -26,14 +26,53 @@
 #ifndef QXML_H_
 #define QXML_H_
 
-class QXmlDefaultHandler {
-};
+class QString;
 
 class QXmlAttributes {
+public:
+	QString value(const QString& qName) const;
+	int length() const;
+	QString localName(int index) const;
 };
 
-class QXmlParseException {
+class QXmlInputSource {
+public:
+	virtual void setData(const QString& data);
+};
+
+class QXmlDTDHandler {
+};
+
+class QXmlDeclHandler {
+};
+
+class QXmlErrorHandler {
+};
+
+class QXmlLexicalHandler {
+};
+
+class QXmlContentHandler {
+};
+
+class QXmlDefaultHandler : public QXmlContentHandler, public QXmlLexicalHandler, public QXmlErrorHandler, public QXmlDeclHandler, public QXmlDTDHandler {
 };
 
+class QXmlSimpleReader {
+public:
+	void setContentHandler(QXmlContentHandler* handler);
+	bool parse(const QXmlInputSource& input);
+    void setLexicalHandler(QXmlLexicalHandler* handler);
+    void setDTDHandler(QXmlDTDHandler* handler);
+    void setDeclHandler(QXmlDeclHandler* handler);
+    void setErrorHandler(QXmlErrorHandler* handler);
+};
+
+class QXmlParseException {
+public:
+	QString message() const;
+	int columnNumber() const;
+	int lineNumber() const;
+};
 
 #endif
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
index c93b1bb..b4799b9 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #======================================================================
 #
 # Makefile
@@ -38,6 +39,7 @@ LIBRARY = libkhtmlxml.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
+	*.moc \
 	$(NULL)
 
 #----------------------------------------------------------------------
@@ -45,6 +47,11 @@ CLEAN_FILES = $(OBJECTS) \
 
 CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
         -I$(TOPSRCDIR)/src/kwq/qt \
+        -I$(TOPSRCDIR)/src/kwq/kdecore \
+        -I../css \
+        -I../dom \
+        -I../html \
+        -I../misc \
         -I.. \
         -I. \
         $(NULL)
@@ -55,6 +62,13 @@ CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
 
 all: $(OBJECTS) $(LIBRARY)
 
+dom_docimpl.cpp: dom_docimpl.moc
+dom_docimpl.moc:
+	touch $@
+xml_tokenizer.cpp: xml_tokenizer.moc
+xml_tokenizer.moc:
+	touch $@
+
 $(LIBRARY): $(CXXOBJECTS)
 	$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
 	$(RANLIB) $(LIBRARY)
diff --git a/WebCore/src/kwq/kdecore/kdebug.h b/WebCore/src/kwq/kdecore/kdebug.h
index 7b48d1a..b7a29fa 100644
--- a/WebCore/src/kwq/kdecore/kdebug.h
+++ b/WebCore/src/kwq/kdecore/kdebug.h
@@ -34,6 +34,7 @@ typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
 class kdbgstream {
 public:
 	kdbgstream &operator<<(const char *string);
+	kdbgstream &operator<<(const void *p);
 	kdbgstream &operator<<(const QString& string);
 	kdbgstream &operator<<(const QCString& string);
 	kdbgstream &operator<<(KDBGFUNC f);
diff --git a/WebCore/src/kwq/kdecore/klocale.h b/WebCore/src/kwq/kdecore/klocale.h
index 227164f..6cb302b 100644
--- a/WebCore/src/kwq/kdecore/klocale.h
+++ b/WebCore/src/kwq/kdecore/klocale.h
@@ -26,4 +26,6 @@
 #ifndef KLOCALE_H_
 #define KLOCALE_H_
 
+QString i18n(const char* text);
+
 #endif
diff --git a/WebCore/src/kwq/kparts/part.h b/WebCore/src/kwq/kparts/part.h
index f8a52c0..a2609ac 100644
--- a/WebCore/src/kwq/kparts/part.h
+++ b/WebCore/src/kwq/kparts/part.h
@@ -27,6 +27,7 @@
 #define PART_H_
 
 #include <kurl.h>
+#include <qvariant.h>
 
 // added to help in compilation of khtml/khtml_part.h:867
 namespace KIO {
@@ -36,9 +37,6 @@ class Job;
 // forward declaration hack to help in compilation of khtml/khtml_part.h:166
 class QWidget;
 
-// forward declaration hack to help in compilation of khtml/khtml_part.h:249
-class QVariant;
-
 // forward declaration hack to help in compilation of khtml/khtml_part.h:552
 class QCursor;
 
diff --git a/WebCore/src/kwq/kwq.h b/WebCore/src/kwq/kwq.h
index 5a7931f..fe01d9e 100644
--- a/WebCore/src/kwq/kwq.h
+++ b/WebCore/src/kwq/kwq.h
@@ -38,4 +38,8 @@ typedef unsigned int Q_UINT32;
 // "dom/css_extensions.h"
 class CSS2AzimuthImpl;
 
+#define QMAX(a,b) ((a) > (b) ? (a) : (b))
+#define TRUE (1)
+#define FALSE (0)
+
 #endif
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index ea3ff6f..891264b 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -35,7 +35,7 @@ typedef QArray<char> QByteArray;
 class QCString {
 };
 
-inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
-inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
+bool operator!=(const char *s1, const QCString &s2);
+bool operator!=(const QCString &s1, const char *s2);
 
 #endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index 14a9818..24dea55 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -26,10 +26,30 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+#include "qnamespace.h"
 #include "qregion.h"
 
-// all the following events added to support khtmlview.h 
-class QEvent {};
+class QEvent : public Qt {
+public:
+	enum Type {
+		MouseButtonPress,
+		MouseButtonRelease,
+		MouseButtonDblClick,
+		MouseMove,
+	};
+	Type type() const;
+};
+
+class QMouseEvent : public QEvent {
+public:
+	int x();
+	int y();
+	int globalX();
+	int globalY();
+	ButtonState button();
+	ButtonState state();
+};
+
 class QFocusEvent : public QEvent {};
 class QHideEvent : public QEvent {};
 class QKeyEvent : public QEvent {};
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 9dc2571..f1eb8cf 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -39,6 +39,8 @@ public:
     void setAutoDelete(bool);
     bool remove(const T *d);
     bool removeLast();
+    void prepend(const T *d);
+    T *take(uint i);
     T *first();
     T *next();
     T *last();
@@ -50,6 +52,7 @@ public:
 template <class T> class QListIterator {
 public:
     QListIterator(const QList<T> &);
+    T *toFirst();
     T *toLast();
     T *current() const;
     T *operator--();
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index 38a6616..34af2a6 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -26,4 +26,16 @@
 #ifndef QNAMESPACE_H_
 #define QNAMESPACE_H_
 
+class Qt {
+public:
+	enum ButtonState {
+		LeftButton,
+		MidButton,
+		RightButton,
+		ControlButton,
+		AltButton,
+		ShiftButton,
+	};
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 6b80e59..1765ab7 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -27,6 +27,9 @@
 #define QRECT_H_
 
 class QRect {
+public:
+	QRect();
+	QRect(int l, int t, int w, int h);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 5f487fb..db3ae02 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -32,6 +32,7 @@
 #include "qcstring.h"
 
 class QRegExp;
+class QString;
 
 class QChar {
 public:
@@ -39,14 +40,20 @@ public:
     QChar(char);
     QChar(const QChar &);
     QChar lower() const;
+    QChar upper() const;
     char latin1() const;
     bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
-    friend int operator==(QChar, QChar);
-    friend int operator!=(QChar, QChar);
+    bool isLetterOrNumber() const;
+    friend inline int operator==(QChar, QChar);
+    friend inline int operator!=(QChar, QChar);
+    friend inline int operator!=(char, QChar);
+    friend inline int operator!=(QChar, char);
     operator char() const;
 
+	static const QChar null;
+
     enum Direction {
         // NOTE: alphabetical order
         DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
@@ -63,22 +70,34 @@ public:
     int toInt(bool *) const;
     bool isNull() const;
     const QChar *unicode() const;
+	bool contains(const char *s, bool b) const;
     uint length() const;
     QString &sprintf(const char *format, ...);
     QString lower() const;
     QString stripWhiteSpace() const;
+    QString simplifyWhiteSpace() 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;
+    int findRev(char c) const;
+
+    QString arg(const QString& a, int fieldwidth=0) const;
+
     QString mid(int index, int len=0xffffffff) const;
+    void fill(QChar c, int len = -1);
+
+    float toFloat(bool *b=0) const;
 
     const char* latin1() const;
     const char *ascii() const;
     // FIXME: is there a standard parameter type for overloaded operators?
     QChar operator[](int) const;
+    QString &operator+(QChar c);
+    QString &operator+(const QString &s);
     QString &operator+=(QChar c);
+    QString &operator+=(const QString &s);
 
     QString &append(const char *);
     QString &append(const QString &);
@@ -94,6 +113,13 @@ public:
     QString(int);
 };
 
+QString &operator+(const char *s1, const QString &s2);
+QString &operator+(QChar c1, const QString &s2);
+bool operator!=(const QString &s1, QChar c2);
+bool operator!=(const QString &s1, const QString &s2);
+bool operator!=(const QString &s1, const char *s2);
+bool operator!=(const char *s1, const QString &s2);
+
 class QConstString {
 public:
     QConstString(QChar *, uint);
diff --git a/WebCore/src/kwq/qt/qtextstream.h b/WebCore/src/kwq/qt/qtextstream.h
index dded77d..4de233e 100644
--- a/WebCore/src/kwq/qt/qtextstream.h
+++ b/WebCore/src/kwq/qt/qtextstream.h
@@ -26,4 +26,13 @@
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
+class QTextStream {
+};
+
+class QTextIStream : public QTextStream {
+public:
+    QTextIStream(QString *);
+    QString readLine();
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index 0630ef3..fd9eca5 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -27,6 +27,10 @@
 #define QVALUELIST_H_
 
 template<class T> class QValueListIterator {
+public: 
+    QValueListIterator operator++();
+    bool operator!=(const QValueListIterator<T>& it);
+    T& operator*();
 };
 
 template <class T> class QValueList {
@@ -39,6 +43,7 @@ public:
 	const T& first() const;
 	const T& last() const;
 	Iterator begin();
+	Iterator end();
 	T& operator[] (uint i);
 };
 
diff --git a/WebCore/src/kwq/qt/qvariant.h b/WebCore/src/kwq/qt/qvariant.h
index 7274cd3..d4ebd51 100644
--- a/WebCore/src/kwq/qt/qvariant.h
+++ b/WebCore/src/kwq/qt/qvariant.h
@@ -26,4 +26,7 @@
 #ifndef QVARIANT_H_
 #define QVARIANT_H_
 
+class QVariant {
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qxml.h b/WebCore/src/kwq/qt/qxml.h
index aaa35ed..f7a536e 100644
--- a/WebCore/src/kwq/qt/qxml.h
+++ b/WebCore/src/kwq/qt/qxml.h
@@ -26,14 +26,53 @@
 #ifndef QXML_H_
 #define QXML_H_
 
-class QXmlDefaultHandler {
-};
+class QString;
 
 class QXmlAttributes {
+public:
+	QString value(const QString& qName) const;
+	int length() const;
+	QString localName(int index) const;
 };
 
-class QXmlParseException {
+class QXmlInputSource {
+public:
+	virtual void setData(const QString& data);
+};
+
+class QXmlDTDHandler {
+};
+
+class QXmlDeclHandler {
+};
+
+class QXmlErrorHandler {
+};
+
+class QXmlLexicalHandler {
+};
+
+class QXmlContentHandler {
+};
+
+class QXmlDefaultHandler : public QXmlContentHandler, public QXmlLexicalHandler, public QXmlErrorHandler, public QXmlDeclHandler, public QXmlDTDHandler {
 };
 
+class QXmlSimpleReader {
+public:
+	void setContentHandler(QXmlContentHandler* handler);
+	bool parse(const QXmlInputSource& input);
+    void setLexicalHandler(QXmlLexicalHandler* handler);
+    void setDTDHandler(QXmlDTDHandler* handler);
+    void setDeclHandler(QXmlDeclHandler* handler);
+    void setErrorHandler(QXmlErrorHandler* handler);
+};
+
+class QXmlParseException {
+public:
+	QString message() const;
+	int columnNumber() const;
+	int lineNumber() const;
+};
 
 #endif

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list