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

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

    Finished getting khtml/css to compile
    Added khtml/css to build system
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@45 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 0193526..674c449 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -18,6 +18,7 @@ include $(TOPSRCDIR)/Makefile.vars
 
 SUBDIRS = \
 	src/kdelibs/kjs \
+	src/kdelibs/khtml/css \
 	src/kdelibs/khtml/dom \
 	src/kdelibs/khtml/xml \
 	$(NULL)
diff --git a/WebCore/configure b/WebCore/configure
index 2cbda4b..c158efd 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -556,6 +556,7 @@ CONFIG_ERR=`pwd`/config.err
 
 SUBDIRS='
 	src/kdelibs/kjs
+	src/kdelibs/khtml/css
 	src/kdelibs/khtml/dom
 	src/kdelibs/khtml/xml
 '
@@ -596,7 +597,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:600: checking host system type" >&5
+echo "configure:601: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -627,7 +628,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:631: checking for $ac_word" >&5
+echo "configure:632: 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
@@ -657,7 +658,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:661: checking for $ac_word" >&5
+echo "configure:662: 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
@@ -708,7 +709,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:712: checking for $ac_word" >&5
+echo "configure:713: 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
@@ -740,7 +741,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:744: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:745: 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.
@@ -751,12 +752,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 755 "configure"
+#line 756 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:761: \"$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
@@ -782,12 +783,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:786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:787: 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:791: checking whether we are using GNU C" >&5
+echo "configure:792: 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
@@ -796,7 +797,7 @@ else
   yes;
 #endif
 EOF
-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
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:801: \"$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
@@ -815,7 +816,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:819: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:820: 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
@@ -856,7 +857,7 @@ CXXFLAGS=$CFLAGS
  
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:860: checking how to run the C preprocessor" >&5
+echo "configure:861: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -871,13 +872,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 875 "configure"
+#line 876 "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:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:882: \"$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
   :
@@ -888,13 +889,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 892 "configure"
+#line 893 "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:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:899: \"$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
   :
@@ -905,13 +906,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 909 "configure"
+#line 910 "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:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:916: \"$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
   :
@@ -938,7 +939,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:942: checking for $ac_word" >&5
+echo "configure:943: 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
@@ -972,7 +973,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:976: checking for yywrap in -l$ac_lib" >&5
+echo "configure:977: 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
@@ -980,7 +981,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 984 "configure"
+#line 985 "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
@@ -991,7 +992,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:996: \"$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
@@ -1014,7 +1015,7 @@ fi
 fi
 
 echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1018: checking lex output file root" >&5
+echo "configure:1019: 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
@@ -1035,7 +1036,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:1039: checking whether yytext is a pointer" >&5
+echo "configure:1040: 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
@@ -1047,14 +1048,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $LEXLIB"
 cat > conftest.$ac_ext <<EOF
-#line 1051 "configure"
+#line 1052 "configure"
 #include "confdefs.h"
 `cat $LEX_OUTPUT_ROOT.c`
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1059: \"$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
@@ -1080,7 +1081,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:1084: checking for $ac_word" >&5
+echo "configure:1085: 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
@@ -1121,7 +1122,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:1125: checking for $ac_word" >&5
+echo "configure:1126: 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
@@ -1160,7 +1161,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:1164: checking for $ac_word" >&5
+echo "configure:1165: 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
@@ -1196,7 +1197,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:1200: checking for $ac_word" >&5
+echo "configure:1201: 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
@@ -1233,7 +1234,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:1237: checking for $ac_word" >&5
+echo "configure:1238: 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
@@ -1268,7 +1269,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:1272: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1273: 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
@@ -1306,7 +1307,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:1310: checking for a BSD compatible install" >&5
+echo "configure:1311: 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
@@ -1385,12 +1386,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:1389: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1390: 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 1394 "configure"
+#line 1395 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1398,7 +1399,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -1423,7 +1424,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:1427: checking for opendir in -ldir" >&5
+echo "configure:1428: 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
@@ -1431,7 +1432,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1435 "configure"
+#line 1436 "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
@@ -1442,7 +1443,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1447: \"$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
@@ -1464,7 +1465,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1468: checking for opendir in -lx" >&5
+echo "configure:1469: 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
@@ -1472,7 +1473,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1476 "configure"
+#line 1477 "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
@@ -1483,7 +1484,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1488: \"$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
@@ -1506,12 +1507,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1510: checking for ANSI C header files" >&5
+echo "configure:1511: 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 1515 "configure"
+#line 1516 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1519,7 +1520,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1524: \"$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*
@@ -1536,7 +1537,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 1540 "configure"
+#line 1541 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1554,7 +1555,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 1558 "configure"
+#line 1559 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1575,7 +1576,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1579 "configure"
+#line 1580 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1586,7 +1587,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1613,17 +1614,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:1617: checking for $ac_hdr" >&5
+echo "configure:1618: 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 1622 "configure"
+#line 1623 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1628: \"$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*
@@ -1652,12 +1653,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1656: checking for working const" >&5
+echo "configure:1657: 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 1661 "configure"
+#line 1662 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1706,7 +1707,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1727,21 +1728,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1731: checking for inline" >&5
+echo "configure:1732: 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 1738 "configure"
+#line 1739 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1767,12 +1768,12 @@ EOF
 esac
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1771: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1772: 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 1776 "configure"
+#line 1777 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1781,7 +1782,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1806,12 +1807,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:1810: checking for $ac_func" >&5
+echo "configure:1811: 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 1815 "configure"
+#line 1816 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1834,7 +1835,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1839: \"$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
@@ -1867,12 +1868,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:1871: checking for pid_t" >&5
+echo "configure:1872: 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 1876 "configure"
+#line 1877 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1901,17 +1902,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1905: checking for vfork.h" >&5
+echo "configure:1906: 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 1910 "configure"
+#line 1911 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1916: \"$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*
@@ -1936,18 +1937,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1940: checking for working vfork" >&5
+echo "configure:1941: 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:1946: checking for vfork" >&5
+echo "configure:1947: 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 1951 "configure"
+#line 1952 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -1970,7 +1971,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1975: \"$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
@@ -1992,7 +1993,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 1996 "configure"
+#line 1997 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2087,7 +2088,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2092: \"$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
@@ -2114,17 +2115,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:2118: checking for $ac_hdr" >&5
+echo "configure:2119: 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 2123 "configure"
+#line 2124 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2129: \"$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*
@@ -2151,7 +2152,7 @@ fi
 done
 
 echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2155: checking for isinf in -lm" >&5
+echo "configure:2156: 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
@@ -2159,7 +2160,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2163 "configure"
+#line 2164 "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
@@ -2170,7 +2171,7 @@ int main() {
 isinf()
 ; return 0; }
 EOF
-if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2175: \"$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
@@ -2196,7 +2197,7 @@ else
 fi
 
 echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2200: checking for finite in -lm" >&5
+echo "configure:2201: 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
@@ -2204,7 +2205,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2208 "configure"
+#line 2209 "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
@@ -2215,7 +2216,7 @@ int main() {
 finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2220: \"$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
@@ -2241,7 +2242,7 @@ else
 fi
 
 echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2245: checking for _finite in -lm" >&5
+echo "configure:2246: 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
@@ -2249,7 +2250,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2254 "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
@@ -2260,7 +2261,7 @@ int main() {
 _finite()
 ; return 0; }
 EOF
-if { (eval echo configure:2264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2265: \"$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
@@ -2286,7 +2287,7 @@ else
 fi
 
 echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2290: checking for isnan in -lm" >&5
+echo "configure:2291: 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
@@ -2294,7 +2295,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2298 "configure"
+#line 2299 "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
@@ -2305,7 +2306,7 @@ int main() {
 isnan()
 ; return 0; }
 EOF
-if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2310: \"$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
@@ -2438,6 +2439,7 @@ trap 'rm -fr `echo "Makefile
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/css/Makefile
 	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/xml/Makefile
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -2541,6 +2543,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/css/Makefile
 	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/xml/Makefile
 "}
diff --git a/WebCore/configure.in b/WebCore/configure.in
index 8740984..8dc59d2 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -40,6 +40,7 @@ dnl
 
 SUBDIRS='
 	src/kdelibs/kjs
+	src/kdelibs/khtml/css
 	src/kdelibs/khtml/dom
 	src/kdelibs/khtml/xml
 '
@@ -182,6 +183,7 @@ AC_OUTPUT(
 	Makefile.vars
 	Makefile.rules
 	src/kdelibs/kjs/Makefile 
+	src/kdelibs/khtml/css/Makefile
 	src/kdelibs/khtml/dom/Makefile
 	src/kdelibs/khtml/xml/Makefile
 )
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 891264b..e48a5b2 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -32,7 +32,10 @@
 typedef QArray<char> QByteArray;
 
 // added to help in compilation of khtml/dom/html_documnent.cpp:182
-class QCString {
+class QCString : public QByteArray {
+public:
+    QCString();
+    QCString(uint);
 };
 
 bool operator!=(const char *s1, const QCString &s2);
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index d18c11c..721d135 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -29,11 +29,15 @@
 // Forward declaration for khtml/html/html_imageimpl.h:58
 class QImage;
 
+class QString;
+
 class QColor {
 public:
+    QString name() const;
     int red() const;
     int green() const;
     int blue() const;
+    bool isValid() const;
 
 bool operator==(const QColor &x) const;
 bool operator!=(const QColor &x) const;
diff --git a/WebCore/kwq/KWQFile.h b/WebCore/kwq/KWQFile.h
index 00ef02d..2c2992c 100644
--- a/WebCore/kwq/KWQFile.h
+++ b/WebCore/kwq/KWQFile.h
@@ -26,4 +26,20 @@
 #ifndef QFILE_H_
 #define QFILE_H_
 
+class QString;
+
+QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+
+class QFile {
+public:
+    QFile();
+    QFile(const QString &name);
+
+    bool open(int);
+    void close();
+    uint size() const;
+
+    int readBlock(char *data, uint len);
+};
+
 #endif
diff --git a/WebCore/kwq/KWQFont.h b/WebCore/kwq/KWQFont.h
index 24dc444..3ca1e59 100644
--- a/WebCore/kwq/KWQFont.h
+++ b/WebCore/kwq/KWQFont.h
@@ -30,7 +30,18 @@ class QString;
 
 class QFont {
 public:
-    void setFamily( const QString &);
+
+    enum Weight { Normal = 50, Bold = 63 };
+    
+    int pixelSize() const;
+    QString family() const;
+    void setFamily(const QString &);
+    void setPixelSizeFloat(float);
+    void setWeight(int);
+    int weight() const;
+    bool setItalic(bool);
+    bool italic() const;
+    bool bold() const;
     bool operator==(const QFont &x) const;
     bool operator!=(const QFont &x) const;
     enum CharSet {};
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index d72d324..0bec0e4 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -26,6 +26,12 @@
 #ifndef QFONTMETRICS_H_
 #define QFONTMETRICS_H_
 
-class QFontMetrics;
+class QRect;
+class QChar;
+
+class QFontMetrics {
+public:
+    QRect boundingRect(QChar) const;
+};
 
 #endif
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKCharsets.h
index 2d94f3f..b2854d0 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKCharsets.h
@@ -31,7 +31,9 @@ class QString;
 
 class KCharsets {
 public:
-	void setQFont(QFont &f, QString charset) const;
+    void setQFont(QFont &f, QString charset) const;
+    QString xCharsetName(QFont::CharSet) const;
+    bool supportsScript(const QFont &f, QFont::CharSet charset);
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
index b7a29fa..a230c3d 100644
--- a/WebCore/kwq/KWQKDebug.h
+++ b/WebCore/kwq/KWQKDebug.h
@@ -33,11 +33,12 @@ 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);
+	kdbgstream &operator<<(int);
+	kdbgstream &operator<<(const char *);
+	kdbgstream &operator<<(const void *);
+	kdbgstream &operator<<(const QString&);
+	kdbgstream &operator<<(const QCString&);
+	kdbgstream &operator<<(KDBGFUNC);
 };
 
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index cf7684f..20cbe9c 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -27,9 +27,11 @@
 #define KGLOBAL_H_
 
 class KCharsets;
+class KInstance;
 
 class KGlobal {
 public:
+    static KInstance *instance();
     static KCharsets *charsets();
 };
 
diff --git a/WebCore/kwq/KWQKGlobalSettings.h b/WebCore/kwq/KWQKGlobalSettings.h
index 8384006..868fc40 100644
--- a/WebCore/kwq/KWQKGlobalSettings.h
+++ b/WebCore/kwq/KWQKGlobalSettings.h
@@ -31,6 +31,8 @@ class QFont;
 class KGlobalSettings {
 public:
 	static QFont generalFont();
+	static QFont windowTitleFont();
+	static QFont menuFont();
 };
 
 #endif
diff --git a/WebCore/kwq/KWQKPartsPart.h b/WebCore/kwq/KWQKPartsPart.h
index a2609ac..8bd2eaf 100644
--- a/WebCore/kwq/KWQKPartsPart.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -32,7 +32,7 @@
 // added to help in compilation of khtml/khtml_part.h:867
 namespace KIO {
 class Job;
-}
+} // namespace KIO
  
 // forward declaration hack to help in compilation of khtml/khtml_part.h:166
 class QWidget;
@@ -55,6 +55,6 @@ class ReadOnlyPart : public Part {
 class GUIActivateEvent {
 };
 
-};
+} // namespace KParts
 
 #endif
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index 042a3b6..c6be5d9 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -30,7 +30,12 @@ class QString;
 
 class KURL {
 public:
+        KURL();
+        KURL(const QString& url, int encoding_hint = 0);
 	QString url() const;
+        void setQuery(const QString& _txt, int encoding_hint = 0);
+        void setRef(const QString& _txt);
+        void setPath(const QString& path);
 	bool isEmpty() const;
 };
 
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index 4a962a2..c95c2cc 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -26,7 +26,16 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
+#include <kwq.h>
+
 template <class T> class QArray {
+public:
+    T *data() const;
+
+    uint size() const;
+    bool resize(uint size);
+    
+    T& operator[](int i) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQPalette.h b/WebCore/kwq/KWQPalette.h
index 5e32159..e944a6f 100644
--- a/WebCore/kwq/KWQPalette.h
+++ b/WebCore/kwq/KWQPalette.h
@@ -28,13 +28,13 @@
 
 class QColorGroup {
 public:
-    enum ColorRole {};
+    enum ColorRole { Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
     void setColor(ColorRole role, const QColor &color);
 };
 
 class QPalette {
 public:
-    enum ColorGroup {};
+    enum ColorGroup { Active, Inactive };
     void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
 }; 
 
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index f1eb8cf..6266366 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -37,9 +37,10 @@ public:
     T *at(uint);
     void append(const T *);
     void setAutoDelete(bool);
-    bool remove(const T *d);
+    bool insert(uint i, const T *);
+    bool remove(const T *);
     bool removeLast();
-    void prepend(const T *d);
+    void prepend(const T *);
     T *take(uint i);
     T *first();
     T *next();
@@ -47,6 +48,8 @@ public:
     void clear();
     bool isEmpty() const;
     bool removeRef(const T *);
+    uint containsRef(const T *) const;
+    void sort();
 };
 
 template <class T> class QListIterator {
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 2c92845..83fd621 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -30,6 +30,8 @@ class QRect {
 public:
     QRect();
     QRect(int l, int t, int w, int h);
+
+    int height() const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 24b43bd..c452e53 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -30,8 +30,8 @@
 #include <string.h>
 
 #include "qcstring.h"
+#include "qregexp.h"
 
-class QRegExp;
 class QString;
 
 class QChar {
@@ -46,11 +46,13 @@ public:
     bool isDigit() const;
     bool isSpace() const;
     bool isLetterOrNumber() const;
+    friend inline int operator==(QChar, char);
     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;
+    ushort unicode() const;
 
     static const QChar null;
 
@@ -63,6 +65,9 @@ public:
 
 class QString {
 public:
+
+    static QString fromLatin1(const char*, int len=-1);
+
     QString();
     QString(const QChar *, uint);
     QString(const char *s);
@@ -78,10 +83,15 @@ public:
     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;
+    int find(char c, int index=0) const;
+    int find(const char *s, int index=0, bool b=0) const;
+    int find(const QRegExp &regexp, int index=0, bool b=0) const;
+    int findRev(char c, int index=0) const;
+    int findRev(const char *s, int index=0) const;
+    QString left(uint len) const;
+    QString &remove(uint index, uint len);
+    QString &replace(const QRegExp &, const QString &);
+    void truncate(uint pos);
 
     QString arg(const QString& a, int fieldwidth=0) const;
 
@@ -94,10 +104,11 @@ public:
     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 &operator+(QChar);
+    QString &operator+(const QString &);
+    QString &operator+=(char);
+    QString &operator+=(QChar);
+    QString &operator+=(const QString &);
 
     QString &append(const char *);
     QString &append(const QString &);
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/kwq/KWQStringList.h
index 147d161..09a697a 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/kwq/KWQStringList.h
@@ -30,7 +30,9 @@
 #include "qvaluelist.h"
 
 class QStringList : public QValueList<QString> {
-    
+public:
+    static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
+    QString join(const QString &sepx ) const;
 };
 
 #endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index 0d602a9..c91a737 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -33,9 +33,19 @@ public:
     T& operator*();
 };
 
+template<class T> class QValueListConstIterator {
+public:
+    QValueListConstIterator operator++();
+    bool operator!=(const QValueListConstIterator<T>& it);
+    T& operator*();
+};
+
 template <class T> class QValueList {
 public:
     typedef QValueListIterator<T> Iterator;
+    typedef QValueListConstIterator<T> ConstIterator;
+    void clear();
+    uint count() const;
     bool isEmpty() const;
     void append(const T& x);
     void remove(const T& x);
@@ -44,6 +54,8 @@ public:
     const T& last() const;
     Iterator begin();
     Iterator end();
+    ConstIterator begin() const;
+    ConstIterator end() const;
     T& operator[] (uint i);
 };
 
diff --git a/WebCore/kwq/kdecore/kcharsets.h b/WebCore/kwq/kdecore/kcharsets.h
index 2d94f3f..b2854d0 100644
--- a/WebCore/kwq/kdecore/kcharsets.h
+++ b/WebCore/kwq/kdecore/kcharsets.h
@@ -31,7 +31,9 @@ class QString;
 
 class KCharsets {
 public:
-	void setQFont(QFont &f, QString charset) const;
+    void setQFont(QFont &f, QString charset) const;
+    QString xCharsetName(QFont::CharSet) const;
+    bool supportsScript(const QFont &f, QFont::CharSet charset);
 };
 
 #endif
diff --git a/WebCore/kwq/kdecore/kdebug.h b/WebCore/kwq/kdecore/kdebug.h
index b7a29fa..a230c3d 100644
--- a/WebCore/kwq/kdecore/kdebug.h
+++ b/WebCore/kwq/kdecore/kdebug.h
@@ -33,11 +33,12 @@ 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);
+	kdbgstream &operator<<(int);
+	kdbgstream &operator<<(const char *);
+	kdbgstream &operator<<(const void *);
+	kdbgstream &operator<<(const QString&);
+	kdbgstream &operator<<(const QCString&);
+	kdbgstream &operator<<(KDBGFUNC);
 };
 
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
index cf7684f..20cbe9c 100644
--- a/WebCore/kwq/kdecore/kglobal.h
+++ b/WebCore/kwq/kdecore/kglobal.h
@@ -27,9 +27,11 @@
 #define KGLOBAL_H_
 
 class KCharsets;
+class KInstance;
 
 class KGlobal {
 public:
+    static KInstance *instance();
     static KCharsets *charsets();
 };
 
diff --git a/WebCore/kwq/kdecore/kglobalsettings.h b/WebCore/kwq/kdecore/kglobalsettings.h
index 8384006..868fc40 100644
--- a/WebCore/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/kwq/kdecore/kglobalsettings.h
@@ -31,6 +31,8 @@ class QFont;
 class KGlobalSettings {
 public:
 	static QFont generalFont();
+	static QFont windowTitleFont();
+	static QFont menuFont();
 };
 
 #endif
diff --git a/WebCore/kwq/kdecore/kurl.h b/WebCore/kwq/kdecore/kurl.h
index 042a3b6..c6be5d9 100644
--- a/WebCore/kwq/kdecore/kurl.h
+++ b/WebCore/kwq/kdecore/kurl.h
@@ -30,7 +30,12 @@ class QString;
 
 class KURL {
 public:
+        KURL();
+        KURL(const QString& url, int encoding_hint = 0);
 	QString url() const;
+        void setQuery(const QString& _txt, int encoding_hint = 0);
+        void setRef(const QString& _txt);
+        void setPath(const QString& path);
 	bool isEmpty() const;
 };
 
diff --git a/WebCore/kwq/kparts/part.h b/WebCore/kwq/kparts/part.h
index a2609ac..8bd2eaf 100644
--- a/WebCore/kwq/kparts/part.h
+++ b/WebCore/kwq/kparts/part.h
@@ -32,7 +32,7 @@
 // added to help in compilation of khtml/khtml_part.h:867
 namespace KIO {
 class Job;
-}
+} // namespace KIO
  
 // forward declaration hack to help in compilation of khtml/khtml_part.h:166
 class QWidget;
@@ -55,6 +55,6 @@ class ReadOnlyPart : public Part {
 class GUIActivateEvent {
 };
 
-};
+} // namespace KParts
 
 #endif
diff --git a/WebCore/kwq/kwq.h b/WebCore/kwq/kwq.h
index fe01d9e..b647608 100644
--- a/WebCore/kwq/kwq.h
+++ b/WebCore/kwq/kwq.h
@@ -42,4 +42,7 @@ class CSS2AzimuthImpl;
 #define TRUE (1)
 #define FALSE (0)
 
+void qDebug(const char *msg, ...);
+
+
 #endif
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index 4a962a2..c95c2cc 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -26,7 +26,16 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
+#include <kwq.h>
+
 template <class T> class QArray {
+public:
+    T *data() const;
+
+    uint size() const;
+    bool resize(uint size);
+    
+    T& operator[](int i) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index d18c11c..721d135 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -29,11 +29,15 @@
 // Forward declaration for khtml/html/html_imageimpl.h:58
 class QImage;
 
+class QString;
+
 class QColor {
 public:
+    QString name() const;
     int red() const;
     int green() const;
     int blue() const;
+    bool isValid() const;
 
 bool operator==(const QColor &x) const;
 bool operator!=(const QColor &x) const;
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index 891264b..e48a5b2 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -32,7 +32,10 @@
 typedef QArray<char> QByteArray;
 
 // added to help in compilation of khtml/dom/html_documnent.cpp:182
-class QCString {
+class QCString : public QByteArray {
+public:
+    QCString();
+    QCString(uint);
 };
 
 bool operator!=(const char *s1, const QCString &s2);
diff --git a/WebCore/kwq/qt/qdatastream.h b/WebCore/kwq/qt/qdatastream.h
index ba4ff56..82c5190 100644
--- a/WebCore/kwq/qt/qdatastream.h
+++ b/WebCore/kwq/qt/qdatastream.h
@@ -34,10 +34,11 @@ public:
     QDataStream( QByteArray, int mode );
     virtual ~QDataStream();
 
-    QDataStream &operator<<( const char *str );
-    QDataStream &operator<<( const QString &str );
-    QDataStream &operator<<( const QCString &str );
-    QDataStream &operator>>( const QString &str );
+    QDataStream &operator<<(long int);
+    QDataStream &operator<<(const char *);
+    QDataStream &operator<<(const QString &);
+    QDataStream &operator<<(const QCString &);
+    QDataStream &operator>>(const QString &);
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qfile.h b/WebCore/kwq/qt/qfile.h
index 00ef02d..2c2992c 100644
--- a/WebCore/kwq/qt/qfile.h
+++ b/WebCore/kwq/qt/qfile.h
@@ -26,4 +26,20 @@
 #ifndef QFILE_H_
 #define QFILE_H_
 
+class QString;
+
+QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+
+class QFile {
+public:
+    QFile();
+    QFile(const QString &name);
+
+    bool open(int);
+    void close();
+    uint size() const;
+
+    int readBlock(char *data, uint len);
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
index 24dc444..3ca1e59 100644
--- a/WebCore/kwq/qt/qfont.h
+++ b/WebCore/kwq/qt/qfont.h
@@ -30,7 +30,18 @@ class QString;
 
 class QFont {
 public:
-    void setFamily( const QString &);
+
+    enum Weight { Normal = 50, Bold = 63 };
+    
+    int pixelSize() const;
+    QString family() const;
+    void setFamily(const QString &);
+    void setPixelSizeFloat(float);
+    void setWeight(int);
+    int weight() const;
+    bool setItalic(bool);
+    bool italic() const;
+    bool bold() const;
     bool operator==(const QFont &x) const;
     bool operator!=(const QFont &x) const;
     enum CharSet {};
diff --git a/WebCore/kwq/qt/qfontdatabase.h b/WebCore/kwq/qt/qfontdatabase.h
index f513c23..e1cf5df 100644
--- a/WebCore/kwq/qt/qfontdatabase.h
+++ b/WebCore/kwq/qt/qfontdatabase.h
@@ -26,4 +26,16 @@
 #ifndef QFONTDATABASE_H_
 #define QFONTDATABASE_H_
 
+#include "qvaluelist.h"
+
+class QFont;
+class QString;
+
+class QFontDatabase {
+public:
+     bool isSmoothlyScalable(const QString &family, const QString &style = QString::null, const QString &charSet = QString::null) const;
+     QValueList<int> smoothSizes(const QString &family, const QString &style, const QString &charSet = QString::null);
+     QString styleString(const QFont &);
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index d72d324..0bec0e4 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -26,6 +26,12 @@
 #ifndef QFONTMETRICS_H_
 #define QFONTMETRICS_H_
 
-class QFontMetrics;
+class QRect;
+class QChar;
+
+class QFontMetrics {
+public:
+    QRect boundingRect(QChar) const;
+};
 
 #endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index f1eb8cf..6266366 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -37,9 +37,10 @@ public:
     T *at(uint);
     void append(const T *);
     void setAutoDelete(bool);
-    bool remove(const T *d);
+    bool insert(uint i, const T *);
+    bool remove(const T *);
     bool removeLast();
-    void prepend(const T *d);
+    void prepend(const T *);
     T *take(uint i);
     T *first();
     T *next();
@@ -47,6 +48,8 @@ public:
     void clear();
     bool isEmpty() const;
     bool removeRef(const T *);
+    uint containsRef(const T *) const;
+    void sort();
 };
 
 template <class T> class QListIterator {
diff --git a/WebCore/kwq/qt/qpalette.h b/WebCore/kwq/qt/qpalette.h
index 5e32159..e944a6f 100644
--- a/WebCore/kwq/qt/qpalette.h
+++ b/WebCore/kwq/qt/qpalette.h
@@ -28,13 +28,13 @@
 
 class QColorGroup {
 public:
-    enum ColorRole {};
+    enum ColorRole { Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
     void setColor(ColorRole role, const QColor &color);
 };
 
 class QPalette {
 public:
-    enum ColorGroup {};
+    enum ColorGroup { Active, Inactive };
     void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
 }; 
 
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 2c92845..83fd621 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -30,6 +30,8 @@ class QRect {
 public:
     QRect();
     QRect(int l, int t, int w, int h);
+
+    int height() const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 24b43bd..c452e53 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -30,8 +30,8 @@
 #include <string.h>
 
 #include "qcstring.h"
+#include "qregexp.h"
 
-class QRegExp;
 class QString;
 
 class QChar {
@@ -46,11 +46,13 @@ public:
     bool isDigit() const;
     bool isSpace() const;
     bool isLetterOrNumber() const;
+    friend inline int operator==(QChar, char);
     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;
+    ushort unicode() const;
 
     static const QChar null;
 
@@ -63,6 +65,9 @@ public:
 
 class QString {
 public:
+
+    static QString fromLatin1(const char*, int len=-1);
+
     QString();
     QString(const QChar *, uint);
     QString(const char *s);
@@ -78,10 +83,15 @@ public:
     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;
+    int find(char c, int index=0) const;
+    int find(const char *s, int index=0, bool b=0) const;
+    int find(const QRegExp &regexp, int index=0, bool b=0) const;
+    int findRev(char c, int index=0) const;
+    int findRev(const char *s, int index=0) const;
+    QString left(uint len) const;
+    QString &remove(uint index, uint len);
+    QString &replace(const QRegExp &, const QString &);
+    void truncate(uint pos);
 
     QString arg(const QString& a, int fieldwidth=0) const;
 
@@ -94,10 +104,11 @@ public:
     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 &operator+(QChar);
+    QString &operator+(const QString &);
+    QString &operator+=(char);
+    QString &operator+=(QChar);
+    QString &operator+=(const QString &);
 
     QString &append(const char *);
     QString &append(const QString &);
diff --git a/WebCore/kwq/qt/qstringlist.h b/WebCore/kwq/qt/qstringlist.h
index 147d161..09a697a 100644
--- a/WebCore/kwq/qt/qstringlist.h
+++ b/WebCore/kwq/qt/qstringlist.h
@@ -30,7 +30,9 @@
 #include "qvaluelist.h"
 
 class QStringList : public QValueList<QString> {
-    
+public:
+    static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
+    QString join(const QString &sepx ) const;
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index 0d602a9..c91a737 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -33,9 +33,19 @@ public:
     T& operator*();
 };
 
+template<class T> class QValueListConstIterator {
+public:
+    QValueListConstIterator operator++();
+    bool operator!=(const QValueListConstIterator<T>& it);
+    T& operator*();
+};
+
 template <class T> class QValueList {
 public:
     typedef QValueListIterator<T> Iterator;
+    typedef QValueListConstIterator<T> ConstIterator;
+    void clear();
+    uint count() const;
     bool isEmpty() const;
     void append(const T& x);
     void remove(const T& x);
@@ -44,6 +54,8 @@ public:
     const T& last() const;
     Iterator begin();
     Iterator end();
+    ConstIterator begin() const;
+    ConstIterator end() const;
     T& operator[] (uint i);
 };
 
diff --git a/WebCore/src/kwq/kdecore/kcharsets.h b/WebCore/src/kwq/kdecore/kcharsets.h
index 2d94f3f..b2854d0 100644
--- a/WebCore/src/kwq/kdecore/kcharsets.h
+++ b/WebCore/src/kwq/kdecore/kcharsets.h
@@ -31,7 +31,9 @@ class QString;
 
 class KCharsets {
 public:
-	void setQFont(QFont &f, QString charset) const;
+    void setQFont(QFont &f, QString charset) const;
+    QString xCharsetName(QFont::CharSet) const;
+    bool supportsScript(const QFont &f, QFont::CharSet charset);
 };
 
 #endif
diff --git a/WebCore/src/kwq/kdecore/kdebug.h b/WebCore/src/kwq/kdecore/kdebug.h
index b7a29fa..a230c3d 100644
--- a/WebCore/src/kwq/kdecore/kdebug.h
+++ b/WebCore/src/kwq/kdecore/kdebug.h
@@ -33,11 +33,12 @@ 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);
+	kdbgstream &operator<<(int);
+	kdbgstream &operator<<(const char *);
+	kdbgstream &operator<<(const void *);
+	kdbgstream &operator<<(const QString&);
+	kdbgstream &operator<<(const QCString&);
+	kdbgstream &operator<<(KDBGFUNC);
 };
 
 inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
diff --git a/WebCore/src/kwq/kdecore/kglobal.h b/WebCore/src/kwq/kdecore/kglobal.h
index cf7684f..20cbe9c 100644
--- a/WebCore/src/kwq/kdecore/kglobal.h
+++ b/WebCore/src/kwq/kdecore/kglobal.h
@@ -27,9 +27,11 @@
 #define KGLOBAL_H_
 
 class KCharsets;
+class KInstance;
 
 class KGlobal {
 public:
+    static KInstance *instance();
     static KCharsets *charsets();
 };
 
diff --git a/WebCore/src/kwq/kdecore/kglobalsettings.h b/WebCore/src/kwq/kdecore/kglobalsettings.h
index 8384006..868fc40 100644
--- a/WebCore/src/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/src/kwq/kdecore/kglobalsettings.h
@@ -31,6 +31,8 @@ class QFont;
 class KGlobalSettings {
 public:
 	static QFont generalFont();
+	static QFont windowTitleFont();
+	static QFont menuFont();
 };
 
 #endif
diff --git a/WebCore/src/kwq/kdecore/kurl.h b/WebCore/src/kwq/kdecore/kurl.h
index 042a3b6..c6be5d9 100644
--- a/WebCore/src/kwq/kdecore/kurl.h
+++ b/WebCore/src/kwq/kdecore/kurl.h
@@ -30,7 +30,12 @@ class QString;
 
 class KURL {
 public:
+        KURL();
+        KURL(const QString& url, int encoding_hint = 0);
 	QString url() const;
+        void setQuery(const QString& _txt, int encoding_hint = 0);
+        void setRef(const QString& _txt);
+        void setPath(const QString& path);
 	bool isEmpty() const;
 };
 
diff --git a/WebCore/src/kwq/kparts/part.h b/WebCore/src/kwq/kparts/part.h
index a2609ac..8bd2eaf 100644
--- a/WebCore/src/kwq/kparts/part.h
+++ b/WebCore/src/kwq/kparts/part.h
@@ -32,7 +32,7 @@
 // added to help in compilation of khtml/khtml_part.h:867
 namespace KIO {
 class Job;
-}
+} // namespace KIO
  
 // forward declaration hack to help in compilation of khtml/khtml_part.h:166
 class QWidget;
@@ -55,6 +55,6 @@ class ReadOnlyPart : public Part {
 class GUIActivateEvent {
 };
 
-};
+} // namespace KParts
 
 #endif
diff --git a/WebCore/src/kwq/kwq.h b/WebCore/src/kwq/kwq.h
index fe01d9e..b647608 100644
--- a/WebCore/src/kwq/kwq.h
+++ b/WebCore/src/kwq/kwq.h
@@ -42,4 +42,7 @@ class CSS2AzimuthImpl;
 #define TRUE (1)
 #define FALSE (0)
 
+void qDebug(const char *msg, ...);
+
+
 #endif
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index 4a962a2..c95c2cc 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -26,7 +26,16 @@
 #ifndef QARRAY_H_
 #define QARRAY_H_
 
+#include <kwq.h>
+
 template <class T> class QArray {
+public:
+    T *data() const;
+
+    uint size() const;
+    bool resize(uint size);
+    
+    T& operator[](int i) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index d18c11c..721d135 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -29,11 +29,15 @@
 // Forward declaration for khtml/html/html_imageimpl.h:58
 class QImage;
 
+class QString;
+
 class QColor {
 public:
+    QString name() const;
     int red() const;
     int green() const;
     int blue() const;
+    bool isValid() const;
 
 bool operator==(const QColor &x) const;
 bool operator!=(const QColor &x) const;
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index 891264b..e48a5b2 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -32,7 +32,10 @@
 typedef QArray<char> QByteArray;
 
 // added to help in compilation of khtml/dom/html_documnent.cpp:182
-class QCString {
+class QCString : public QByteArray {
+public:
+    QCString();
+    QCString(uint);
 };
 
 bool operator!=(const char *s1, const QCString &s2);
diff --git a/WebCore/src/kwq/qt/qdatastream.h b/WebCore/src/kwq/qt/qdatastream.h
index ba4ff56..82c5190 100644
--- a/WebCore/src/kwq/qt/qdatastream.h
+++ b/WebCore/src/kwq/qt/qdatastream.h
@@ -34,10 +34,11 @@ public:
     QDataStream( QByteArray, int mode );
     virtual ~QDataStream();
 
-    QDataStream &operator<<( const char *str );
-    QDataStream &operator<<( const QString &str );
-    QDataStream &operator<<( const QCString &str );
-    QDataStream &operator>>( const QString &str );
+    QDataStream &operator<<(long int);
+    QDataStream &operator<<(const char *);
+    QDataStream &operator<<(const QString &);
+    QDataStream &operator<<(const QCString &);
+    QDataStream &operator>>(const QString &);
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qfile.h b/WebCore/src/kwq/qt/qfile.h
index 00ef02d..2c2992c 100644
--- a/WebCore/src/kwq/qt/qfile.h
+++ b/WebCore/src/kwq/qt/qfile.h
@@ -26,4 +26,20 @@
 #ifndef QFILE_H_
 #define QFILE_H_
 
+class QString;
+
+QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+
+class QFile {
+public:
+    QFile();
+    QFile(const QString &name);
+
+    bool open(int);
+    void close();
+    uint size() const;
+
+    int readBlock(char *data, uint len);
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qfont.h b/WebCore/src/kwq/qt/qfont.h
index 24dc444..3ca1e59 100644
--- a/WebCore/src/kwq/qt/qfont.h
+++ b/WebCore/src/kwq/qt/qfont.h
@@ -30,7 +30,18 @@ class QString;
 
 class QFont {
 public:
-    void setFamily( const QString &);
+
+    enum Weight { Normal = 50, Bold = 63 };
+    
+    int pixelSize() const;
+    QString family() const;
+    void setFamily(const QString &);
+    void setPixelSizeFloat(float);
+    void setWeight(int);
+    int weight() const;
+    bool setItalic(bool);
+    bool italic() const;
+    bool bold() const;
     bool operator==(const QFont &x) const;
     bool operator!=(const QFont &x) const;
     enum CharSet {};
diff --git a/WebCore/src/kwq/qt/qfontdatabase.h b/WebCore/src/kwq/qt/qfontdatabase.h
index f513c23..e1cf5df 100644
--- a/WebCore/src/kwq/qt/qfontdatabase.h
+++ b/WebCore/src/kwq/qt/qfontdatabase.h
@@ -26,4 +26,16 @@
 #ifndef QFONTDATABASE_H_
 #define QFONTDATABASE_H_
 
+#include "qvaluelist.h"
+
+class QFont;
+class QString;
+
+class QFontDatabase {
+public:
+     bool isSmoothlyScalable(const QString &family, const QString &style = QString::null, const QString &charSet = QString::null) const;
+     QValueList<int> smoothSizes(const QString &family, const QString &style, const QString &charSet = QString::null);
+     QString styleString(const QFont &);
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index d72d324..0bec0e4 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -26,6 +26,12 @@
 #ifndef QFONTMETRICS_H_
 #define QFONTMETRICS_H_
 
-class QFontMetrics;
+class QRect;
+class QChar;
+
+class QFontMetrics {
+public:
+    QRect boundingRect(QChar) const;
+};
 
 #endif
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index f1eb8cf..6266366 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -37,9 +37,10 @@ public:
     T *at(uint);
     void append(const T *);
     void setAutoDelete(bool);
-    bool remove(const T *d);
+    bool insert(uint i, const T *);
+    bool remove(const T *);
     bool removeLast();
-    void prepend(const T *d);
+    void prepend(const T *);
     T *take(uint i);
     T *first();
     T *next();
@@ -47,6 +48,8 @@ public:
     void clear();
     bool isEmpty() const;
     bool removeRef(const T *);
+    uint containsRef(const T *) const;
+    void sort();
 };
 
 template <class T> class QListIterator {
diff --git a/WebCore/src/kwq/qt/qpalette.h b/WebCore/src/kwq/qt/qpalette.h
index 5e32159..e944a6f 100644
--- a/WebCore/src/kwq/qt/qpalette.h
+++ b/WebCore/src/kwq/qt/qpalette.h
@@ -28,13 +28,13 @@
 
 class QColorGroup {
 public:
-    enum ColorRole {};
+    enum ColorRole { Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
     void setColor(ColorRole role, const QColor &color);
 };
 
 class QPalette {
 public:
-    enum ColorGroup {};
+    enum ColorGroup { Active, Inactive };
     void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
 }; 
 
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 2c92845..83fd621 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -30,6 +30,8 @@ class QRect {
 public:
     QRect();
     QRect(int l, int t, int w, int h);
+
+    int height() const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 24b43bd..c452e53 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -30,8 +30,8 @@
 #include <string.h>
 
 #include "qcstring.h"
+#include "qregexp.h"
 
-class QRegExp;
 class QString;
 
 class QChar {
@@ -46,11 +46,13 @@ public:
     bool isDigit() const;
     bool isSpace() const;
     bool isLetterOrNumber() const;
+    friend inline int operator==(QChar, char);
     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;
+    ushort unicode() const;
 
     static const QChar null;
 
@@ -63,6 +65,9 @@ public:
 
 class QString {
 public:
+
+    static QString fromLatin1(const char*, int len=-1);
+
     QString();
     QString(const QChar *, uint);
     QString(const char *s);
@@ -78,10 +83,15 @@ public:
     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;
+    int find(char c, int index=0) const;
+    int find(const char *s, int index=0, bool b=0) const;
+    int find(const QRegExp &regexp, int index=0, bool b=0) const;
+    int findRev(char c, int index=0) const;
+    int findRev(const char *s, int index=0) const;
+    QString left(uint len) const;
+    QString &remove(uint index, uint len);
+    QString &replace(const QRegExp &, const QString &);
+    void truncate(uint pos);
 
     QString arg(const QString& a, int fieldwidth=0) const;
 
@@ -94,10 +104,11 @@ public:
     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 &operator+(QChar);
+    QString &operator+(const QString &);
+    QString &operator+=(char);
+    QString &operator+=(QChar);
+    QString &operator+=(const QString &);
 
     QString &append(const char *);
     QString &append(const QString &);
diff --git a/WebCore/src/kwq/qt/qstringlist.h b/WebCore/src/kwq/qt/qstringlist.h
index 147d161..09a697a 100644
--- a/WebCore/src/kwq/qt/qstringlist.h
+++ b/WebCore/src/kwq/qt/qstringlist.h
@@ -30,7 +30,9 @@
 #include "qvaluelist.h"
 
 class QStringList : public QValueList<QString> {
-    
+public:
+    static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
+    QString join(const QString &sepx ) const;
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index 0d602a9..c91a737 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -33,9 +33,19 @@ public:
     T& operator*();
 };
 
+template<class T> class QValueListConstIterator {
+public:
+    QValueListConstIterator operator++();
+    bool operator!=(const QValueListConstIterator<T>& it);
+    T& operator*();
+};
+
 template <class T> class QValueList {
 public:
     typedef QValueListIterator<T> Iterator;
+    typedef QValueListConstIterator<T> ConstIterator;
+    void clear();
+    uint count() const;
     bool isEmpty() const;
     void append(const T& x);
     void remove(const T& x);
@@ -44,6 +54,8 @@ public:
     const T& last() const;
     Iterator begin();
     Iterator end();
+    ConstIterator begin() const;
+    ConstIterator end() const;
     T& operator[] (uint i);
 };
 

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list