[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit eaaa22cbf2b322a0a5cca9a9161e892e64a499c1
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 31 19:32:45 2001 +0000

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

diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 1571ef4..c7ef168 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -23,6 +23,7 @@ SUBDIRS = \
 	src/kdelibs/khtml/dom \
 	src/kdelibs/khtml/ecma \
 	src/kdelibs/khtml/xml \
+	src/kdelibs/khtml/java \
 	$(NULL)
 
 #----------------------------------------------------------------------
diff --git a/WebCore/configure b/WebCore/configure
index f743716..feadfdd 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -556,11 +556,12 @@ CONFIG_ERR=`pwd`/config.err
 
 SUBDIRS='
 	src/kdelibs/kjs
+	src/kdelibs/khtml/misc
 	src/kdelibs/khtml/css
 	src/kdelibs/khtml/dom
 	src/kdelibs/khtml/ecma
 	src/kdelibs/khtml/xml
-	src/kdelibs/khtml/misc
+	src/kdelibs/khtml/java
 '
 for subdir in $SUBDIRS; do
 	if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -599,7 +600,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:603: checking host system type" >&5
+echo "configure:604: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -630,7 +631,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:634: checking for $ac_word" >&5
+echo "configure:635: 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
@@ -660,7 +661,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:664: checking for $ac_word" >&5
+echo "configure:665: 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
@@ -711,7 +712,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:715: checking for $ac_word" >&5
+echo "configure:716: 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
@@ -743,7 +744,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:748: 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.
@@ -754,12 +755,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 758 "configure"
+#line 759 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:764: \"$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
@@ -785,12 +786,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:789: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:790: 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:794: checking whether we are using GNU C" >&5
+echo "configure:795: 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
@@ -799,7 +800,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:803: \"$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:804: \"$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
@@ -818,7 +819,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:822: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:823: 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
@@ -859,7 +860,7 @@ CXXFLAGS=$CFLAGS
  
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:863: checking how to run the C preprocessor" >&5
+echo "configure:864: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -874,13 +875,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 878 "configure"
+#line 879 "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:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:885: \"$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
   :
@@ -891,13 +892,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 895 "configure"
+#line 896 "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:901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:902: \"$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
   :
@@ -908,13 +909,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 912 "configure"
+#line 913 "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:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:919: \"$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
   :
@@ -941,7 +942,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:945: checking for $ac_word" >&5
+echo "configure:946: 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
@@ -975,7 +976,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:979: checking for yywrap in -l$ac_lib" >&5
+echo "configure:980: 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
@@ -983,7 +984,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 987 "configure"
+#line 988 "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
@@ -994,7 +995,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:999: \"$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
@@ -1017,7 +1018,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1021: checking lex output file root" >&5
+echo "configure:1022: 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
@@ -1038,7 +1039,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:1042: checking whether yytext is a pointer" >&5
+echo "configure:1043: 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
@@ -1050,14 +1051,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 1054 "configure"
+#line 1055 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1062: \"$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
@@ -1083,7 +1084,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:1087: checking for $ac_word" >&5
+echo "configure:1088: 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
@@ -1124,7 +1125,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:1128: checking for $ac_word" >&5
+echo "configure:1129: 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
@@ -1163,7 +1164,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:1167: checking for $ac_word" >&5
+echo "configure:1168: 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
@@ -1199,7 +1200,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:1203: checking for $ac_word" >&5
+echo "configure:1204: 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
@@ -1236,7 +1237,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:1240: checking for $ac_word" >&5
+echo "configure:1241: 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
@@ -1271,7 +1272,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:1275: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1276: 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
@@ -1309,7 +1310,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:1313: checking for a BSD compatible install" >&5
+echo "configure:1314: 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
@@ -1388,12 +1389,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:1392: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1393: 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 1397 "configure"
+#line 1398 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1401,7 +1402,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -1426,7 +1427,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:1430: checking for opendir in -ldir" >&5
+echo "configure:1431: 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
@@ -1434,7 +1435,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1438 "configure"
+#line 1439 "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
@@ -1445,7 +1446,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1450: \"$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
@@ -1467,7 +1468,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1471: checking for opendir in -lx" >&5
+echo "configure:1472: 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
@@ -1475,7 +1476,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1479 "configure"
+#line 1480 "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
@@ -1486,7 +1487,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1491: \"$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
@@ -1509,12 +1510,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1513: checking for ANSI C header files" >&5
+echo "configure:1514: 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 1518 "configure"
+#line 1519 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1522,7 +1523,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1527: \"$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*
@@ -1539,7 +1540,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 1543 "configure"
+#line 1544 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1557,7 +1558,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 1561 "configure"
+#line 1562 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1578,7 +1579,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1582 "configure"
+#line 1583 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1589,7 +1590,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1616,17 +1617,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:1620: checking for $ac_hdr" >&5
+echo "configure:1621: 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 1625 "configure"
+#line 1626 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1631: \"$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*
@@ -1655,12 +1656,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1659: checking for working const" >&5
+echo "configure:1660: 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 1664 "configure"
+#line 1665 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1709,7 +1710,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1730,21 +1731,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1734: checking for inline" >&5
+echo "configure:1735: 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 1741 "configure"
+#line 1742 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1770,12 +1771,12 @@ EOF
 esac
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1774: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1775: 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 1779 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1784,7 +1785,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1809,12 +1810,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:1813: checking for $ac_func" >&5
+echo "configure:1814: 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 1818 "configure"
+#line 1819 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1837,7 +1838,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1842: \"$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
@@ -1870,12 +1871,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:1874: checking for pid_t" >&5
+echo "configure:1875: 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 1879 "configure"
+#line 1880 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1904,17 +1905,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1908: checking for vfork.h" >&5
+echo "configure:1909: 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 1913 "configure"
+#line 1914 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1919: \"$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*
@@ -1939,18 +1940,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1943: checking for working vfork" >&5
+echo "configure:1944: 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:1949: checking for vfork" >&5
+echo "configure:1950: 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 1954 "configure"
+#line 1955 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -1973,7 +1974,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1978: \"$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
@@ -1995,7 +1996,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 1999 "configure"
+#line 2000 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2090,7 +2091,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2095: \"$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
@@ -2117,17 +2118,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:2121: checking for $ac_hdr" >&5
+echo "configure:2122: 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 2126 "configure"
+#line 2127 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2132: \"$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*
@@ -2154,7 +2155,7 @@ fi
 done
 
 echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2158: checking for isinf in -lm" >&5
+echo "configure:2159: 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
@@ -2162,7 +2163,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2166 "configure"
+#line 2167 "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
@@ -2173,7 +2174,7 @@ int main() {
 isinf()
 ; return 0; }
 EOF
-if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2178: \"$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
@@ -2199,7 +2200,7 @@ else
 fi
 
 echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2203: checking for finite in -lm" >&5
+echo "configure:2204: 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
@@ -2207,7 +2208,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2211 "configure"
+#line 2212 "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
@@ -2218,7 +2219,7 @@ int main() {
 finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2223: \"$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
@@ -2244,7 +2245,7 @@ else
 fi
 
 echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2248: checking for _finite in -lm" >&5
+echo "configure:2249: 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
@@ -2252,7 +2253,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2256 "configure"
+#line 2257 "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
@@ -2263,7 +2264,7 @@ int main() {
 _finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2268: \"$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
@@ -2289,7 +2290,7 @@ else
 fi
 
 echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2293: checking for isnan in -lm" >&5
+echo "configure:2294: 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
@@ -2297,7 +2298,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2301 "configure"
+#line 2302 "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
@@ -2308,7 +2309,7 @@ int main() {
 isnan()
 ; return 0; }
 EOF
-if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2313: \"$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
@@ -2441,11 +2442,12 @@ trap 'rm -fr `echo "Makefile
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/misc/Makefile
 	src/kdelibs/khtml/css/Makefile
 	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/ecma/Makefile
 	src/kdelibs/khtml/xml/Makefile
-	src/kdelibs/khtml/misc/Makefile
+	src/kdelibs/khtml/java/Makefile
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2547,11 +2549,12 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/misc/Makefile
 	src/kdelibs/khtml/css/Makefile
 	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/ecma/Makefile
 	src/kdelibs/khtml/xml/Makefile
-	src/kdelibs/khtml/misc/Makefile
+	src/kdelibs/khtml/java/Makefile
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff --git a/WebCore/configure.in b/WebCore/configure.in
index fe76993..889ead8 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -40,11 +40,12 @@ dnl
 
 SUBDIRS='
 	src/kdelibs/kjs
+	src/kdelibs/khtml/misc
 	src/kdelibs/khtml/css
 	src/kdelibs/khtml/dom
 	src/kdelibs/khtml/ecma
 	src/kdelibs/khtml/xml
-	src/kdelibs/khtml/misc
+	src/kdelibs/khtml/java
 '
 for subdir in $SUBDIRS; do
 	if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -185,10 +186,11 @@ AC_OUTPUT(
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/misc/Makefile
 	src/kdelibs/khtml/css/Makefile
 	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/ecma/Makefile
 	src/kdelibs/khtml/xml/Makefile
-	src/kdelibs/khtml/misc/Makefile
+	src/kdelibs/khtml/java/Makefile
 )
 
diff --git a/WebCore/khtml/java/.cvsignore b/WebCore/khtml/java/.cvsignore
index 1b72b7a..b31bca8 100644
--- a/WebCore/khtml/java/.cvsignore
+++ b/WebCore/khtml/java/.cvsignore
@@ -1,8 +1,6 @@
 Makefile
+Makefile.am
 Makefile.in
-libkjava_la.all_cpp.cpp
-*.kdoc
-SunWS_cache
-ir.out
-kjava.policy
-*.kdevprj
+*.kde
+*.dep
+*.moc
diff --git a/WebCore/khtml/dom/MakeSystemChanges.sh b/WebCore/khtml/java/MakeSystemChanges.sh
similarity index 92%
copy from WebCore/khtml/dom/MakeSystemChanges.sh
copy to WebCore/khtml/java/MakeSystemChanges.sh
index 1f814de..b4f74c2 100644
--- a/WebCore/khtml/dom/MakeSystemChanges.sh
+++ b/WebCore/khtml/java/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-FILES='Makefile.am'
+FILES='Makefile.am configure.in.in'
 for file in $FILES; do
         if (test -f "$file"); then
                 A=`grep APPLE $file`
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/khtml/java/Makefile.in.apple
similarity index 69%
copy from WebCore/khtml/xml/Makefile.in.apple
copy to WebCore/khtml/java/Makefile.in.apple
index b4799b9..8a531aa 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/khtml/java/Makefile.in.apple
@@ -19,23 +19,12 @@ include $(TOPSRCDIR)/Makefile.vars
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CXXOBJECTS = \
-	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)
+ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+CXXOBJECTS = $(filter-out javaembed.o,$(ALLOBJECTS))
 
 OBJECTS = $(CXXOBJECTS) 
 
-LIBRARY = libkhtmlxml.a
+LIBRARY = libkhtmljava.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
@@ -45,34 +34,47 @@ CLEAN_FILES = $(OBJECTS) \
 #----------------------------------------------------------------------
 # Set flags for this directory
 
-CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
+CXXFLAGS = -DNEED_BOGUS_X_DEFINES -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)
 
-
 #----------------------------------------------------------------------
 # Set targets for this directory
 
 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)
 
+
+kjavaapplet.cpp: kjavaapplet.moc
+kjavaapplet.moc:
+	touch $@
+
+kjavaappletcontext.cpp: kjavaappletcontext.moc
+kjavaappletcontext.moc:
+	touch $@
+
+kjavaappletserver.cpp: kjavaappletserver.moc
+kjavaappletserver.moc:
+	touch $@
+
+kjavaappletwidget.cpp: kjavaappletwidget.moc
+kjavaappletwidget.moc:
+	touch $@
+
+kjavadownloader.cpp: kjavadownloader.moc
+kjavadownloader.moc:
+	touch $@
+
+kjavaprocess.cpp: kjavaprocess.moc
+kjavaprocess.moc:
+	touch $@
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 11aa075..5fd1d9c 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -32,6 +32,8 @@
 // added to help in compilation of khtml/khtml_part.h:811
 #include "qarray.h"
 
+#include <string.h>
+
 typedef QArray<char> QByteArray;
 
 // added to help in compilation of khtml/dom/html_documnent.cpp:182
diff --git a/WebCore/kwq/KWQFile.h b/WebCore/kwq/KWQFile.h
index 29c57a4..a3f66d7 100644
--- a/WebCore/kwq/KWQFile.h
+++ b/WebCore/kwq/KWQFile.h
@@ -32,6 +32,9 @@ class QFile {
 public:
     QFile();
     QFile(const QString &);
+
+    bool exists() const;
+    static bool exists(const QString &);
     bool open(int);
     void close();
     uint size() const;
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/KWQFrame.h
similarity index 85%
copy from WebCore/kwq/kdecore/kwin.h
copy to WebCore/kwq/KWQFrame.h
index 66b9af5..b4f1609 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -23,17 +23,23 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWIN_H_
-#define KWIN_H_
+#ifndef QFRAME_H_
+#define QFRAME_H_
 
-#include <qrect.h>
+#include "qwidget.h"
 
-class KWin {
+class QFrame : public QWidget {
 public:
-    struct Info {
-        QRect geometry;
+    enum Shape {
+        StyledPanel,
     };
-    static Info info(int win);
+    enum Shadow {
+        Sunken,
+    };
+
+    QFrame(QWidget *parent);
+
+    virtual void setFrameStyle(int);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKConfigBase.h b/WebCore/kwq/KWQKConfigBase.h
index 078f1a1..f365518 100644
--- a/WebCore/kwq/KWQKConfigBase.h
+++ b/WebCore/kwq/KWQKConfigBase.h
@@ -32,7 +32,7 @@ class QString;
 
 class KConfig : public KConfigBase {
 public:
-    KConfig(const QString &);
+    KConfig(const QString &, bool bReadOnly=false);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 7efdd6c..1eeeede 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -34,6 +34,7 @@ class Job : public QObject {
 public:
     int error();
     const QString & errorText();
+    QString errorString();
     virtual void kill(bool quietly = true);
 };
 
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index 4be88ba..c62e633 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -27,6 +27,7 @@
 #define PART_H_
 
 #include <kurl.h>
+#include <qobject.h>
 #include <qvariant.h>
 #include <qlist.h>
 #include <qstringlist.h>
diff --git a/WebCore/kwq/KWQKWin.h b/WebCore/kwq/KWQKWin.h
index 66b9af5..bab24a5 100644
--- a/WebCore/kwq/KWQKWin.h
+++ b/WebCore/kwq/KWQKWin.h
@@ -26,12 +26,15 @@
 #ifndef KWIN_H_
 #define KWIN_H_
 
-#include <qrect.h>
+#include <qobjectdefs.h>
+#include <qstring.h>
 
 class KWin {
 public:
     struct Info {
         QRect geometry;
+        QString name;
+        QString visibleName;
     };
     static Info info(int win);
 };
diff --git a/WebCore/kwq/KWQKWinModule.h b/WebCore/kwq/KWQKWinModule.h
index 391ac43..ae95f51 100644
--- a/WebCore/kwq/KWQKWinModule.h
+++ b/WebCore/kwq/KWQKWinModule.h
@@ -26,11 +26,16 @@
 #ifndef KWINMODULE_H_
 #define KWINMODULE_H_
 
+#include <qobject.h>
+
 class QRect;
 
-class KWinModule {
+class KWinModule : public QObject {
 public:
+    KWinModule(QObject* parent = 0);
+
     QRect workArea(int desktop = - 1) const;
+    void doNotManage(const QString&);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQLabel.h b/WebCore/kwq/KWQLabel.h
index bd753dc..a0ece88 100644
--- a/WebCore/kwq/KWQLabel.h
+++ b/WebCore/kwq/KWQLabel.h
@@ -26,4 +26,14 @@
 #ifndef QLABEL_H_
 #define QLABEL_H_
 
+#include "qframe.h"
+
+class QLabel : public QFrame {
+public:
+     QLabel(QWidget *parent);
+
+     virtual void setText(const QString &);
+     virtual void setAlignment(int);
+};
+
 #endif
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index 18ccd0b..1dce85c 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -26,24 +26,48 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
+#include <kwqdef.h>
+
 template<class K, class T> class QMapIterator {
+public:
+    QMapIterator();
+    QMapIterator(const QMapIterator<K,T>& it);
+
+    const K& key() const;
+    const T& data() const;
+
+    bool operator!=(const QMapIterator<K,T>&) const;
+    T& operator*();
+    const T& operator*() const;
+    QMapIterator<K,T>& operator++();
 };
 
 template<class K, class T> class QMapConstIterator {
 public:
-    bool operator!=(const QMapConstIterator <K, T> &) const;
+    QMapConstIterator();
+    QMapConstIterator(const QMapIterator<K,T>&);
+    const K& key() const;
+    const T& data() const;
+
+    bool operator!=(const QMapConstIterator<K,T>&) const;
     const T &operator*() const;
+    QMapConstIterator<K,T>& operator++();
 };
 
 template <class K, class T> class QMap {
 public:
     typedef QMapIterator<K, T> Iterator;
     typedef QMapConstIterator< K, T> ConstIterator;
+    Iterator begin();
+    Iterator end();
+    ConstIterator begin() const;
     ConstIterator end() const;
     Iterator insert(const K&, const T&);
     ConstIterator find (const K &) const;
     void remove(const K&);
     void clear();
+    uint count() const;
+    
     T& operator[](const K& k);
 };
 
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index f65b1e1..2e94025 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -26,16 +26,18 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 
 template <class T> class QArray {
 public:
+    QArray();
     QArray(int);
     T &at(uint) const;
     T *data() const;
 
     uint size() const;
-    bool resize(uint);
+    bool resize(uint size);
+    QArray<T>& duplicate(const T*, int);
     
     T &operator[](int) const;
 };
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index 4bfe679..ca3a03b 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -39,6 +39,11 @@ public:
         ShiftButton,
     };
 
+    enum AlignmentFlags {
+        AlignCenter,
+        WordBreak,
+    };
+
     static const QColor &black;
 };
 
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index bb4d292..b83ea81 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -26,10 +26,13 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
+#include <kwqdef.h>
+
 // includes added to help in compilation of khtml/khtmlview.h
 #include "qobjectdefs.h"
+#include "qstring.h"
 #include "qevent.h"
-#include "qvariant.h"
+#include "qstringlist.h"
 
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
@@ -39,6 +42,8 @@
 #define emit
 #define Q_OBJECT
 
+class QVariant;
+
 class QObject {
 public:
     QObject(QObject *parent=0, const char *name=0);
@@ -46,9 +51,9 @@ public:
     virtual void setName(const char *);
     QVariant property(const char *name) const;
     bool inherits(const char *) const;
-    static bool connect(const QObject *, const char *, const QObject *, const
-            char *);
+    static bool connect(const QObject *, const char *, const QObject *, const char *);
     bool connect(const QObject *, const char *, const char *) const;
+    static bool disconnect( const QObject *, const char *, const QObject *, const char *);
     int startTimer(int);
     void killTimer(int);
     void killTimers();
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index c10f325..85d7eb4 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -27,7 +27,9 @@
 #define QPIXMAP_H_
 
 #include "qpaintdevice.h"
+#include "qcolor.h"
 #include "qstring.h"
+#include "qnamespace.h"
 
 class QBitmap;
 
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index 508225c..2cf597d 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -26,7 +26,7 @@
 #ifndef QPTRDICT_H_
 #define QPTRDICT_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 #include "qcollection.h"
 
 template <class T> class QPtrDict : public QCollection {
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 4b57487..4e0cb95 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -26,7 +26,7 @@
 #ifndef QLIST_H_
 #define QLIST_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 #include "qcollection.h"
 
 template <class T> class QList {
@@ -39,6 +39,7 @@ public:
     void setAutoDelete(bool);
     bool insert(uint i, const T *);
     bool remove(const T *);
+    bool removeFirst();
     bool removeLast();
     void prepend(const T *);
     T *take(uint i);
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 700a9d1..25393b0 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -26,7 +26,7 @@
 #ifndef QRECT_H_
 #define QRECT_H_
 
-class QSize;
+#include "qsize.h"
 
 class QRect {
 public:
diff --git a/WebCore/kwq/KWQRegExp.h b/WebCore/kwq/KWQRegExp.h
index a278303..ec1c524 100644
--- a/WebCore/kwq/KWQRegExp.h
+++ b/WebCore/kwq/KWQRegExp.h
@@ -26,6 +26,8 @@
 #ifndef QREGEXP_H_
 #define QREGEXP_H_
 
+#include "qstring.h"
+
 class QRegExp {
 public:
     QRegExp(const QString &);
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index eeff647..00aa47b 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -26,6 +26,9 @@
 #ifndef QREGION_H_
 #define QREGION_H_
 
+#include "qobjectdefs.h"
+#include "qrect.h"
+
 class QRegion {
 };
 
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index a18ae04..320bf46 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -26,13 +26,10 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
-#include <kwq.h>
-#include <string.h>
-
 #include "qcstring.h"
-#include "qregexp.h"
 
 class QString;
+class QRegExp;
 
 class QChar {
 public:
@@ -71,6 +68,7 @@ public:
     static QString fromLatin1(const char*, int len = -1);
 
     QString();
+    QString(QChar);
     QString(const QChar *, uint);
     QString(const char *);
     QString(const QByteArray&);
@@ -140,6 +138,10 @@ public:
 
 QString &operator+(const char *, const QString &);
 QString &operator+(QChar, const QString &);
+bool operator==(const QString &, QChar);
+bool operator==(const QString &, const QString &);
+bool operator==(const QString &, const char *);
+bool operator==(const char *, const QString &);
 bool operator!=(const QString &, QChar);
 bool operator!=(const QString &, const QString &);
 bool operator!=(const QString &, const char *);
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/kwq/KWQStringList.h
index 09a697a..6324054 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/kwq/KWQStringList.h
@@ -31,7 +31,7 @@
 
 class QStringList : public QValueList<QString> {
 public:
-    static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
+    static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
     QString join(const QString &sepx ) const;
 };
 
diff --git a/WebCore/kwq/KWQTextStream.h b/WebCore/kwq/KWQTextStream.h
index 4de233e..eb94205 100644
--- a/WebCore/kwq/KWQTextStream.h
+++ b/WebCore/kwq/KWQTextStream.h
@@ -26,7 +26,17 @@
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
+#include "qstring.h"
+
 class QTextStream {
+public:
+     QTextStream();
+     QTextStream(QByteArray, int);
+
+     QTextStream &operator<<(char);
+     QTextStream &operator<<(const char *);
+     QTextStream &operator<<(const QCString&);
+     QTextStream &operator<<(const QString&);
 };
 
 class QTextIStream : public QTextStream {
@@ -35,4 +45,9 @@ public:
     QString readLine();
 };
 
+class QTextOStream : public QTextStream {
+public:
+    QTextOStream(QByteArray ba);
+};
+
 #endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index 1472564..ce9a624 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -28,9 +28,11 @@
 
 template<class T> class QValueListIterator {
 public: 
-    QValueListIterator operator++();
     bool operator!=(const QValueListIterator<T>& it);
     T& operator*();
+    const T& operator*() const;
+    QValueListIterator<T>& operator++();
+    QValueListIterator<T>& operator++(int);
     QValueListIterator<T>& operator--();
 };
 
@@ -64,6 +66,7 @@ public:
     ConstIterator begin() const;
     ConstIterator end() const;
     T& operator[] (uint);
+    const T& operator[] (uint) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 861cac7..e8c1b9a 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -40,8 +40,10 @@ public:
     int width() const;
     int height() const;
     QSize size() const;
+    virtual void resize(int,int);
     void resize(const QSize &);
     QPoint pos() const;
+    virtual void show();
     virtual void move(const QPoint &);
     void move(int, int);
     QWidget *topLevelWidget() const;
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/kdecore/kapp.h
index c06251c..d62cb3e 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/kwq/kdecore/kapp.h
@@ -30,6 +30,7 @@
 #include <dcopclient.h>
 #include <qapplication.h>
 #include <qpalette.h>
+#include <qregexp.h>
 
 #define kapp KApplication::kApplication()
 
diff --git a/WebCore/kwq/kdecore/kconfig.h b/WebCore/kwq/kdecore/kconfig.h
index 078f1a1..f365518 100644
--- a/WebCore/kwq/kdecore/kconfig.h
+++ b/WebCore/kwq/kdecore/kconfig.h
@@ -32,7 +32,7 @@ class QString;
 
 class KConfig : public KConfigBase {
 public:
-    KConfig(const QString &);
+    KConfig(const QString &, bool bReadOnly=false);
 };
 
 #endif
diff --git a/WebCore/kwq/kdecore/kconfigbase.h b/WebCore/kwq/kdecore/kconfigbase.h
index 665ffe5..7073449 100644
--- a/WebCore/kwq/kdecore/kconfigbase.h
+++ b/WebCore/kwq/kdecore/kconfigbase.h
@@ -26,6 +26,15 @@
 #ifndef KCONFIGBASE_H_
 #define KCONFIGBASE_H_
 
+#include <qobject.h>
+#include <qcolor.h>
+#include <qfont.h>
+#include <qdatetime.h>
+#include <qstrlist.h>
+#include <qstringlist.h>
+#include <qvariant.h>
+#include <qmap.h>
+
 class QString;
 class QColor;
 
@@ -35,6 +44,7 @@ public:
     QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
     int readNumEntry(const char *pKey, int nDefault = 0) const;
     unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
+    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
     QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
 };
 
diff --git a/WebCore/kwq/kdecore/kprocess.h b/WebCore/kwq/kdecore/kprocess.h
index 757ef49..6db1dbd 100644
--- a/WebCore/kwq/kdecore/kprocess.h
+++ b/WebCore/kwq/kdecore/kprocess.h
@@ -26,4 +26,25 @@
 #ifndef KPROCESS_H_
 #define KPROCESS_H_
 
+#include <signal.h>
+
+#include <qobject.h>
+#include <qstring.h>
+#include <qstrlist.h>
+
+class KProcess : public QObject {
+public:
+    enum Communication { NoCommunication = 0, Stdin = 1, Stdout = 2, NoRead };
+    enum RunMode { DontCare, NotifyOnExit, Block };
+
+    QStrList *args();
+    bool isRunning() const;
+    bool writeStdin(const char *buffer, int buflen);
+    virtual bool start(RunMode runmode = NotifyOnExit, Communication comm = NoCommunication);
+    virtual bool kill(int signo = SIGTERM);
+    void resume();
+
+    KProcess &operator<<(const QString& arg);
+};
+
 #endif
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/kdecore/kwin.h
index 66b9af5..bab24a5 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/kdecore/kwin.h
@@ -26,12 +26,15 @@
 #ifndef KWIN_H_
 #define KWIN_H_
 
-#include <qrect.h>
+#include <qobjectdefs.h>
+#include <qstring.h>
 
 class KWin {
 public:
     struct Info {
         QRect geometry;
+        QString name;
+        QString visibleName;
     };
     static Info info(int win);
 };
diff --git a/WebCore/kwq/kdecore/kwinmodule.h b/WebCore/kwq/kdecore/kwinmodule.h
index 391ac43..ae95f51 100644
--- a/WebCore/kwq/kdecore/kwinmodule.h
+++ b/WebCore/kwq/kdecore/kwinmodule.h
@@ -26,11 +26,16 @@
 #ifndef KWINMODULE_H_
 #define KWINMODULE_H_
 
+#include <qobject.h>
+
 class QRect;
 
-class KWinModule {
+class KWinModule : public QObject {
 public:
+    KWinModule(QObject* parent = 0);
+
     QRect workArea(int desktop = - 1) const;
+    void doNotManage(const QString&);
 };
 
 #endif
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 7efdd6c..1eeeede 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -34,6 +34,7 @@ class Job : public QObject {
 public:
     int error();
     const QString & errorText();
+    QString errorString();
     virtual void kill(bool quietly = true);
 };
 
diff --git a/WebCore/kwq/kio/kprotocolmanager.h b/WebCore/kwq/kio/kprotocolmanager.h
index 1271727..bcb6cf0 100644
--- a/WebCore/kwq/kio/kprotocolmanager.h
+++ b/WebCore/kwq/kio/kprotocolmanager.h
@@ -31,6 +31,8 @@ class QString;
 class KProtocolManager {
 public:
     static QString userAgentForHost(const QString&);
+    static bool useProxy();
+    static QString httpProxy();
 };
 
 #endif
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
index 4be88ba..c62e633 100644
--- a/WebCore/kwq/kparts/part.h
+++ b/WebCore/kwq/kparts/part.h
@@ -27,6 +27,7 @@
 #define PART_H_
 
 #include <kurl.h>
+#include <qobject.h>
 #include <qvariant.h>
 #include <qlist.h>
 #include <qstringlist.h>
diff --git a/WebCore/kwq/kwq.h b/WebCore/kwq/kwq.h
index cb818b8..09226a0 100644
--- a/WebCore/kwq/kwq.h
+++ b/WebCore/kwq/kwq.h
@@ -23,28 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWQDEF_H_
-#define KWQDEF_H_
+#ifndef KWQ_H_
+#define KWQ_H_
 
 #include <qsize.h>
 #include <qcolor.h>
 #include <qobject.h>
 #include <qvariant.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"
-class CSS2AzimuthImpl;
-
-#define QMAX(a,b) ((a) > (b) ? (a) : (b))
-#define TRUE (1)
-#define FALSE (0)
-
-void qDebug(const char *msg, ...);
-
+#include "kwqdef.h"
 
 #endif
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index f65b1e1..2e94025 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -26,16 +26,18 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 
 template <class T> class QArray {
 public:
+    QArray();
     QArray(int);
     T &at(uint) const;
     T *data() const;
 
     uint size() const;
-    bool resize(uint);
+    bool resize(uint size);
+    QArray<T>& duplicate(const T*, int);
     
     T &operator[](int) const;
 };
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index 11aa075..5fd1d9c 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -32,6 +32,8 @@
 // added to help in compilation of khtml/khtml_part.h:811
 #include "qarray.h"
 
+#include <string.h>
+
 typedef QArray<char> QByteArray;
 
 // added to help in compilation of khtml/dom/html_documnent.cpp:182
diff --git a/WebCore/kwq/qt/qdir.h b/WebCore/kwq/qt/qdir.h
index 9c45091..4e0978d 100644
--- a/WebCore/kwq/qt/qdir.h
+++ b/WebCore/kwq/qt/qdir.h
@@ -26,4 +26,20 @@
 #ifndef QDIR_H_
 #define QDIR_H_
 
+#include "qstring.h"
+#include "qstringlist.h"
+#include "qfile.h"
+
+class QDir {
+public:
+    QDir();
+    QDir(const QString&);
+
+    virtual QString absPath() const;
+    virtual QString absFilePath( const QString &fileName) const;
+    virtual bool cdUp();
+    virtual bool exists(const QString&) const;
+    virtual QStringList entryList(const QString &nameFilter);
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qfile.h b/WebCore/kwq/qt/qfile.h
index 29c57a4..a3f66d7 100644
--- a/WebCore/kwq/qt/qfile.h
+++ b/WebCore/kwq/qt/qfile.h
@@ -32,6 +32,9 @@ class QFile {
 public:
     QFile();
     QFile(const QString &);
+
+    bool exists() const;
+    static bool exists(const QString &);
     bool open(int);
     void close();
     uint size() const;
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/qt/qframe.h
similarity index 85%
copy from WebCore/kwq/kdecore/kwin.h
copy to WebCore/kwq/qt/qframe.h
index 66b9af5..b4f1609 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/qt/qframe.h
@@ -23,17 +23,23 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWIN_H_
-#define KWIN_H_
+#ifndef QFRAME_H_
+#define QFRAME_H_
 
-#include <qrect.h>
+#include "qwidget.h"
 
-class KWin {
+class QFrame : public QWidget {
 public:
-    struct Info {
-        QRect geometry;
+    enum Shape {
+        StyledPanel,
     };
-    static Info info(int win);
+    enum Shadow {
+        Sunken,
+    };
+
+    QFrame(QWidget *parent);
+
+    virtual void setFrameStyle(int);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qlabel.h b/WebCore/kwq/qt/qlabel.h
index bd753dc..a0ece88 100644
--- a/WebCore/kwq/qt/qlabel.h
+++ b/WebCore/kwq/qt/qlabel.h
@@ -26,4 +26,14 @@
 #ifndef QLABEL_H_
 #define QLABEL_H_
 
+#include "qframe.h"
+
+class QLabel : public QFrame {
+public:
+     QLabel(QWidget *parent);
+
+     virtual void setText(const QString &);
+     virtual void setAlignment(int);
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 4b57487..4e0cb95 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -26,7 +26,7 @@
 #ifndef QLIST_H_
 #define QLIST_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 #include "qcollection.h"
 
 template <class T> class QList {
@@ -39,6 +39,7 @@ public:
     void setAutoDelete(bool);
     bool insert(uint i, const T *);
     bool remove(const T *);
+    bool removeFirst();
     bool removeLast();
     void prepend(const T *);
     T *take(uint i);
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index 18ccd0b..1dce85c 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -26,24 +26,48 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
+#include <kwqdef.h>
+
 template<class K, class T> class QMapIterator {
+public:
+    QMapIterator();
+    QMapIterator(const QMapIterator<K,T>& it);
+
+    const K& key() const;
+    const T& data() const;
+
+    bool operator!=(const QMapIterator<K,T>&) const;
+    T& operator*();
+    const T& operator*() const;
+    QMapIterator<K,T>& operator++();
 };
 
 template<class K, class T> class QMapConstIterator {
 public:
-    bool operator!=(const QMapConstIterator <K, T> &) const;
+    QMapConstIterator();
+    QMapConstIterator(const QMapIterator<K,T>&);
+    const K& key() const;
+    const T& data() const;
+
+    bool operator!=(const QMapConstIterator<K,T>&) const;
     const T &operator*() const;
+    QMapConstIterator<K,T>& operator++();
 };
 
 template <class K, class T> class QMap {
 public:
     typedef QMapIterator<K, T> Iterator;
     typedef QMapConstIterator< K, T> ConstIterator;
+    Iterator begin();
+    Iterator end();
+    ConstIterator begin() const;
     ConstIterator end() const;
     Iterator insert(const K&, const T&);
     ConstIterator find (const K &) const;
     void remove(const K&);
     void clear();
+    uint count() const;
+    
     T& operator[](const K& k);
 };
 
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index 4bfe679..ca3a03b 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -39,6 +39,11 @@ public:
         ShiftButton,
     };
 
+    enum AlignmentFlags {
+        AlignCenter,
+        WordBreak,
+    };
+
     static const QColor &black;
 };
 
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index bb4d292..b83ea81 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -26,10 +26,13 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
+#include <kwqdef.h>
+
 // includes added to help in compilation of khtml/khtmlview.h
 #include "qobjectdefs.h"
+#include "qstring.h"
 #include "qevent.h"
-#include "qvariant.h"
+#include "qstringlist.h"
 
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
@@ -39,6 +42,8 @@
 #define emit
 #define Q_OBJECT
 
+class QVariant;
+
 class QObject {
 public:
     QObject(QObject *parent=0, const char *name=0);
@@ -46,9 +51,9 @@ public:
     virtual void setName(const char *);
     QVariant property(const char *name) const;
     bool inherits(const char *) const;
-    static bool connect(const QObject *, const char *, const QObject *, const
-            char *);
+    static bool connect(const QObject *, const char *, const QObject *, const char *);
     bool connect(const QObject *, const char *, const char *) const;
+    static bool disconnect( const QObject *, const char *, const QObject *, const char *);
     int startTimer(int);
     void killTimer(int);
     void killTimers();
diff --git a/WebCore/kwq/qt/qobjectdefs.h b/WebCore/kwq/qt/qobjectdefs.h
index c8409e8..a579215 100644
--- a/WebCore/kwq/qt/qobjectdefs.h
+++ b/WebCore/kwq/qt/qobjectdefs.h
@@ -30,4 +30,26 @@
 
 #define Q_PROPERTY(text)
 
+class QObject;
+class QEvent;
+
+class QPaintDevice;
+class QPaintDeviceMetrics;
+class QWidget;
+class QColor;
+class QColorGroup;
+class QPalette;
+class QPainter;
+class QRegion;
+class QSize;
+class QSizePolicy;
+class QRect;
+class QFont;
+class QFontMetrics;
+class QBrush;
+class QBitmap;
+class QMovie;
+class QTimer;
+class QImage;
+
 #endif
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
index c10f325..85d7eb4 100644
--- a/WebCore/kwq/qt/qpixmap.h
+++ b/WebCore/kwq/qt/qpixmap.h
@@ -27,7 +27,9 @@
 #define QPIXMAP_H_
 
 #include "qpaintdevice.h"
+#include "qcolor.h"
 #include "qstring.h"
+#include "qnamespace.h"
 
 class QBitmap;
 
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
index 508225c..2cf597d 100644
--- a/WebCore/kwq/qt/qptrdict.h
+++ b/WebCore/kwq/qt/qptrdict.h
@@ -26,7 +26,7 @@
 #ifndef QPTRDICT_H_
 #define QPTRDICT_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 #include "qcollection.h"
 
 template <class T> class QPtrDict : public QCollection {
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 700a9d1..25393b0 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -26,7 +26,7 @@
 #ifndef QRECT_H_
 #define QRECT_H_
 
-class QSize;
+#include "qsize.h"
 
 class QRect {
 public:
diff --git a/WebCore/kwq/qt/qregexp.h b/WebCore/kwq/qt/qregexp.h
index a278303..ec1c524 100644
--- a/WebCore/kwq/qt/qregexp.h
+++ b/WebCore/kwq/qt/qregexp.h
@@ -26,6 +26,8 @@
 #ifndef QREGEXP_H_
 #define QREGEXP_H_
 
+#include "qstring.h"
+
 class QRegExp {
 public:
     QRegExp(const QString &);
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index eeff647..00aa47b 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -26,6 +26,9 @@
 #ifndef QREGION_H_
 #define QREGION_H_
 
+#include "qobjectdefs.h"
+#include "qrect.h"
+
 class QRegion {
 };
 
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index a18ae04..320bf46 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -26,13 +26,10 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
-#include <kwq.h>
-#include <string.h>
-
 #include "qcstring.h"
-#include "qregexp.h"
 
 class QString;
+class QRegExp;
 
 class QChar {
 public:
@@ -71,6 +68,7 @@ public:
     static QString fromLatin1(const char*, int len = -1);
 
     QString();
+    QString(QChar);
     QString(const QChar *, uint);
     QString(const char *);
     QString(const QByteArray&);
@@ -140,6 +138,10 @@ public:
 
 QString &operator+(const char *, const QString &);
 QString &operator+(QChar, const QString &);
+bool operator==(const QString &, QChar);
+bool operator==(const QString &, const QString &);
+bool operator==(const QString &, const char *);
+bool operator==(const char *, const QString &);
 bool operator!=(const QString &, QChar);
 bool operator!=(const QString &, const QString &);
 bool operator!=(const QString &, const char *);
diff --git a/WebCore/kwq/qt/qstringlist.h b/WebCore/kwq/qt/qstringlist.h
index 09a697a..6324054 100644
--- a/WebCore/kwq/qt/qstringlist.h
+++ b/WebCore/kwq/qt/qstringlist.h
@@ -31,7 +31,7 @@
 
 class QStringList : public QValueList<QString> {
 public:
-    static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
+    static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
     QString join(const QString &sepx ) const;
 };
 
diff --git a/WebCore/kwq/qt/qtextstream.h b/WebCore/kwq/qt/qtextstream.h
index 4de233e..eb94205 100644
--- a/WebCore/kwq/qt/qtextstream.h
+++ b/WebCore/kwq/qt/qtextstream.h
@@ -26,7 +26,17 @@
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
+#include "qstring.h"
+
 class QTextStream {
+public:
+     QTextStream();
+     QTextStream(QByteArray, int);
+
+     QTextStream &operator<<(char);
+     QTextStream &operator<<(const char *);
+     QTextStream &operator<<(const QCString&);
+     QTextStream &operator<<(const QString&);
 };
 
 class QTextIStream : public QTextStream {
@@ -35,4 +45,9 @@ public:
     QString readLine();
 };
 
+class QTextOStream : public QTextStream {
+public:
+    QTextOStream(QByteArray ba);
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index 1472564..ce9a624 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -28,9 +28,11 @@
 
 template<class T> class QValueListIterator {
 public: 
-    QValueListIterator operator++();
     bool operator!=(const QValueListIterator<T>& it);
     T& operator*();
+    const T& operator*() const;
+    QValueListIterator<T>& operator++();
+    QValueListIterator<T>& operator++(int);
     QValueListIterator<T>& operator--();
 };
 
@@ -64,6 +66,7 @@ public:
     ConstIterator begin() const;
     ConstIterator end() const;
     T& operator[] (uint);
+    const T& operator[] (uint) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 861cac7..e8c1b9a 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -40,8 +40,10 @@ public:
     int width() const;
     int height() const;
     QSize size() const;
+    virtual void resize(int,int);
     void resize(const QSize &);
     QPoint pos() const;
+    virtual void show();
     virtual void move(const QPoint &);
     void move(int, int);
     QWidget *topLevelWidget() const;
diff --git a/WebCore/src/kdelibs/khtml/java/.cvsignore b/WebCore/src/kdelibs/khtml/java/.cvsignore
index 1b72b7a..b31bca8 100644
--- a/WebCore/src/kdelibs/khtml/java/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/java/.cvsignore
@@ -1,8 +1,6 @@
 Makefile
+Makefile.am
 Makefile.in
-libkjava_la.all_cpp.cpp
-*.kdoc
-SunWS_cache
-ir.out
-kjava.policy
-*.kdevprj
+*.kde
+*.dep
+*.moc
diff --git a/WebCore/khtml/dom/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh
similarity index 92%
copy from WebCore/khtml/dom/MakeSystemChanges.sh
copy to WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh
index 1f814de..b4f74c2 100644
--- a/WebCore/khtml/dom/MakeSystemChanges.sh
+++ b/WebCore/src/kdelibs/khtml/java/MakeSystemChanges.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-FILES='Makefile.am'
+FILES='Makefile.am configure.in.in'
 for file in $FILES; do
         if (test -f "$file"); then
                 A=`grep APPLE $file`
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
similarity index 69%
copy from WebCore/khtml/xml/Makefile.in.apple
copy to WebCore/src/kdelibs/khtml/java/Makefile.in.apple
index b4799b9..8a531aa 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
@@ -19,23 +19,12 @@ include $(TOPSRCDIR)/Makefile.vars
 #----------------------------------------------------------------------
 # Set variables for this directory
 
-CXXOBJECTS = \
-	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)
+ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
+CXXOBJECTS = $(filter-out javaembed.o,$(ALLOBJECTS))
 
 OBJECTS = $(CXXOBJECTS) 
 
-LIBRARY = libkhtmlxml.a
+LIBRARY = libkhtmljava.a
 
 CLEAN_FILES = $(OBJECTS) \
 	$(LIBRARY) \
@@ -45,34 +34,47 @@ CLEAN_FILES = $(OBJECTS) \
 #----------------------------------------------------------------------
 # Set flags for this directory
 
-CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
+CXXFLAGS = -DNEED_BOGUS_X_DEFINES -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)
 
-
 #----------------------------------------------------------------------
 # Set targets for this directory
 
 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)
 
+
+kjavaapplet.cpp: kjavaapplet.moc
+kjavaapplet.moc:
+	touch $@
+
+kjavaappletcontext.cpp: kjavaappletcontext.moc
+kjavaappletcontext.moc:
+	touch $@
+
+kjavaappletserver.cpp: kjavaappletserver.moc
+kjavaappletserver.moc:
+	touch $@
+
+kjavaappletwidget.cpp: kjavaappletwidget.moc
+kjavaappletwidget.moc:
+	touch $@
+
+kjavadownloader.cpp: kjavadownloader.moc
+kjavadownloader.moc:
+	touch $@
+
+kjavaprocess.cpp: kjavaprocess.moc
+kjavaprocess.moc:
+	touch $@
+
 #----------------------------------------------------------------------
 # include make rules boilerplate
 
diff --git a/WebCore/src/kwq/kdecore/kapp.h b/WebCore/src/kwq/kdecore/kapp.h
index c06251c..d62cb3e 100644
--- a/WebCore/src/kwq/kdecore/kapp.h
+++ b/WebCore/src/kwq/kdecore/kapp.h
@@ -30,6 +30,7 @@
 #include <dcopclient.h>
 #include <qapplication.h>
 #include <qpalette.h>
+#include <qregexp.h>
 
 #define kapp KApplication::kApplication()
 
diff --git a/WebCore/src/kwq/kdecore/kconfig.h b/WebCore/src/kwq/kdecore/kconfig.h
index 078f1a1..f365518 100644
--- a/WebCore/src/kwq/kdecore/kconfig.h
+++ b/WebCore/src/kwq/kdecore/kconfig.h
@@ -32,7 +32,7 @@ class QString;
 
 class KConfig : public KConfigBase {
 public:
-    KConfig(const QString &);
+    KConfig(const QString &, bool bReadOnly=false);
 };
 
 #endif
diff --git a/WebCore/src/kwq/kdecore/kconfigbase.h b/WebCore/src/kwq/kdecore/kconfigbase.h
index 665ffe5..7073449 100644
--- a/WebCore/src/kwq/kdecore/kconfigbase.h
+++ b/WebCore/src/kwq/kdecore/kconfigbase.h
@@ -26,6 +26,15 @@
 #ifndef KCONFIGBASE_H_
 #define KCONFIGBASE_H_
 
+#include <qobject.h>
+#include <qcolor.h>
+#include <qfont.h>
+#include <qdatetime.h>
+#include <qstrlist.h>
+#include <qstringlist.h>
+#include <qvariant.h>
+#include <qmap.h>
+
 class QString;
 class QColor;
 
@@ -35,6 +44,7 @@ public:
     QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
     int readNumEntry(const char *pKey, int nDefault = 0) const;
     unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
+    bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
     QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
 };
 
diff --git a/WebCore/src/kwq/kdecore/kprocess.h b/WebCore/src/kwq/kdecore/kprocess.h
index 757ef49..6db1dbd 100644
--- a/WebCore/src/kwq/kdecore/kprocess.h
+++ b/WebCore/src/kwq/kdecore/kprocess.h
@@ -26,4 +26,25 @@
 #ifndef KPROCESS_H_
 #define KPROCESS_H_
 
+#include <signal.h>
+
+#include <qobject.h>
+#include <qstring.h>
+#include <qstrlist.h>
+
+class KProcess : public QObject {
+public:
+    enum Communication { NoCommunication = 0, Stdin = 1, Stdout = 2, NoRead };
+    enum RunMode { DontCare, NotifyOnExit, Block };
+
+    QStrList *args();
+    bool isRunning() const;
+    bool writeStdin(const char *buffer, int buflen);
+    virtual bool start(RunMode runmode = NotifyOnExit, Communication comm = NoCommunication);
+    virtual bool kill(int signo = SIGTERM);
+    void resume();
+
+    KProcess &operator<<(const QString& arg);
+};
+
 #endif
diff --git a/WebCore/src/kwq/kdecore/kwin.h b/WebCore/src/kwq/kdecore/kwin.h
index 66b9af5..bab24a5 100644
--- a/WebCore/src/kwq/kdecore/kwin.h
+++ b/WebCore/src/kwq/kdecore/kwin.h
@@ -26,12 +26,15 @@
 #ifndef KWIN_H_
 #define KWIN_H_
 
-#include <qrect.h>
+#include <qobjectdefs.h>
+#include <qstring.h>
 
 class KWin {
 public:
     struct Info {
         QRect geometry;
+        QString name;
+        QString visibleName;
     };
     static Info info(int win);
 };
diff --git a/WebCore/src/kwq/kdecore/kwinmodule.h b/WebCore/src/kwq/kdecore/kwinmodule.h
index 391ac43..ae95f51 100644
--- a/WebCore/src/kwq/kdecore/kwinmodule.h
+++ b/WebCore/src/kwq/kdecore/kwinmodule.h
@@ -26,11 +26,16 @@
 #ifndef KWINMODULE_H_
 #define KWINMODULE_H_
 
+#include <qobject.h>
+
 class QRect;
 
-class KWinModule {
+class KWinModule : public QObject {
 public:
+    KWinModule(QObject* parent = 0);
+
     QRect workArea(int desktop = - 1) const;
+    void doNotManage(const QString&);
 };
 
 #endif
diff --git a/WebCore/src/kwq/kio/jobclasses.h b/WebCore/src/kwq/kio/jobclasses.h
index 7efdd6c..1eeeede 100644
--- a/WebCore/src/kwq/kio/jobclasses.h
+++ b/WebCore/src/kwq/kio/jobclasses.h
@@ -34,6 +34,7 @@ class Job : public QObject {
 public:
     int error();
     const QString & errorText();
+    QString errorString();
     virtual void kill(bool quietly = true);
 };
 
diff --git a/WebCore/src/kwq/kio/kprotocolmanager.h b/WebCore/src/kwq/kio/kprotocolmanager.h
index 1271727..bcb6cf0 100644
--- a/WebCore/src/kwq/kio/kprotocolmanager.h
+++ b/WebCore/src/kwq/kio/kprotocolmanager.h
@@ -31,6 +31,8 @@ class QString;
 class KProtocolManager {
 public:
     static QString userAgentForHost(const QString&);
+    static bool useProxy();
+    static QString httpProxy();
 };
 
 #endif
diff --git a/WebCore/src/kwq/kparts/part.h b/WebCore/src/kwq/kparts/part.h
index 4be88ba..c62e633 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 <qobject.h>
 #include <qvariant.h>
 #include <qlist.h>
 #include <qstringlist.h>
diff --git a/WebCore/src/kwq/kwq.h b/WebCore/src/kwq/kwq.h
index cb818b8..09226a0 100644
--- a/WebCore/src/kwq/kwq.h
+++ b/WebCore/src/kwq/kwq.h
@@ -23,28 +23,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWQDEF_H_
-#define KWQDEF_H_
+#ifndef KWQ_H_
+#define KWQ_H_
 
 #include <qsize.h>
 #include <qcolor.h>
 #include <qobject.h>
 #include <qvariant.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"
-class CSS2AzimuthImpl;
-
-#define QMAX(a,b) ((a) > (b) ? (a) : (b))
-#define TRUE (1)
-#define FALSE (0)
-
-void qDebug(const char *msg, ...);
-
+#include "kwqdef.h"
 
 #endif
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index f65b1e1..2e94025 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -26,16 +26,18 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 
 template <class T> class QArray {
 public:
+    QArray();
     QArray(int);
     T &at(uint) const;
     T *data() const;
 
     uint size() const;
-    bool resize(uint);
+    bool resize(uint size);
+    QArray<T>& duplicate(const T*, int);
     
     T &operator[](int) const;
 };
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index 11aa075..5fd1d9c 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -32,6 +32,8 @@
 // added to help in compilation of khtml/khtml_part.h:811
 #include "qarray.h"
 
+#include <string.h>
+
 typedef QArray<char> QByteArray;
 
 // added to help in compilation of khtml/dom/html_documnent.cpp:182
diff --git a/WebCore/src/kwq/qt/qdir.h b/WebCore/src/kwq/qt/qdir.h
index 9c45091..4e0978d 100644
--- a/WebCore/src/kwq/qt/qdir.h
+++ b/WebCore/src/kwq/qt/qdir.h
@@ -26,4 +26,20 @@
 #ifndef QDIR_H_
 #define QDIR_H_
 
+#include "qstring.h"
+#include "qstringlist.h"
+#include "qfile.h"
+
+class QDir {
+public:
+    QDir();
+    QDir(const QString&);
+
+    virtual QString absPath() const;
+    virtual QString absFilePath( const QString &fileName) const;
+    virtual bool cdUp();
+    virtual bool exists(const QString&) const;
+    virtual QStringList entryList(const QString &nameFilter);
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qfile.h b/WebCore/src/kwq/qt/qfile.h
index 29c57a4..a3f66d7 100644
--- a/WebCore/src/kwq/qt/qfile.h
+++ b/WebCore/src/kwq/qt/qfile.h
@@ -32,6 +32,9 @@ class QFile {
 public:
     QFile();
     QFile(const QString &);
+
+    bool exists() const;
+    static bool exists(const QString &);
     bool open(int);
     void close();
     uint size() const;
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/src/kwq/qt/qframe.h
similarity index 85%
copy from WebCore/kwq/kdecore/kwin.h
copy to WebCore/src/kwq/qt/qframe.h
index 66b9af5..b4f1609 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/src/kwq/qt/qframe.h
@@ -23,17 +23,23 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KWIN_H_
-#define KWIN_H_
+#ifndef QFRAME_H_
+#define QFRAME_H_
 
-#include <qrect.h>
+#include "qwidget.h"
 
-class KWin {
+class QFrame : public QWidget {
 public:
-    struct Info {
-        QRect geometry;
+    enum Shape {
+        StyledPanel,
     };
-    static Info info(int win);
+    enum Shadow {
+        Sunken,
+    };
+
+    QFrame(QWidget *parent);
+
+    virtual void setFrameStyle(int);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qlabel.h b/WebCore/src/kwq/qt/qlabel.h
index bd753dc..a0ece88 100644
--- a/WebCore/src/kwq/qt/qlabel.h
+++ b/WebCore/src/kwq/qt/qlabel.h
@@ -26,4 +26,14 @@
 #ifndef QLABEL_H_
 #define QLABEL_H_
 
+#include "qframe.h"
+
+class QLabel : public QFrame {
+public:
+     QLabel(QWidget *parent);
+
+     virtual void setText(const QString &);
+     virtual void setAlignment(int);
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 4b57487..4e0cb95 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -26,7 +26,7 @@
 #ifndef QLIST_H_
 #define QLIST_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 #include "qcollection.h"
 
 template <class T> class QList {
@@ -39,6 +39,7 @@ public:
     void setAutoDelete(bool);
     bool insert(uint i, const T *);
     bool remove(const T *);
+    bool removeFirst();
     bool removeLast();
     void prepend(const T *);
     T *take(uint i);
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index 18ccd0b..1dce85c 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -26,24 +26,48 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
+#include <kwqdef.h>
+
 template<class K, class T> class QMapIterator {
+public:
+    QMapIterator();
+    QMapIterator(const QMapIterator<K,T>& it);
+
+    const K& key() const;
+    const T& data() const;
+
+    bool operator!=(const QMapIterator<K,T>&) const;
+    T& operator*();
+    const T& operator*() const;
+    QMapIterator<K,T>& operator++();
 };
 
 template<class K, class T> class QMapConstIterator {
 public:
-    bool operator!=(const QMapConstIterator <K, T> &) const;
+    QMapConstIterator();
+    QMapConstIterator(const QMapIterator<K,T>&);
+    const K& key() const;
+    const T& data() const;
+
+    bool operator!=(const QMapConstIterator<K,T>&) const;
     const T &operator*() const;
+    QMapConstIterator<K,T>& operator++();
 };
 
 template <class K, class T> class QMap {
 public:
     typedef QMapIterator<K, T> Iterator;
     typedef QMapConstIterator< K, T> ConstIterator;
+    Iterator begin();
+    Iterator end();
+    ConstIterator begin() const;
     ConstIterator end() const;
     Iterator insert(const K&, const T&);
     ConstIterator find (const K &) const;
     void remove(const K&);
     void clear();
+    uint count() const;
+    
     T& operator[](const K& k);
 };
 
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index 4bfe679..ca3a03b 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -39,6 +39,11 @@ public:
         ShiftButton,
     };
 
+    enum AlignmentFlags {
+        AlignCenter,
+        WordBreak,
+    };
+
     static const QColor &black;
 };
 
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index bb4d292..b83ea81 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -26,10 +26,13 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
+#include <kwqdef.h>
+
 // includes added to help in compilation of khtml/khtmlview.h
 #include "qobjectdefs.h"
+#include "qstring.h"
 #include "qevent.h"
-#include "qvariant.h"
+#include "qstringlist.h"
 
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
@@ -39,6 +42,8 @@
 #define emit
 #define Q_OBJECT
 
+class QVariant;
+
 class QObject {
 public:
     QObject(QObject *parent=0, const char *name=0);
@@ -46,9 +51,9 @@ public:
     virtual void setName(const char *);
     QVariant property(const char *name) const;
     bool inherits(const char *) const;
-    static bool connect(const QObject *, const char *, const QObject *, const
-            char *);
+    static bool connect(const QObject *, const char *, const QObject *, const char *);
     bool connect(const QObject *, const char *, const char *) const;
+    static bool disconnect( const QObject *, const char *, const QObject *, const char *);
     int startTimer(int);
     void killTimer(int);
     void killTimers();
diff --git a/WebCore/src/kwq/qt/qobjectdefs.h b/WebCore/src/kwq/qt/qobjectdefs.h
index c8409e8..a579215 100644
--- a/WebCore/src/kwq/qt/qobjectdefs.h
+++ b/WebCore/src/kwq/qt/qobjectdefs.h
@@ -30,4 +30,26 @@
 
 #define Q_PROPERTY(text)
 
+class QObject;
+class QEvent;
+
+class QPaintDevice;
+class QPaintDeviceMetrics;
+class QWidget;
+class QColor;
+class QColorGroup;
+class QPalette;
+class QPainter;
+class QRegion;
+class QSize;
+class QSizePolicy;
+class QRect;
+class QFont;
+class QFontMetrics;
+class QBrush;
+class QBitmap;
+class QMovie;
+class QTimer;
+class QImage;
+
 #endif
diff --git a/WebCore/src/kwq/qt/qpixmap.h b/WebCore/src/kwq/qt/qpixmap.h
index c10f325..85d7eb4 100644
--- a/WebCore/src/kwq/qt/qpixmap.h
+++ b/WebCore/src/kwq/qt/qpixmap.h
@@ -27,7 +27,9 @@
 #define QPIXMAP_H_
 
 #include "qpaintdevice.h"
+#include "qcolor.h"
 #include "qstring.h"
+#include "qnamespace.h"
 
 class QBitmap;
 
diff --git a/WebCore/src/kwq/qt/qptrdict.h b/WebCore/src/kwq/qt/qptrdict.h
index 508225c..2cf597d 100644
--- a/WebCore/src/kwq/qt/qptrdict.h
+++ b/WebCore/src/kwq/qt/qptrdict.h
@@ -26,7 +26,7 @@
 #ifndef QPTRDICT_H_
 #define QPTRDICT_H_
 
-#include <kwq.h>
+#include <kwqdef.h>
 #include "qcollection.h"
 
 template <class T> class QPtrDict : public QCollection {
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 700a9d1..25393b0 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -26,7 +26,7 @@
 #ifndef QRECT_H_
 #define QRECT_H_
 
-class QSize;
+#include "qsize.h"
 
 class QRect {
 public:
diff --git a/WebCore/src/kwq/qt/qregexp.h b/WebCore/src/kwq/qt/qregexp.h
index a278303..ec1c524 100644
--- a/WebCore/src/kwq/qt/qregexp.h
+++ b/WebCore/src/kwq/qt/qregexp.h
@@ -26,6 +26,8 @@
 #ifndef QREGEXP_H_
 #define QREGEXP_H_
 
+#include "qstring.h"
+
 class QRegExp {
 public:
     QRegExp(const QString &);
diff --git a/WebCore/src/kwq/qt/qregion.h b/WebCore/src/kwq/qt/qregion.h
index eeff647..00aa47b 100644
--- a/WebCore/src/kwq/qt/qregion.h
+++ b/WebCore/src/kwq/qt/qregion.h
@@ -26,6 +26,9 @@
 #ifndef QREGION_H_
 #define QREGION_H_
 
+#include "qobjectdefs.h"
+#include "qrect.h"
+
 class QRegion {
 };
 
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index a18ae04..320bf46 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -26,13 +26,10 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
-#include <kwq.h>
-#include <string.h>
-
 #include "qcstring.h"
-#include "qregexp.h"
 
 class QString;
+class QRegExp;
 
 class QChar {
 public:
@@ -71,6 +68,7 @@ public:
     static QString fromLatin1(const char*, int len = -1);
 
     QString();
+    QString(QChar);
     QString(const QChar *, uint);
     QString(const char *);
     QString(const QByteArray&);
@@ -140,6 +138,10 @@ public:
 
 QString &operator+(const char *, const QString &);
 QString &operator+(QChar, const QString &);
+bool operator==(const QString &, QChar);
+bool operator==(const QString &, const QString &);
+bool operator==(const QString &, const char *);
+bool operator==(const char *, const QString &);
 bool operator!=(const QString &, QChar);
 bool operator!=(const QString &, const QString &);
 bool operator!=(const QString &, const char *);
diff --git a/WebCore/src/kwq/qt/qstringlist.h b/WebCore/src/kwq/qt/qstringlist.h
index 09a697a..6324054 100644
--- a/WebCore/src/kwq/qt/qstringlist.h
+++ b/WebCore/src/kwq/qt/qstringlist.h
@@ -31,7 +31,7 @@
 
 class QStringList : public QValueList<QString> {
 public:
-    static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
+    static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
     QString join(const QString &sepx ) const;
 };
 
diff --git a/WebCore/src/kwq/qt/qtextstream.h b/WebCore/src/kwq/qt/qtextstream.h
index 4de233e..eb94205 100644
--- a/WebCore/src/kwq/qt/qtextstream.h
+++ b/WebCore/src/kwq/qt/qtextstream.h
@@ -26,7 +26,17 @@
 #ifndef QTEXTSTREAM_H_
 #define QTEXTSTREAM_H_
 
+#include "qstring.h"
+
 class QTextStream {
+public:
+     QTextStream();
+     QTextStream(QByteArray, int);
+
+     QTextStream &operator<<(char);
+     QTextStream &operator<<(const char *);
+     QTextStream &operator<<(const QCString&);
+     QTextStream &operator<<(const QString&);
 };
 
 class QTextIStream : public QTextStream {
@@ -35,4 +45,9 @@ public:
     QString readLine();
 };
 
+class QTextOStream : public QTextStream {
+public:
+    QTextOStream(QByteArray ba);
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index 1472564..ce9a624 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -28,9 +28,11 @@
 
 template<class T> class QValueListIterator {
 public: 
-    QValueListIterator operator++();
     bool operator!=(const QValueListIterator<T>& it);
     T& operator*();
+    const T& operator*() const;
+    QValueListIterator<T>& operator++();
+    QValueListIterator<T>& operator++(int);
     QValueListIterator<T>& operator--();
 };
 
@@ -64,6 +66,7 @@ public:
     ConstIterator begin() const;
     ConstIterator end() const;
     T& operator[] (uint);
+    const T& operator[] (uint) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 861cac7..e8c1b9a 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -40,8 +40,10 @@ public:
     int width() const;
     int height() const;
     QSize size() const;
+    virtual void resize(int,int);
     void resize(const QSize &);
     QPoint pos() const;
+    virtual void show();
     virtual void move(const QPoint &);
     void move(int, int);
     QWidget *topLevelWidget() const;

-- 
WebKit Debian packaging