[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:41:05 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit da8b033c3aa2b5682e14d0fd873076945015130e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 30 22:42:53 2001 +0000
Finished getting khtml/misc to compile ... that was a bear 8-/
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 65420e5..1571ef4 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -18,6 +18,7 @@ include $(TOPSRCDIR)/Makefile.vars
SUBDIRS = \
src/kdelibs/kjs \
+ src/kdelibs/khtml/misc \
src/kdelibs/khtml/css \
src/kdelibs/khtml/dom \
src/kdelibs/khtml/ecma \
diff --git a/WebCore/configure b/WebCore/configure
index a02fc95..f743716 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -560,6 +560,7 @@ SUBDIRS='
src/kdelibs/khtml/dom
src/kdelibs/khtml/ecma
src/kdelibs/khtml/xml
+ src/kdelibs/khtml/misc
'
for subdir in $SUBDIRS; do
if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -598,7 +599,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:602: checking host system type" >&5
+echo "configure:603: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -629,7 +630,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:633: checking for $ac_word" >&5
+echo "configure:634: 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
@@ -659,7 +660,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:663: checking for $ac_word" >&5
+echo "configure:664: 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
@@ -710,7 +711,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:714: checking for $ac_word" >&5
+echo "configure:715: 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
@@ -742,7 +743,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:746: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:747: 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.
@@ -753,12 +754,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 757 "configure"
+#line 758 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:763: \"$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
@@ -784,12 +785,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:788: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:789: 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:793: checking whether we are using GNU C" >&5
+echo "configure:794: 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
@@ -798,7 +799,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:802: \"$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:803: \"$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
@@ -817,7 +818,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:821: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:822: 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
@@ -858,7 +859,7 @@ CXXFLAGS=$CFLAGS
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:862: checking how to run the C preprocessor" >&5
+echo "configure:863: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -873,13 +874,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 877 "configure"
+#line 878 "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:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:884: \"$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
:
@@ -890,13 +891,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 894 "configure"
+#line 895 "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:900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:901: \"$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
:
@@ -907,13 +908,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 911 "configure"
+#line 912 "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:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:918: \"$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
:
@@ -940,7 +941,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:944: checking for $ac_word" >&5
+echo "configure:945: 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
@@ -974,7 +975,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:978: checking for yywrap in -l$ac_lib" >&5
+echo "configure:979: 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
@@ -982,7 +983,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 986 "configure"
+#line 987 "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
@@ -993,7 +994,7 @@ int main() {
yywrap()
; return 0; }
EOF
-if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:998: \"$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
@@ -1016,7 +1017,7 @@ fi
fi
echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1020: checking lex output file root" >&5
+echo "configure:1021: 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
@@ -1037,7 +1038,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:1041: checking whether yytext is a pointer" >&5
+echo "configure:1042: 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
@@ -1049,14 +1050,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 1053 "configure"
+#line 1054 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1061: \"$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
@@ -1082,7 +1083,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:1086: checking for $ac_word" >&5
+echo "configure:1087: 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
@@ -1123,7 +1124,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:1127: checking for $ac_word" >&5
+echo "configure:1128: 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
@@ -1162,7 +1163,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:1166: checking for $ac_word" >&5
+echo "configure:1167: 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
@@ -1198,7 +1199,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:1202: checking for $ac_word" >&5
+echo "configure:1203: 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
@@ -1235,7 +1236,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:1239: checking for $ac_word" >&5
+echo "configure:1240: 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
@@ -1270,7 +1271,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:1274: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1275: 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
@@ -1308,7 +1309,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:1312: checking for a BSD compatible install" >&5
+echo "configure:1313: 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
@@ -1387,12 +1388,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:1391: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1392: 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 1396 "configure"
+#line 1397 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1400,7 +1401,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1425,7 +1426,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:1429: checking for opendir in -ldir" >&5
+echo "configure:1430: 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
@@ -1433,7 +1434,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1437 "configure"
+#line 1438 "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
@@ -1444,7 +1445,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1449: \"$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
@@ -1466,7 +1467,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1470: checking for opendir in -lx" >&5
+echo "configure:1471: 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
@@ -1474,7 +1475,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1478 "configure"
+#line 1479 "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
@@ -1485,7 +1486,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1490: \"$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
@@ -1508,12 +1509,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1512: checking for ANSI C header files" >&5
+echo "configure:1513: 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 1517 "configure"
+#line 1518 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1521,7 +1522,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1526: \"$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*
@@ -1538,7 +1539,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 1542 "configure"
+#line 1543 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1556,7 +1557,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 1560 "configure"
+#line 1561 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1577,7 +1578,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1582 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1588,7 +1589,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1615,17 +1616,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:1619: checking for $ac_hdr" >&5
+echo "configure:1620: 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 1624 "configure"
+#line 1625 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1630: \"$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*
@@ -1654,12 +1655,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1658: checking for working const" >&5
+echo "configure:1659: 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 1663 "configure"
+#line 1664 "configure"
#include "confdefs.h"
int main() {
@@ -1708,7 +1709,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1729,21 +1730,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1733: checking for inline" >&5
+echo "configure:1734: 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 1740 "configure"
+#line 1741 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1769,12 +1770,12 @@ EOF
esac
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1773: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1774: 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 1778 "configure"
+#line 1779 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1783,7 +1784,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1808,12 +1809,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:1812: checking for $ac_func" >&5
+echo "configure:1813: 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 1817 "configure"
+#line 1818 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1836,7 +1837,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1841: \"$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
@@ -1869,12 +1870,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:1873: checking for pid_t" >&5
+echo "configure:1874: 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 1878 "configure"
+#line 1879 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1903,17 +1904,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1907: checking for vfork.h" >&5
+echo "configure:1908: 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 1912 "configure"
+#line 1913 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1918: \"$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*
@@ -1938,18 +1939,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1942: checking for working vfork" >&5
+echo "configure:1943: 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:1948: checking for vfork" >&5
+echo "configure:1949: 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 1953 "configure"
+#line 1954 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -1972,7 +1973,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1977: \"$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
@@ -1994,7 +1995,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 1998 "configure"
+#line 1999 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -2089,7 +2090,7 @@ main() {
}
}
EOF
-if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2094: \"$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
@@ -2116,17 +2117,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:2120: checking for $ac_hdr" >&5
+echo "configure:2121: 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 2125 "configure"
+#line 2126 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2131: \"$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*
@@ -2153,7 +2154,7 @@ fi
done
echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2157: checking for isinf in -lm" >&5
+echo "configure:2158: 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
@@ -2161,7 +2162,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2165 "configure"
+#line 2166 "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
@@ -2172,7 +2173,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2177: \"$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
@@ -2198,7 +2199,7 @@ else
fi
echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2202: checking for finite in -lm" >&5
+echo "configure:2203: 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
@@ -2206,7 +2207,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2210 "configure"
+#line 2211 "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
@@ -2217,7 +2218,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:2221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2222: \"$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
@@ -2243,7 +2244,7 @@ else
fi
echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2247: checking for _finite in -lm" >&5
+echo "configure:2248: 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
@@ -2251,7 +2252,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2255 "configure"
+#line 2256 "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
@@ -2262,7 +2263,7 @@ int main() {
_finite()
; return 0; }
EOF
-if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2267: \"$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
@@ -2288,7 +2289,7 @@ else
fi
echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2292: checking for isnan in -lm" >&5
+echo "configure:2293: 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
@@ -2296,7 +2297,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2300 "configure"
+#line 2301 "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
@@ -2307,7 +2308,7 @@ int main() {
isnan()
; return 0; }
EOF
-if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2312: \"$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
@@ -2444,6 +2445,7 @@ trap 'rm -fr `echo "Makefile
src/kdelibs/khtml/dom/Makefile
src/kdelibs/khtml/ecma/Makefile
src/kdelibs/khtml/xml/Makefile
+ src/kdelibs/khtml/misc/Makefile
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -2549,6 +2551,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
src/kdelibs/khtml/dom/Makefile
src/kdelibs/khtml/ecma/Makefile
src/kdelibs/khtml/xml/Makefile
+ src/kdelibs/khtml/misc/Makefile
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
diff --git a/WebCore/configure.in b/WebCore/configure.in
index 5a46e2b..fe76993 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -44,6 +44,7 @@ SUBDIRS='
src/kdelibs/khtml/dom
src/kdelibs/khtml/ecma
src/kdelibs/khtml/xml
+ src/kdelibs/khtml/misc
'
for subdir in $SUBDIRS; do
if (test -f "./$subdir/MakeSystemChanges.sh"); then
@@ -188,5 +189,6 @@ AC_OUTPUT(
src/kdelibs/khtml/dom/Makefile
src/kdelibs/khtml/ecma/Makefile
src/kdelibs/khtml/xml/Makefile
+ src/kdelibs/khtml/misc/Makefile
)
diff --git a/WebCore/khtml/ecma/Makefile.in.apple b/WebCore/khtml/ecma/Makefile.in.apple
index 4ebd355..cc7da37 100644
--- a/WebCore/khtml/ecma/Makefile.in.apple
+++ b/WebCore/khtml/ecma/Makefile.in.apple
@@ -24,6 +24,8 @@ OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlecma.a
+PROGRAM = testecma
+
CLEAN_FILES = $(OBJECTS) \
kjs_window.moc \
$(LIBRARY) \
@@ -57,6 +59,9 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+$(PROGRAM): testecma.o
+ $(CC) -o $@ $< -L. -lkhtmlecma
+
kjs_window.cpp: kjs_window.moc
kjs_window.moc:
touch $@
diff --git a/WebCore/khtml/css/MakeSystemChanges.sh b/WebCore/khtml/misc/MakeSystemChanges.sh
similarity index 100%
copy from WebCore/khtml/css/MakeSystemChanges.sh
copy to WebCore/khtml/misc/MakeSystemChanges.sh
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple b/WebCore/khtml/misc/Makefile.in.apple
similarity index 77%
copy from WebCore/src/kdelibs/khtml/css/Makefile.in.apple
copy to WebCore/khtml/misc/Makefile.in.apple
index d74ed93..67deb42 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
+++ b/WebCore/khtml/misc/Makefile.in.apple
@@ -18,26 +18,25 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensionsimpl.o,$(ALLOBJECTS))
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-VALUEFILES = \
- cssvalues.c \
- cssvalues.h \
- cssvalues.gperf \
+TAGFILES = \
+ htmltags.c \
+ htmltags.h \
+ htmltags.gperf \
$(NULL)
-PROPFILES = \
- cssproperties.c \
- cssproperties.h \
- cssproperties.gperf \
+ATTRSFILES = \
+ htmlattrs.c \
+ htmlattrs.h \
+ htmlattrs.gperf \
$(NULL)
-CFILES = $(VALUEFILES) $(PROPFILES)
+CFILES = $(TAGFILES) $(ATTRSFILES)
OBJECTS = $(CFILES) $(CXXOBJECTS)
-LIBRARY = libkhtmlcss.a
+LIBRARY = libkhtmlmisc.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
@@ -49,13 +48,11 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/qt \
- -I$(TOPSRCDIR)/src/kwq/dcop \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kio \
- -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
-I../dom \
-I../html \
- -I../misc \
-I../xml \
-I.. \
-I. \
@@ -70,11 +67,15 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-$(VALUEFILES):
- sh ./makevalues
+loader.cpp: loader.moc
+loader.moc:
+ touch loader.moc
+
+$(TAGFILES):
+ ./maketags
-$(PROPFILES):
- sh ./makeprop
+$(ATTRSFILES):
+ ./makeattrs
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/khtml/misc/htmlattrs.c b/WebCore/khtml/misc/htmlattrs.c
deleted file mode 100644
index 2365955..0000000
--- a/WebCore/khtml/misc/htmlattrs.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/* ANSI-C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -c -a -L ANSI-C -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -s 2 htmlattrs.gperf */
-/* This file is automatically generated from
-#htmlattrs.in by makeattrs, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmlattrs.h"
-struct attrs {
- const char *name;
- int id;
-};
-/* maximum key range = 944, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash_attr (register const char *str, register unsigned int len)
-{
- static const unsigned short asso_values[] =
- {
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 0, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 15, 65, 0,
- 125, 0, 10, 35, 180, 55, 0, 85, 0, 75,
- 0, 0, 40, 0, 150, 20, 175, 120, 160, 5,
- 5, 0, 10, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- case 14:
- hval += asso_values[(unsigned char)str[13]];
- case 13:
- hval += asso_values[(unsigned char)str[12]];
- case 12:
- hval += asso_values[(unsigned char)str[11]];
- case 11:
- hval += asso_values[(unsigned char)str[10]];
- case 10:
- hval += asso_values[(unsigned char)str[9]];
- case 9:
- hval += asso_values[(unsigned char)str[8]];
- case 8:
- hval += asso_values[(unsigned char)str[7]];
- case 7:
- hval += asso_values[(unsigned char)str[6]];
- case 6:
- hval += asso_values[(unsigned char)str[5]];
- case 5:
- hval += asso_values[(unsigned char)str[4]];
- case 4:
- hval += asso_values[(unsigned char)str[3]];
- case 3:
- hval += asso_values[(unsigned char)str[2]];
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-const struct attrs *
-findAttr (register const char *str, register unsigned int len)
-{
- enum
- {
- TOTAL_KEYWORDS = 142,
- MIN_WORD_LENGTH = 2,
- MAX_WORD_LENGTH = 14,
- MIN_HASH_VALUE = 24,
- MAX_HASH_VALUE = 967
- };
-
- static const struct attrs wordlist_attr[] =
- {
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"cols", ATTR_COLS},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"face", ATTR_FACE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"lang", ATTR_LANG},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"class", ATTR_CLASS},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"scope", ATTR_SCOPE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"span", ATTR_SPAN},
- {"", 0}, {"", 0},
- {"colspan", ATTR_COLSPAN},
- {"", 0}, {"", 0},
- {"label", ATTR_LABEL},
- {"", 0}, {"", 0}, {"", 0},
- {"size", ATTR_SIZE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"name", ATTR_NAME},
- {"pagey", ATTR_PAGEY},
- {"", 0}, {"", 0}, {"", 0},
- {"axis", ATTR_AXIS},
- {"pagex", ATTR_PAGEX},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"align", ATTR_ALIGN},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"plain", ATTR_PLAIN},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"code", ATTR_CODE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"link", ATTR_LINK},
- {"", 0},
- {"onload", ATTR_ONLOAD},
- {"onclick", ATTR_ONCLICK},
- {"", 0},
- {"accesskey", ATTR_ACCESSKEY},
- {"", 0}, {"", 0}, {"", 0},
- {"rel", ATTR_REL},
- {"", 0},
- {"color", ATTR_COLOR},
- {"", 0},
- {"onfocus", ATTR_ONFOCUS},
- {"", 0}, {"", 0},
- {"alink", ATTR_ALINK},
- {"", 0}, {"", 0},
- {"for", ATTR_FOR},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"clear", ATTR_CLEAR},
- {"", 0}, {"", 0},
- {"src", ATTR_SRC},
- {"", 0}, {"", 0},
- {"cellspacing", ATTR_CELLSPACING},
- {"", 0}, {"", 0},
- {"rows", ATTR_ROWS},
- {"", 0}, {"", 0},
- {"id", ATTR_ID},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"longdesc", ATTR_LONGDESC},
- {"left", ATTR_LEFT},
- {"", 0}, {"", 0}, {"", 0},
- {"alt", ATTR_ALT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"style", ATTR_STYLE},
- {"nosave", ATTR_NOSAVE},
- {"z-index", ATTR_Z_INDEX},
- {"onselect", ATTR_ONSELECT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"ismap", ATTR_ISMAP},
- {"", 0}, {"", 0}, {"", 0},
- {"wrap", ATTR_WRAP},
- {"", 0},
- {"nowrap", ATTR_NOWRAP},
- {"unknown", ATTR_UNKNOWN},
- {"top", ATTR_TOP},
- {"type", ATTR_TYPE},
- {"", 0}, {"", 0},
- {"enctype", ATTR_ENCTYPE},
- {"", 0},
- {"onkeydown", ATTR_ONKEYDOWN},
- {"", 0}, {"", 0}, {"", 0},
- {"language", ATTR_LANGUAGE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"codebase", ATTR_CODEBASE},
- {"cite", ATTR_CITE},
- {"", 0},
- {"accept", ATTR_ACCEPT},
- {"rowspan", ATTR_ROWSPAN},
- {"onchange", ATTR_ONCHANGE},
- {"", 0}, {"", 0},
- {"vspace", ATTR_VSPACE},
- {"classid", ATTR_CLASSID},
- {"noresize", ATTR_NORESIZE},
- {"", 0}, {"", 0},
- {"object", ATTR_OBJECT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"action", ATTR_ACTION},
- {"onkeyup", ATTR_ONKEYUP},
- {"", 0}, {"", 0},
- {"frame", ATTR_FRAME},
- {"", 0},
- {"bgcolor", ATTR_BGCOLOR},
- {"", 0}, {"", 0},
- {"shape", ATTR_SHAPE},
- {"hspace", ATTR_HSPACE},
- {"profile", ATTR_PROFILE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"onunload", ATTR_ONUNLOAD},
- {"scrolling", ATTR_SCROLLING},
- {"", 0},
- {"valign", ATTR_VALIGN},
- {"", 0}, {"", 0}, {"", 0},
- {"media", ATTR_MEDIA},
- {"usemap", ATTR_USEMAP},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"scheme", ATTR_SCHEME},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"defer", ATTR_DEFER},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"rules", ATTR_RULES},
- {"", 0},
- {"declare", ATTR_DECLARE},
- {"readonly", ATTR_READONLY},
- {"abbr", ATTR_ABBR},
- {"value", ATTR_VALUE},
- {"coords", ATTR_COORDS},
- {"", 0}, {"", 0}, {"", 0},
- {"vlink", ATTR_VLINK},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"compact", ATTR_COMPACT},
- {"rev", ATTR_REV},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"onkeypress", ATTR_ONKEYPRESS},
- {"", 0}, {"", 0},
- {"selected", ATTR_SELECTED},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"dir", ATTR_DIR},
- {"data", ATTR_DATA},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"ondblclick", ATTR_ONDBLCLICK},
- {"onblur", ATTR_ONBLUR},
- {"", 0}, {"", 0},
- {"href", ATTR_HREF},
- {"", 0},
- {"nohref", ATTR_NOHREF},
- {"noshade", ATTR_NOSHADE},
- {"codetype", ATTR_CODETYPE},
- {"char", ATTR_CHAR},
- {"pluginpage", ATTR_PLUGINPAGE},
- {"", 0},
- {"onreset", ATTR_ONRESET},
- {"", 0}, {"", 0}, {"", 0},
- {"onmousedown", ATTR_ONMOUSEDOWN},
- {"content", ATTR_CONTENT},
- {"", 0},
- {"text", ATTR_TEXT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"pluginspage", ATTR_PLUGINSPAGE},
- {"charoff", ATTR_CHAROFF},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"onmouseup", ATTR_ONMOUSEUP},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"version", ATTR_VERSION},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"checked", ATTR_CHECKED},
- {"hreflang", ATTR_HREFLANG},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"cellpadding", ATTR_CELLPADDING},
- {"standby", ATTR_STANDBY},
- {"", 0}, {"", 0},
- {"title", ATTR_TITLE},
- {"", 0},
- {"onabort", ATTR_ONABORT},
- {"disabled", ATTR_DISABLED},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"html", ATTR_HTML},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"tabindex", ATTR_TABINDEX},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"onerror", ATTR_ONERROR},
- {"", 0}, {"", 0}, {"", 0},
- {"onmousemove", ATTR_ONMOUSEMOVE},
- {"summary", ATTR_SUMMARY},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0},
- {"multiple", ATTR_MULTIPLE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0},
- {"prompt", ATTR_PROMPT},
- {"oversrc", ATTR_OVERSRC},
- {"", 0}, {"", 0}, {"", 0},
- {"hidden", ATTR_HIDDEN},
- {"", 0}, {"", 0},
- {"maxlength", ATTR_MAXLENGTH},
- {"", 0},
- {"border", ATTR_BORDER},
- {"headers", ATTR_HEADERS},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"onsubmit", ATTR_ONSUBMIT},
- {"valuetype", ATTR_VALUETYPE},
- {"onmouseout", ATTR_ONMOUSEOUT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"leftmargin", ATTR_LEFTMARGIN},
- {"", 0}, {"", 0}, {"", 0},
- {"pluginurl", ATTR_PLUGINURL},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"onmouseover", ATTR_ONMOUSEOVER},
- {"", 0}, {"", 0}, {"", 0},
- {"start", ATTR_START},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"width", ATTR_WIDTH},
- {"", 0},
- {"charset", ATTR_CHARSET},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"topmargin", ATTR_TOPMARGIN},
- {"", 0},
- {"target", ATTR_TARGET},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"method", ATTR_METHOD},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"archive", ATTR_ARCHIVE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0},
- {"background", ATTR_BACKGROUND},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"autocomplete", ATTR_AUTOCOMPLETE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"datetime", ATTR_DATETIME},
- {"", 0}, {"", 0},
- {"height", ATTR_HEIGHT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"visibility", ATTR_VISIBILITY},
- {"bordercolor", ATTR_BORDERCOLOR},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"bgproperties", ATTR_BGPROPERTIES},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"frameborder", ATTR_FRAMEBORDER},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"accept-charset", ATTR_ACCEPT_CHARSET},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"marginwidth", ATTR_MARGINWIDTH},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"http-equiv", ATTR_HTTP_EQUIV},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"marginheight", ATTR_MARGINHEIGHT}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash_attr (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register const char *s = wordlist_attr[key].name;
-
- if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
- return &wordlist_attr[key];
- }
- }
- return 0;
-}
-
-
-static const char *attrList[] = {
- "ABBR",
- "ACCEPT-CHARSET",
- "ACCEPT",
- "ACCESSKEY",
- "ACTION",
- "ALIGN",
- "ALINK",
- "ALT",
- "ARCHIVE",
- "AUTOCOMPLETE",
- "AXIS",
- "BACKGROUND",
- "BGCOLOR",
- "BGPROPERTIES",
- "BORDER",
- "BORDERCOLOR",
- "CELLPADDING",
- "CELLSPACING",
- "CHAR",
- "CHAROFF",
- "CHARSET",
- "CHECKED",
- "CITE",
- "CLASS",
- "CLASSID",
- "CLEAR",
- "CODE",
- "CODEBASE",
- "CODETYPE",
- "COLOR",
- "COLS",
- "COLSPAN",
- "COMPACT",
- "CONTENT",
- "COORDS",
- "DATA",
- "DATETIME",
- "DECLARE",
- "DEFER",
- "DIR",
- "DISABLED",
- "ENCTYPE",
- "FACE",
- "FOR",
- "FRAME",
- "FRAMEBORDER",
- "HEADERS",
- "HEIGHT",
- "HIDDEN",
- "HREF",
- "HREFLANG",
- "HSPACE",
- "HTML",
- "HTTP-EQUIV",
- "ID",
- "ISMAP",
- "LABEL",
- "LANG",
- "LANGUAGE",
- "LEFT",
- "LEFTMARGIN",
- "LINK",
- "LONGDESC",
- "MARGINHEIGHT",
- "MARGINWIDTH",
- "MAXLENGTH",
- "MEDIA",
- "METHOD",
- "MULTIPLE",
- "NAME",
- "NOHREF",
- "NORESIZE",
- "NOSAVE",
- "NOSHADE",
- "NOWRAP",
- "OBJECT",
- "ONABORT",
- "ONBLUR",
- "ONCHANGE",
- "ONCLICK",
- "ONDBLCLICK",
- "ONERROR",
- "ONFOCUS",
- "ONKEYDOWN",
- "ONKEYPRESS",
- "ONKEYUP",
- "ONLOAD",
- "ONMOUSEDOWN",
- "ONMOUSEMOVE",
- "ONMOUSEOUT",
- "ONMOUSEOVER",
- "ONMOUSEUP",
- "ONRESET",
- "ONSELECT",
- "ONSUBMIT",
- "ONUNLOAD",
- "OVERSRC",
- "PAGEX",
- "PAGEY",
- "PLAIN",
- "PLUGINPAGE",
- "PLUGINSPAGE",
- "PLUGINURL",
- "PROFILE",
- "PROMPT",
- "READONLY",
- "REL",
- "REV",
- "ROWS",
- "ROWSPAN",
- "RULES",
- "SCHEME",
- "SCOPE",
- "SCROLLING",
- "SELECTED",
- "SHAPE",
- "SIZE",
- "SPAN",
- "SRC",
- "STANDBY",
- "START",
- "STYLE",
- "SUMMARY",
- "TABINDEX",
- "TARGET",
- "TEXT",
- "TITLE",
- "TOP",
- "TOPMARGIN",
- "TYPE",
- "UNKNOWN",
- "USEMAP",
- "VALIGN",
- "VALUE",
- "VALUETYPE",
- "VERSION",
- "VISIBILITY",
- "VLINK",
- "VSPACE",
- "WIDTH",
- "WRAP",
- "Z-INDEX",
- 0
-};
-DOMString getAttrName(unsigned short id)
-{
- return attrList[id-1];
-};
diff --git a/WebCore/khtml/misc/htmlattrs.gperf b/WebCore/khtml/misc/htmlattrs.gperf
deleted file mode 100644
index 2abdd77..0000000
--- a/WebCore/khtml/misc/htmlattrs.gperf
+++ /dev/null
@@ -1,154 +0,0 @@
-%{
-/* This file is automatically generated from
-#htmlattrs.in by makeattrs, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmlattrs.h"
-%}
-struct attrs {
- const char *name;
- int id;
-};
-%%
-abbr, ATTR_ABBR
-accept-charset, ATTR_ACCEPT_CHARSET
-accept, ATTR_ACCEPT
-accesskey, ATTR_ACCESSKEY
-action, ATTR_ACTION
-align, ATTR_ALIGN
-alink, ATTR_ALINK
-alt, ATTR_ALT
-archive, ATTR_ARCHIVE
-autocomplete, ATTR_AUTOCOMPLETE
-axis, ATTR_AXIS
-background, ATTR_BACKGROUND
-bgcolor, ATTR_BGCOLOR
-bgproperties, ATTR_BGPROPERTIES
-border, ATTR_BORDER
-bordercolor, ATTR_BORDERCOLOR
-cellpadding, ATTR_CELLPADDING
-cellspacing, ATTR_CELLSPACING
-char, ATTR_CHAR
-charoff, ATTR_CHAROFF
-charset, ATTR_CHARSET
-checked, ATTR_CHECKED
-cite, ATTR_CITE
-class, ATTR_CLASS
-classid, ATTR_CLASSID
-clear, ATTR_CLEAR
-code, ATTR_CODE
-codebase, ATTR_CODEBASE
-codetype, ATTR_CODETYPE
-color, ATTR_COLOR
-cols, ATTR_COLS
-colspan, ATTR_COLSPAN
-compact, ATTR_COMPACT
-content, ATTR_CONTENT
-coords, ATTR_COORDS
-data, ATTR_DATA
-datetime, ATTR_DATETIME
-declare, ATTR_DECLARE
-defer, ATTR_DEFER
-dir, ATTR_DIR
-disabled, ATTR_DISABLED
-enctype, ATTR_ENCTYPE
-face, ATTR_FACE
-for, ATTR_FOR
-frame, ATTR_FRAME
-frameborder, ATTR_FRAMEBORDER
-headers, ATTR_HEADERS
-height, ATTR_HEIGHT
-hidden, ATTR_HIDDEN
-href, ATTR_HREF
-hreflang, ATTR_HREFLANG
-hspace, ATTR_HSPACE
-html, ATTR_HTML
-http-equiv, ATTR_HTTP_EQUIV
-id, ATTR_ID
-ismap, ATTR_ISMAP
-label, ATTR_LABEL
-lang, ATTR_LANG
-language, ATTR_LANGUAGE
-left, ATTR_LEFT
-leftmargin, ATTR_LEFTMARGIN
-link, ATTR_LINK
-longdesc, ATTR_LONGDESC
-marginheight, ATTR_MARGINHEIGHT
-marginwidth, ATTR_MARGINWIDTH
-maxlength, ATTR_MAXLENGTH
-media, ATTR_MEDIA
-method, ATTR_METHOD
-multiple, ATTR_MULTIPLE
-name, ATTR_NAME
-nohref, ATTR_NOHREF
-noresize, ATTR_NORESIZE
-nosave, ATTR_NOSAVE
-noshade, ATTR_NOSHADE
-nowrap, ATTR_NOWRAP
-object, ATTR_OBJECT
-onabort, ATTR_ONABORT
-onblur, ATTR_ONBLUR
-onchange, ATTR_ONCHANGE
-onclick, ATTR_ONCLICK
-ondblclick, ATTR_ONDBLCLICK
-onerror, ATTR_ONERROR
-onfocus, ATTR_ONFOCUS
-onkeydown, ATTR_ONKEYDOWN
-onkeypress, ATTR_ONKEYPRESS
-onkeyup, ATTR_ONKEYUP
-onload, ATTR_ONLOAD
-onmousedown, ATTR_ONMOUSEDOWN
-onmousemove, ATTR_ONMOUSEMOVE
-onmouseout, ATTR_ONMOUSEOUT
-onmouseover, ATTR_ONMOUSEOVER
-onmouseup, ATTR_ONMOUSEUP
-onreset, ATTR_ONRESET
-onselect, ATTR_ONSELECT
-onsubmit, ATTR_ONSUBMIT
-onunload, ATTR_ONUNLOAD
-oversrc, ATTR_OVERSRC
-pagex, ATTR_PAGEX
-pagey, ATTR_PAGEY
-plain, ATTR_PLAIN
-pluginpage, ATTR_PLUGINPAGE
-pluginspage, ATTR_PLUGINSPAGE
-pluginurl, ATTR_PLUGINURL
-profile, ATTR_PROFILE
-prompt, ATTR_PROMPT
-readonly, ATTR_READONLY
-rel, ATTR_REL
-rev, ATTR_REV
-rows, ATTR_ROWS
-rowspan, ATTR_ROWSPAN
-rules, ATTR_RULES
-scheme, ATTR_SCHEME
-scope, ATTR_SCOPE
-scrolling, ATTR_SCROLLING
-selected, ATTR_SELECTED
-shape, ATTR_SHAPE
-size, ATTR_SIZE
-span, ATTR_SPAN
-src, ATTR_SRC
-standby, ATTR_STANDBY
-start, ATTR_START
-style, ATTR_STYLE
-summary, ATTR_SUMMARY
-tabindex, ATTR_TABINDEX
-target, ATTR_TARGET
-text, ATTR_TEXT
-title, ATTR_TITLE
-top, ATTR_TOP
-topmargin, ATTR_TOPMARGIN
-type, ATTR_TYPE
-unknown, ATTR_UNKNOWN
-usemap, ATTR_USEMAP
-valign, ATTR_VALIGN
-value, ATTR_VALUE
-valuetype, ATTR_VALUETYPE
-version, ATTR_VERSION
-visibility, ATTR_VISIBILITY
-vlink, ATTR_VLINK
-vspace, ATTR_VSPACE
-width, ATTR_WIDTH
-wrap, ATTR_WRAP
-z-index, ATTR_Z_INDEX
-%%
diff --git a/WebCore/khtml/misc/htmlattrs.h b/WebCore/khtml/misc/htmlattrs.h
deleted file mode 100644
index eede729..0000000
--- a/WebCore/khtml/misc/htmlattrs.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* This file is automatically generated from
-htmlattrs.in by makeattrs, do not edit */
-/* Copyright 1999 Lars Knoll */
-
-#ifndef HTML_ATTRS_H
-#define HTML_ATTRS_H
-
-#include "dom_string.h"
-using namespace DOM;
-
-#define ATTR_ABBR 1
-#define ATTR_ACCEPT_CHARSET 2
-#define ATTR_ACCEPT 3
-#define ATTR_ACCESSKEY 4
-#define ATTR_ACTION 5
-#define ATTR_ALIGN 6
-#define ATTR_ALINK 7
-#define ATTR_ALT 8
-#define ATTR_ARCHIVE 9
-#define ATTR_AUTOCOMPLETE 10
-#define ATTR_AXIS 11
-#define ATTR_BACKGROUND 12
-#define ATTR_BGCOLOR 13
-#define ATTR_BGPROPERTIES 14
-#define ATTR_BORDER 15
-#define ATTR_BORDERCOLOR 16
-#define ATTR_CELLPADDING 17
-#define ATTR_CELLSPACING 18
-#define ATTR_CHAR 19
-#define ATTR_CHAROFF 20
-#define ATTR_CHARSET 21
-#define ATTR_CHECKED 22
-#define ATTR_CITE 23
-#define ATTR_CLASS 24
-#define ATTR_CLASSID 25
-#define ATTR_CLEAR 26
-#define ATTR_CODE 27
-#define ATTR_CODEBASE 28
-#define ATTR_CODETYPE 29
-#define ATTR_COLOR 30
-#define ATTR_COLS 31
-#define ATTR_COLSPAN 32
-#define ATTR_COMPACT 33
-#define ATTR_CONTENT 34
-#define ATTR_COORDS 35
-#define ATTR_DATA 36
-#define ATTR_DATETIME 37
-#define ATTR_DECLARE 38
-#define ATTR_DEFER 39
-#define ATTR_DIR 40
-#define ATTR_DISABLED 41
-#define ATTR_ENCTYPE 42
-#define ATTR_FACE 43
-#define ATTR_FOR 44
-#define ATTR_FRAME 45
-#define ATTR_FRAMEBORDER 46
-#define ATTR_HEADERS 47
-#define ATTR_HEIGHT 48
-#define ATTR_HIDDEN 49
-#define ATTR_HREF 50
-#define ATTR_HREFLANG 51
-#define ATTR_HSPACE 52
-#define ATTR_HTML 53
-#define ATTR_HTTP_EQUIV 54
-#define ATTR_ID 55
-#define ATTR_ISMAP 56
-#define ATTR_LABEL 57
-#define ATTR_LANG 58
-#define ATTR_LANGUAGE 59
-#define ATTR_LEFT 60
-#define ATTR_LEFTMARGIN 61
-#define ATTR_LINK 62
-#define ATTR_LONGDESC 63
-#define ATTR_MARGINHEIGHT 64
-#define ATTR_MARGINWIDTH 65
-#define ATTR_MAXLENGTH 66
-#define ATTR_MEDIA 67
-#define ATTR_METHOD 68
-#define ATTR_MULTIPLE 69
-#define ATTR_NAME 70
-#define ATTR_NOHREF 71
-#define ATTR_NORESIZE 72
-#define ATTR_NOSAVE 73
-#define ATTR_NOSHADE 74
-#define ATTR_NOWRAP 75
-#define ATTR_OBJECT 76
-#define ATTR_ONABORT 77
-#define ATTR_ONBLUR 78
-#define ATTR_ONCHANGE 79
-#define ATTR_ONCLICK 80
-#define ATTR_ONDBLCLICK 81
-#define ATTR_ONERROR 82
-#define ATTR_ONFOCUS 83
-#define ATTR_ONKEYDOWN 84
-#define ATTR_ONKEYPRESS 85
-#define ATTR_ONKEYUP 86
-#define ATTR_ONLOAD 87
-#define ATTR_ONMOUSEDOWN 88
-#define ATTR_ONMOUSEMOVE 89
-#define ATTR_ONMOUSEOUT 90
-#define ATTR_ONMOUSEOVER 91
-#define ATTR_ONMOUSEUP 92
-#define ATTR_ONRESET 93
-#define ATTR_ONSELECT 94
-#define ATTR_ONSUBMIT 95
-#define ATTR_ONUNLOAD 96
-#define ATTR_OVERSRC 97
-#define ATTR_PAGEX 98
-#define ATTR_PAGEY 99
-#define ATTR_PLAIN 100
-#define ATTR_PLUGINPAGE 101
-#define ATTR_PLUGINSPAGE 102
-#define ATTR_PLUGINURL 103
-#define ATTR_PROFILE 104
-#define ATTR_PROMPT 105
-#define ATTR_READONLY 106
-#define ATTR_REL 107
-#define ATTR_REV 108
-#define ATTR_ROWS 109
-#define ATTR_ROWSPAN 110
-#define ATTR_RULES 111
-#define ATTR_SCHEME 112
-#define ATTR_SCOPE 113
-#define ATTR_SCROLLING 114
-#define ATTR_SELECTED 115
-#define ATTR_SHAPE 116
-#define ATTR_SIZE 117
-#define ATTR_SPAN 118
-#define ATTR_SRC 119
-#define ATTR_STANDBY 120
-#define ATTR_START 121
-#define ATTR_STYLE 122
-#define ATTR_SUMMARY 123
-#define ATTR_TABINDEX 124
-#define ATTR_TARGET 125
-#define ATTR_TEXT 126
-#define ATTR_TITLE 127
-#define ATTR_TOP 128
-#define ATTR_TOPMARGIN 129
-#define ATTR_TYPE 130
-#define ATTR_UNKNOWN 131
-#define ATTR_USEMAP 132
-#define ATTR_VALIGN 133
-#define ATTR_VALUE 134
-#define ATTR_VALUETYPE 135
-#define ATTR_VERSION 136
-#define ATTR_VISIBILITY 137
-#define ATTR_VLINK 138
-#define ATTR_VSPACE 139
-#define ATTR_WIDTH 140
-#define ATTR_WRAP 141
-#define ATTR_Z_INDEX 142
-DOMString getAttrName(unsigned short id);
-
-#endif
diff --git a/WebCore/khtml/misc/htmltags.c b/WebCore/khtml/misc/htmltags.c
deleted file mode 100644
index 847dba2..0000000
--- a/WebCore/khtml/misc/htmltags.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/* ANSI-C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -a -L ANSI-C -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag htmltags.gperf */
-/* This file is automatically generated from htmltags.in by maketags, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmltags.h"
-struct tags {
- const char *name;
- int id;
-};
-/* maximum key range = 277, duplicates = 1 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash_tag (register const char *str, register unsigned int len)
-{
- static const unsigned short asso_values[] =
- {
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 0, 278, 278, 278, 40,
- 45, 60, 65, 20, 30, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 0, 117, 35,
- 20, 0, 90, 75, 30, 10, 0, 5, 45, 80,
- 10, 0, 25, 5, 5, 40, 0, 60, 15, 278,
- 30, 35, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- case 10:
- hval += asso_values[(unsigned char)str[9]];
- case 9:
- hval += asso_values[(unsigned char)str[8]];
- case 8:
- hval += asso_values[(unsigned char)str[7]];
- case 7:
- hval += asso_values[(unsigned char)str[6]];
- case 6:
- hval += asso_values[(unsigned char)str[5]];
- case 5:
- hval += asso_values[(unsigned char)str[4]];
- case 4:
- hval += asso_values[(unsigned char)str[3]];
- case 3:
- hval += asso_values[(unsigned char)str[2]];
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-const struct tags *
-findTag (register const char *str, register unsigned int len)
-{
- enum
- {
- TOTAL_KEYWORDS = 102,
- MIN_WORD_LENGTH = 1,
- MAX_WORD_LENGTH = 10,
- MIN_HASH_VALUE = 1,
- MAX_HASH_VALUE = 277
- };
-
- static const unsigned char lengthtable[] =
- {
- 1, 2, 1, 2, 4, 1, 2, 2, 3, 1, 2, 3, 2, 3,
- 1, 2, 8, 2, 3, 4, 6, 2, 4, 5, 6, 2, 4, 5,
- 1, 2, 3, 6, 2, 3, 2, 4, 2, 4, 2, 3, 4, 6,
- 7, 5, 2, 5, 2, 6, 7, 4, 2, 3, 5, 5, 1, 6,
- 3, 2, 5, 6, 7, 3, 9, 6, 7, 8, 6, 3, 3, 3,
- 4, 4, 6, 6, 4, 4, 5, 3, 5, 7, 4, 5, 4, 5,
- 6, 6, 7, 8, 3, 5, 8, 5, 3, 5, 8, 10, 8, 7,
- 4, 8, 8, 10
- };
- static const struct tags wordlist_tag[] =
- {
- {"a", ID_A},
- {"tt", ID_TT},
- {"q", ID_Q},
- {"tr", ID_TR},
- {"area", ID_AREA},
- {"i", ID_I},
- {"dt", ID_DT},
- {"td", ID_TD},
- {"var", ID_VAR},
- {"p", ID_P},
- {"th", ID_TH},
- {"pre", ID_PRE},
- {"hr", ID_HR},
- {"dir", ID_DIR},
- {"s", ID_S},
- {"dd", ID_DD},
- {"textarea", ID_TEXTAREA},
- {"ol", ID_OL},
- {"div", ID_DIV},
- {"cite", ID_CITE},
- {"option", ID_OPTION},
- {"h5", ID_H5},
- {"head", ID_HEAD},
- {"thead", ID_THEAD},
- {"center", ID_CENTER},
- {"li", ID_LI},
- {"code", ID_CODE},
- {"title", ID_TITLE},
- {"u", ID_U},
- {"h6", ID_H6},
- {"ins", ID_INS},
- {"strike", ID_STRIKE},
- {"dl", ID_DL},
- {"del", ID_DEL},
- {"h1", ID_H1},
- {"link", ID_LINK},
- {"h2", ID_H2},
- {"span", ID_SPAN},
- {"em", ID_EM},
- {"col", ID_COL},
- {"meta", ID_META},
- {"anchor", ID_A},
- {"caption", ID_CAPTION},
- {"layer", ID_LAYER},
- {"h3", ID_H3},
- {"tfoot", ID_TFOOT},
- {"h4", ID_H4},
- {"applet", ID_APPLET},
- {"nolayer", ID_NOLAYER},
- {"font", ID_FONT},
- {"ul", ID_UL},
- {"map", ID_MAP},
- {"input", ID_INPUT},
- {"param", ID_PARAM},
- {"b", ID_B},
- {"script", ID_SCRIPT},
- {"dfn", ID_DFN},
- {"br", ID_BR},
- {"style", ID_STYLE},
- {"select", ID_SELECT},
- {"isindex", ID_ISINDEX},
- {"sup", ID_SUP},
- {"plaintext", ID_PLAINTEXT},
- {"keygen", ID_KEYGEN},
- {"address", ID_ADDRESS},
- {"noscript", ID_NOSCRIPT},
- {"strong", ID_STRONG},
- {"xmp", ID_PRE},
- {"bdo", ID_BDO},
- {"kbd", ID_KBD},
- {"samp", ID_SAMP},
- {"menu", ID_MENU},
- {"legend", ID_LEGEND},
- {"object", ID_OBJECT},
- {"html", ID_HTML},
- {"base", ID_BASE},
- {"table", ID_TABLE},
- {"img", ID_IMG},
- {"image", ID_IMG},
- {"acronym", ID_ACRONYM},
- {"body", ID_BODY},
- {"tbody", ID_TBODY},
- {"form", ID_FORM},
- {"frame", ID_FRAME},
- {"iframe", ID_IFRAME},
- {"button", ID_BUTTON},
- {"listing", ID_LISTING},
- {"optgroup", ID_OPTGROUP},
- {"big", ID_BIG},
- {"label", ID_LABEL},
- {"fieldset", ID_FIELDSET},
- {"small", ID_SMALL},
- {"sub", ID_SUB},
- {"embed", ID_EMBED},
- {"frameset", ID_FRAMESET},
- {"-konqblock", ID__KONQBLOCK},
- {"noframes", ID_NOFRAMES},
- {"noembed", ID_NOEMBED},
- {"abbr", ID_ABBR},
- {"colgroup", ID_COLGROUP},
- {"basefont", ID_BASEFONT},
- {"blockquote", ID_BLOCKQUOTE}
- };
-
- static const signed char lookup[] =
- {
- -1, 0, 1, -1, -1, -1, 2, 3,
- -1, 4, -1, 5, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -127, 8,
- -96, -2, 9, -1, -1, -1, -1, -1,
- 10, 11, -1, -1, -1, 12, 13, -1,
- -1, 14, 15, 16, -1, -1, -1, 17,
- 18, 19, -1, 20, 21, -1, 22, 23,
- 24, 25, -1, 26, 27, 28, 29, 30,
- -1, -1, 31, 32, 33, -1, -1, -1,
- 34, -1, 35, -1, -1, 36, -1, 37,
- -1, -1, 38, 39, 40, -1, 41, 42,
- -1, -1, 43, -1, 44, -1, -1, 45,
- -1, 46, -1, -1, -1, 47, 48, -1,
- 49, -1, -1, 50, 51, -1, 52, -1,
- -1, -1, -1, 53, -1, -1, 54, -1,
- -1, 55, -1, 56, 57, 58, 59, 60,
- 61, 62, -1, 63, 64, 65, -1, -1,
- 66, -1, 67, -1, 68, -1, -1, -1,
- -1, 69, -1, -1, -1, 70, -1, -1,
- -1, -1, 71, -1, 72, -1, 73, 74,
- -1, 75, -1, -1, -1, -1, -1, 76,
- 77, -1, 78, -1, 79, -1, -1, -1,
- 80, 81, -1, 82, 83, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 84,
- -1, 85, -1, -1, -1, 86, 87, -1,
- -1, -1, -1, -1, -1, 88, -1, -1,
- -1, -1, -1, -1, 89, 90, -1, 91,
- -1, -1, -1, -1, 92, -1, 93, 94,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 95, 96, 97, -1, -1, -1, -1, -1,
- -1, -1, -1, 98, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 99, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 100, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 101
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash_tag (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register int index = lookup[key];
-
- if (index >= 0)
- {
- if (len == lengthtable[index])
- {
- register const char *s = wordlist_tag[index].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist_tag[index];
- }
- }
- else if (index < -TOTAL_KEYWORDS)
- {
- register int offset = - 1 - TOTAL_KEYWORDS - index;
- register const unsigned char *lengthptr = &lengthtable[TOTAL_KEYWORDS + lookup[offset]];
- register const struct tags *wordptr = &wordlist_tag[TOTAL_KEYWORDS + lookup[offset]];
- register const struct tags *wordendptr = wordptr + -lookup[offset + 1];
-
- while (wordptr < wordendptr)
- {
- if (len == *lengthptr)
- {
- register const char *s = wordptr->name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return wordptr;
- }
- lengthptr++;
- wordptr++;
- }
- }
- }
- }
- return 0;
-}
-
-
-static const char * tagList[] = {
-"",
- "A",
- "ABBR",
- "ACRONYM",
- "ADDRESS",
- "APPLET",
- "AREA",
- "B",
- "BASE",
- "BASEFONT",
- "BDO",
- "BIG",
- "BLOCKQUOTE",
- "BODY",
- "BR",
- "BUTTON",
- "CAPTION",
- "CENTER",
- "CITE",
- "CODE",
- "COL",
- "COLGROUP",
- "DD",
- "DEL",
- "DFN",
- "DIR",
- "DIV",
- "DL",
- "DT",
- "EM",
- "EMBED",
- "FIELDSET",
- "FONT",
- "FORM",
- "FRAME",
- "FRAMESET",
- "H1",
- "H2",
- "H3",
- "H4",
- "H5",
- "H6",
- "HEAD",
- "HR",
- "HTML",
- "I",
- "IFRAME",
- "IMG",
- "INPUT",
- "INS",
- "ISINDEX",
- "KBD",
- "KEYGEN",
- "-KONQBLOCK",
- "LABEL",
- "LAYER",
- "LEGEND",
- "LI",
- "LINK",
- "LISTING",
- "MAP",
- "MENU",
- "META",
- "NOEMBED",
- "NOFRAMES",
- "NOSCRIPT",
- "NOLAYER",
- "OBJECT",
- "OL",
- "OPTGROUP",
- "OPTION",
- "P",
- "PARAM",
- "PLAINTEXT",
- "PRE",
- "Q",
- "S",
- "SAMP",
- "SCRIPT",
- "SELECT",
- "SMALL",
- "SPAN",
- "STRIKE",
- "STRONG",
- "STYLE",
- "SUB",
- "SUP",
- "TABLE",
- "TBODY",
- "TD",
- "TEXTAREA",
- "TFOOT",
- "TH",
- "THEAD",
- "TITLE",
- "TR",
- "TT",
- "U",
- "UL",
- "VAR",
-"TEXT",
-"COMMENT",
- "/A",
- "/ABBR",
- "/ACRONYM",
- "/ADDRESS",
- "/APPLET",
- "/AREA",
- "/B",
- "/BASE",
- "/BASEFONT",
- "/BDO",
- "/BIG",
- "/BLOCKQUOTE",
- "/BODY",
- "/BR",
- "/BUTTON",
- "/CAPTION",
- "/CENTER",
- "/CITE",
- "/CODE",
- "/COL",
- "/COLGROUP",
- "/DD",
- "/DEL",
- "/DFN",
- "/DIR",
- "/DIV",
- "/DL",
- "/DT",
- "/EM",
- "/EMBED",
- "/FIELDSET",
- "/FONT",
- "/FORM",
- "/FRAME",
- "/FRAMESET",
- "/H1",
- "/H2",
- "/H3",
- "/H4",
- "/H5",
- "/H6",
- "/HEAD",
- "/HR",
- "/HTML",
- "/I",
- "/IFRAME",
- "/IMG",
- "/INPUT",
- "/INS",
- "/ISINDEX",
- "/KBD",
- "/KEYGEN",
- "/-KONQBLOCK",
- "/LABEL",
- "/LAYER",
- "/LEGEND",
- "/LI",
- "/LINK",
- "/LISTING",
- "/MAP",
- "/MENU",
- "/META",
- "/NOEMBED",
- "/NOFRAMES",
- "/NOSCRIPT",
- "/NOLAYER",
- "/OBJECT",
- "/OL",
- "/OPTGROUP",
- "/OPTION",
- "/P",
- "/PARAM",
- "/PLAINTEXT",
- "/PRE",
- "/Q",
- "/S",
- "/SAMP",
- "/SCRIPT",
- "/SELECT",
- "/SMALL",
- "/SPAN",
- "/STRIKE",
- "/STRONG",
- "/STYLE",
- "/SUB",
- "/SUP",
- "/TABLE",
- "/TBODY",
- "/TD",
- "/TEXTAREA",
- "/TFOOT",
- "/TH",
- "/THEAD",
- "/TITLE",
- "/TR",
- "/TT",
- "/U",
- "/UL",
- "/VAR",
- 0
-};
-DOMString getTagName(unsigned short id)
-{
- if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;
- return DOMString(tagList[id]);
-};
diff --git a/WebCore/khtml/misc/htmltags.gperf b/WebCore/khtml/misc/htmltags.gperf
deleted file mode 100644
index 238eb77..0000000
--- a/WebCore/khtml/misc/htmltags.gperf
+++ /dev/null
@@ -1,113 +0,0 @@
-%{
-/* This file is automatically generated from htmltags.in by maketags, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmltags.h"
-%}
-struct tags {
- const char *name;
- int id;
-};
-%%
-a, ID_A
-abbr, ID_ABBR
-acronym, ID_ACRONYM
-address, ID_ADDRESS
-applet, ID_APPLET
-area, ID_AREA
-b, ID_B
-base, ID_BASE
-basefont, ID_BASEFONT
-bdo, ID_BDO
-big, ID_BIG
-blockquote, ID_BLOCKQUOTE
-body, ID_BODY
-br, ID_BR
-button, ID_BUTTON
-caption, ID_CAPTION
-center, ID_CENTER
-cite, ID_CITE
-code, ID_CODE
-col, ID_COL
-colgroup, ID_COLGROUP
-dd, ID_DD
-del, ID_DEL
-dfn, ID_DFN
-dir, ID_DIR
-div, ID_DIV
-dl, ID_DL
-dt, ID_DT
-em, ID_EM
-embed, ID_EMBED
-fieldset, ID_FIELDSET
-font, ID_FONT
-form, ID_FORM
-frame, ID_FRAME
-frameset, ID_FRAMESET
-h1, ID_H1
-h2, ID_H2
-h3, ID_H3
-h4, ID_H4
-h5, ID_H5
-h6, ID_H6
-head, ID_HEAD
-hr, ID_HR
-html, ID_HTML
-i, ID_I
-iframe, ID_IFRAME
-img, ID_IMG
-input, ID_INPUT
-ins, ID_INS
-isindex, ID_ISINDEX
-kbd, ID_KBD
-keygen, ID_KEYGEN
--konqblock, ID__KONQBLOCK
-label, ID_LABEL
-layer, ID_LAYER
-legend, ID_LEGEND
-li, ID_LI
-link, ID_LINK
-listing, ID_LISTING
-map, ID_MAP
-menu, ID_MENU
-meta, ID_META
-noembed, ID_NOEMBED
-noframes, ID_NOFRAMES
-noscript, ID_NOSCRIPT
-nolayer, ID_NOLAYER
-object, ID_OBJECT
-ol, ID_OL
-optgroup, ID_OPTGROUP
-option, ID_OPTION
-p, ID_P
-param, ID_PARAM
-plaintext, ID_PLAINTEXT
-pre, ID_PRE
-q, ID_Q
-s, ID_S
-samp, ID_SAMP
-script, ID_SCRIPT
-select, ID_SELECT
-small, ID_SMALL
-span, ID_SPAN
-strike, ID_STRIKE
-strong, ID_STRONG
-style, ID_STYLE
-sub, ID_SUB
-sup, ID_SUP
-table, ID_TABLE
-tbody, ID_TBODY
-td, ID_TD
-textarea, ID_TEXTAREA
-tfoot, ID_TFOOT
-th, ID_TH
-thead, ID_THEAD
-title, ID_TITLE
-tr, ID_TR
-tt, ID_TT
-u, ID_U
-ul, ID_UL
-var, ID_VAR
-anchor, ID_A
-image, ID_IMG
-xmp, ID_PRE
-%%
diff --git a/WebCore/khtml/misc/htmltags.h b/WebCore/khtml/misc/htmltags.h
deleted file mode 100644
index 3a26df1..0000000
--- a/WebCore/khtml/misc/htmltags.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This file is automatically generated from
-htmltags.in by maketags, do not edit */
-/* Copyright 1999 Lars Knoll */
-
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
-
-#include "dom_string.h"
-
-DOM::DOMString getTagName(unsigned short id);
-#define ID_A 1
-#define ID_ABBR 2
-#define ID_ACRONYM 3
-#define ID_ADDRESS 4
-#define ID_APPLET 5
-#define ID_AREA 6
-#define ID_B 7
-#define ID_BASE 8
-#define ID_BASEFONT 9
-#define ID_BDO 10
-#define ID_BIG 11
-#define ID_BLOCKQUOTE 12
-#define ID_BODY 13
-#define ID_BR 14
-#define ID_BUTTON 15
-#define ID_CAPTION 16
-#define ID_CENTER 17
-#define ID_CITE 18
-#define ID_CODE 19
-#define ID_COL 20
-#define ID_COLGROUP 21
-#define ID_DD 22
-#define ID_DEL 23
-#define ID_DFN 24
-#define ID_DIR 25
-#define ID_DIV 26
-#define ID_DL 27
-#define ID_DT 28
-#define ID_EM 29
-#define ID_EMBED 30
-#define ID_FIELDSET 31
-#define ID_FONT 32
-#define ID_FORM 33
-#define ID_FRAME 34
-#define ID_FRAMESET 35
-#define ID_H1 36
-#define ID_H2 37
-#define ID_H3 38
-#define ID_H4 39
-#define ID_H5 40
-#define ID_H6 41
-#define ID_HEAD 42
-#define ID_HR 43
-#define ID_HTML 44
-#define ID_I 45
-#define ID_IFRAME 46
-#define ID_IMG 47
-#define ID_INPUT 48
-#define ID_INS 49
-#define ID_ISINDEX 50
-#define ID_KBD 51
-#define ID_KEYGEN 52
-#define ID__KONQBLOCK 53
-#define ID_LABEL 54
-#define ID_LAYER 55
-#define ID_LEGEND 56
-#define ID_LI 57
-#define ID_LINK 58
-#define ID_LISTING 59
-#define ID_MAP 60
-#define ID_MENU 61
-#define ID_META 62
-#define ID_NOEMBED 63
-#define ID_NOFRAMES 64
-#define ID_NOSCRIPT 65
-#define ID_NOLAYER 66
-#define ID_OBJECT 67
-#define ID_OL 68
-#define ID_OPTGROUP 69
-#define ID_OPTION 70
-#define ID_P 71
-#define ID_PARAM 72
-#define ID_PLAINTEXT 73
-#define ID_PRE 74
-#define ID_Q 75
-#define ID_S 76
-#define ID_SAMP 77
-#define ID_SCRIPT 78
-#define ID_SELECT 79
-#define ID_SMALL 80
-#define ID_SPAN 81
-#define ID_STRIKE 82
-#define ID_STRONG 83
-#define ID_STYLE 84
-#define ID_SUB 85
-#define ID_SUP 86
-#define ID_TABLE 87
-#define ID_TBODY 88
-#define ID_TD 89
-#define ID_TEXTAREA 90
-#define ID_TFOOT 91
-#define ID_TH 92
-#define ID_THEAD 93
-#define ID_TITLE 94
-#define ID_TR 95
-#define ID_TT 96
-#define ID_U 97
-#define ID_UL 98
-#define ID_VAR 99
-#define ID_TEXT 100
-#define ID_COMMENT 101
-#define ID_CLOSE_TAG 101
-
-#endif
diff --git a/WebCore/kwq/KWQAsyncIO.h b/WebCore/kwq/KWQAsyncIO.h
index c9dfbb8..a74ab92 100644
--- a/WebCore/kwq/KWQAsyncIO.h
+++ b/WebCore/kwq/KWQAsyncIO.h
@@ -26,4 +26,20 @@
#ifndef QASYNCIO_H_
#define QASYNCIO_H_
+class QAsynchIO {
+protected:
+ void ready();
+};
+
+class QDataSource : public QAsynchIO {
+public:
+ virtual void rewind();
+ void maybeReady();
+};
+
+class QDataSink : public QAsynchIO {
+public:
+ virtual void receive(const uchar*, int count)=0;
+};
+
#endif
diff --git a/WebCore/kwq/KWQBrush.h b/WebCore/kwq/KWQBrush.h
index 3f526a4..c757d04 100644
--- a/WebCore/kwq/KWQBrush.h
+++ b/WebCore/kwq/KWQBrush.h
@@ -26,4 +26,13 @@
#ifndef QBRUSH_H_
#define QBRUSH_H_
+#include "qcolor.h"
+
+class QBrush {
+friend class QPainter;
+public:
+ QBrush();
+ QBrush(const QColor &);
+};
+
#endif
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
index 0acd320..ab7968d 100644
--- a/WebCore/kwq/KWQBuffer.h
+++ b/WebCore/kwq/KWQBuffer.h
@@ -27,6 +27,14 @@
#define QBUFFER_H_
class QBuffer {
+public:
+ QByteArray buffer() const;
+
+ uint size() const;
+ bool isOpen();
+ bool open(int);
+ void close();
+ int writeBlock(const char *, uint);
};
#endif
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 097c45c..ad5e599 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -38,10 +38,28 @@ typedef QArray<char> QByteArray;
class QCString : public QByteArray {
public:
QCString();
- QCString(uint);
+ QCString(int);
+ QCString(const char *);
QCString(const char *, uint);
+ QCString(const QCString&);
+
+ QCString mid(uint index, uint len=0xffffffff) const;
+
+ int find(const char *str, int index=0, bool cs=TRUE) const;
+ bool isEmpty() const;
+ bool isNull() const;
+ uint length() const;
+ QCString lower() const;
+
+ operator const char *() const;
+ QCString &operator=(const QCString&);
+ QCString &operator=(const char *);
+ QCString &operator+=(const char *);
+ QCString &operator+=(const QCString&);
};
+bool operator==(const char *, const QCString &);
+bool operator==(const QCString &, const char *);
bool operator!=(const char *, const QCString &);
bool operator!=(const QCString &, const char *);
diff --git a/WebCore/kwq/KWQCollection.h b/WebCore/kwq/KWQCollection.h
index 2d45385..0a17687 100644
--- a/WebCore/kwq/KWQCollection.h
+++ b/WebCore/kwq/KWQCollection.h
@@ -29,6 +29,7 @@
class QCollection {
public:
typedef void *Item;
+ void setAutoDelete(bool);
protected:
virtual Item newItem(Item);
};
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 721d135..21b1a0d 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -26,21 +26,27 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
-// Forward declaration for khtml/html/html_imageimpl.h:58
-class QImage;
-
class QString;
class QColor {
public:
+ QColor();
+ QColor(const char *);
+
QString name() const;
+ void setNamedColor(const QString&);
int red() const;
int green() const;
int blue() const;
bool isValid() const;
+ void setRgb(int,int,int);
+ void setRgb(int);
+
+ QColor light(int f = 150) const;
-bool operator==(const QColor &x) const;
-bool operator!=(const QColor &x) const;
+ QColor &operator=(const QColor &);
+ bool operator==(const QColor &x) const;
+ bool operator!=(const QColor &x) const;
};
diff --git a/WebCore/kwq/KWQDict.h b/WebCore/kwq/KWQDict.h
index 398f1fe..56227bb 100644
--- a/WebCore/kwq/KWQDict.h
+++ b/WebCore/kwq/KWQDict.h
@@ -26,7 +26,27 @@
#ifndef QDICT_H_
#define QDICT_H_
-template <class T> class QDict {
+#include "qcollection.h"
+
+template <class T> class QDict : public QCollection {
+public:
+ QDict(int size=17, bool caseSensitive=TRUE);
+
+ void insert(const QString &, const T *);
+ bool remove(const QString &);
+ T *find(const QString &) const;
+ uint count() const;
+};
+
+template<class T> class QDictIterator {
+public:
+ QDictIterator(const QDict<T> &);
+
+ uint count() const;
+ T *current() const;
+ T *toFirst();
+
+ T *operator++();
};
#endif
diff --git a/WebCore/kwq/KWQFont.h b/WebCore/kwq/KWQFont.h
index 3ca1e59..2c819e2 100644
--- a/WebCore/kwq/KWQFont.h
+++ b/WebCore/kwq/KWQFont.h
@@ -31,6 +31,7 @@ class QString;
class QFont {
public:
+ enum CharSet { Latin1 };
enum Weight { Normal = 50, Bold = 63 };
int pixelSize() const;
@@ -44,7 +45,9 @@ public:
bool bold() const;
bool operator==(const QFont &x) const;
bool operator!=(const QFont &x) const;
- enum CharSet {};
+
+private:
+ friend class QPainter;
};
#endif
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 0bec0e4..90cbe49 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -28,9 +28,12 @@
class QRect;
class QChar;
+class QFont;
class QFontMetrics {
public:
+ QFontMetrics();
+ QFontMetrics(const QFont&);
QRect boundingRect(QChar) const;
};
diff --git a/WebCore/kwq/KWQImage.h b/WebCore/kwq/KWQImage.h
index f2e043b..d824748 100644
--- a/WebCore/kwq/KWQImage.h
+++ b/WebCore/kwq/KWQImage.h
@@ -27,6 +27,13 @@
#define QIMAGE_H_
class QImage {
+public:
+ int width() const;
+ int height() const;
+ int depth() const;
+ int pixelIndex(int,int) const;
+ QImage createAlphaMask(int conversion_flags=0) const;
+ bool hasAlphaBuffer() const;
};
#endif
diff --git a/WebCore/kwq/KWQKCharsets.h b/WebCore/kwq/KWQKCharsets.h
index b2854d0..ea088b9 100644
--- a/WebCore/kwq/KWQKCharsets.h
+++ b/WebCore/kwq/KWQKCharsets.h
@@ -26,11 +26,13 @@
#ifndef KCHARSETS_H_
#define KCHARSETS_H_
-class QFont;
+#include <qfont.h>
class QString;
+class QTextCodec;
class KCharsets {
public:
+ QTextCodec *codecForName(const QString &name, bool &ok) const;
void setQFont(QFont &f, QString charset) const;
QString xCharsetName(QFont::CharSet) const;
bool supportsScript(const QFont &f, QFont::CharSet charset);
diff --git a/WebCore/kwq/KWQKGlobal.h b/WebCore/kwq/KWQKGlobal.h
index 1d8290d..3c3dfaa 100644
--- a/WebCore/kwq/KWQKGlobal.h
+++ b/WebCore/kwq/KWQKGlobal.h
@@ -26,10 +26,13 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
-class KInstance;
+#include <qstring.h>
+#include <kinstance.h>
+
class KCharsets;
class KLocale;
class KStandardDirs;
+class KConfig;
#define kMin(a, b) ((a) < (b) ? (a) : (b))
#define kMax(a, b) ((a) > (b) ? (a) : (b))
@@ -40,6 +43,9 @@ public:
static KCharsets *charsets();
static KLocale *locale();
static KStandardDirs *dirs();
+ static KConfig *config();
+
+ static const QString &staticQString(const QString &);
};
#endif
diff --git a/WebCore/kwq/KWQKIconLoader.h b/WebCore/kwq/KWQKIconLoader.h
index 317acfe..754b845 100644
--- a/WebCore/kwq/KWQKIconLoader.h
+++ b/WebCore/kwq/KWQKIconLoader.h
@@ -26,4 +26,15 @@
#ifndef KICONLOADER_H_
#define KICONLOADER_H_
+#include <qpixmap.h>
+#include <qstring.h>
+#include <kinstance.h>
+#include "kicontheme.h"
+
+class KIconLoader {
+public:
+ QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState,
+ QString *path_store=0L, bool canReturnNull=false) const;
+};
+
#endif
diff --git a/WebCore/kwq/KWQKImageIO.h b/WebCore/kwq/KWQKImageIO.h
index 77ead2d..5f730df 100644
--- a/WebCore/kwq/KWQKImageIO.h
+++ b/WebCore/kwq/KWQKImageIO.h
@@ -26,4 +26,11 @@
#ifndef KIMAGEIO_H_
#define KIMAGEIO_H_
+class KImageIO {
+public:
+ enum Mode { Reading, Writing };
+
+ static QStringList mimeTypes(Mode _mode = Writing);
+};
+
#endif
diff --git a/WebCore/kwq/KWQKInstance.h b/WebCore/kwq/KWQKInstance.h
index c47513a..5e93d92 100644
--- a/WebCore/kwq/KWQKInstance.h
+++ b/WebCore/kwq/KWQKInstance.h
@@ -26,8 +26,11 @@
#ifndef KINSTANCE_H_
#define KINSTANCE_H_
+class KIconLoader;
+
class KInstance {
public:
+ KIconLoader *iconLoader() const;
};
#endif
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/kwq/KWQKJob.h
index a7267e6..f15f47a 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/kwq/KWQKJob.h
@@ -26,12 +26,18 @@
#ifndef JOB_H_
#define JOB_H_
+#include <kurl.h>
+#include "jobclasses.h"
+
+// for time_t
+#include <sys/types.h>
+
// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
-class Job {
-};
+SimpleJob *http_update_cache(const KURL& url, bool no_cache, time_t expireDate);
+TransferJob *get(const KURL& url, bool reload=false, bool showProgressInfo = true);
-}
+} // namespace KIO
#endif
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 0ef187d..7efdd6c 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -26,4 +26,26 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
+class QString;
+
+namespace KIO {
+
+class Job : public QObject {
+public:
+ int error();
+ const QString & errorText();
+ virtual void kill(bool quietly = true);
+};
+
+class SimpleJob : public KIO::Job {
+};
+
+class TransferJob : public SimpleJob {
+public:
+ bool isErrorPage() const;
+ void addMetaData(const QString &key, const QString &value);
+};
+
+} // namespace KIO
+
#endif
diff --git a/WebCore/kwq/KWQKStaticDeleter.h b/WebCore/kwq/KWQKStaticDeleter.h
index 7728b21..f8b45a3 100644
--- a/WebCore/kwq/KWQKStaticDeleter.h
+++ b/WebCore/kwq/KWQKStaticDeleter.h
@@ -26,4 +26,9 @@
#ifndef KSTATICDELETER_H_
#define KSTATICDELETER_H_
+template <class T> class KStaticDeleter {
+public:
+ T *setObject(T *obj, bool isArray = false);
+};
+
#endif
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index 0a99517..3f19b48 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -51,6 +51,7 @@ public:
void setPath(const QString& path);
void setPort(unsigned short int);
bool isEmpty() const;
+ bool isMalformed() const;
QString prettyURL(int _trailing = 0) const;
};
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index c95c2cc..ce27175 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -30,6 +30,7 @@
template <class T> class QArray {
public:
+ T &at(uint) const;
T *data() const;
uint size() const;
diff --git a/WebCore/kwq/KWQMovie.h b/WebCore/kwq/KWQMovie.h
index f6aba29..89d2531 100644
--- a/WebCore/kwq/KWQMovie.h
+++ b/WebCore/kwq/KWQMovie.h
@@ -26,4 +26,35 @@
#ifndef QMOVIE_H_
#define QMOVIE_H_
+#include "qobject.h"
+#include "qpixmap.h"
+#include "qimage.h"
+
+class QMovie {
+public:
+ enum Status { EndOfFrame, EndOfMovie };
+
+ QMovie();
+ QMovie(QDataSource*, int bufsize=1024);
+
+ void unpause();
+ void pause();
+ void restart();
+ bool finished();
+ bool running();
+ int frameNumber() const;
+
+ const QRect& getValidRect() const;
+ const QPixmap& framePixmap() const;
+ const QImage& frameImage() const;
+
+ void connectResize(QObject* receiver, const char *member);
+ void connectUpdate(QObject* receiver, const char *member);
+ void connectStatus(QObject* receiver, const char *member);
+
+ void disconnectResize(QObject* receiver, const char *member=0);
+ void disconnectUpdate(QObject* receiver, const char *member=0);
+ void disconnectStatus(QObject* receiver, const char *member=0);
+};
+
#endif
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index 55de268..4bfe679 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -26,6 +26,8 @@
#ifndef QNAMESPACE_H_
#define QNAMESPACE_H_
+class QColor;
+
class Qt {
public:
enum ButtonState {
@@ -36,6 +38,8 @@ public:
AltButton,
ShiftButton,
};
+
+ static const QColor &black;
};
#endif
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 2faba76..0542b16 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -26,7 +26,24 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "qpaintdevice.h"
+#include "qcolor.h"
+#include "qbrush.h"
+
+class QFont;
+class QFontMetrics;
+class QPixmap;
+
class QPainter {
+public:
+ QPainter();
+ QPainter(const QPaintDevice *);
+
+ void setFont(const QFont &);
+ QFontMetrics fontMetrics() const;
+
+ void fillRect(int x, int y, int w, int h, const QBrush &);
+ void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &);
};
#endif
diff --git a/WebCore/kwq/KWQPalette.h b/WebCore/kwq/KWQPalette.h
index e944a6f..079ad89 100644
--- a/WebCore/kwq/KWQPalette.h
+++ b/WebCore/kwq/KWQPalette.h
@@ -26,16 +26,34 @@
#ifndef QPALETTE_H_
#define QPALETTE_H_
+class QColor;
+
class QColorGroup {
public:
- enum ColorRole { Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+ enum ColorRole { Foreground, Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+
void setColor(ColorRole role, const QColor &color);
+ const QColor &foreground() const;
+ const QColor &shadow() const;
+ const QColor &light() const;
+ const QColor &midlight() const;
+ const QColor &dark() const;
+ const QColor &base() const;
+ const QColor &buttonText() const;
+ const QColor &button() const;
+ const QColor &text() const;
+ const QColor &background() const;
};
class QPalette {
public:
enum ColorGroup { Active, Inactive };
+
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
+
+ const QColorGroup &active() const;
+ const QColorGroup &inactive() const;
+ const QColorGroup &disabled() const;
};
#endif
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index 56464f9..c10f325 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -27,8 +27,26 @@
#define QPIXMAP_H_
#include "qpaintdevice.h"
+#include "qstring.h"
-class QPixmap {
+class QBitmap;
+
+class QPixmap : public QPaintDevice {
+public:
+ QPixmap();
+ QPixmap(const QSize&);
+ QPixmap(const QByteArray&);
+ QPixmap(int,int);
+
+ void setMask(const QBitmap &);
+ const QBitmap *mask() const;
+
+ QSize size() const;
+ QRect rect() const;
+ int width() const;
+ int height() const;
+ bool isNull() const;
+ void resize(const QSize &);
};
#endif
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index 241d8d8..508225c 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -27,16 +27,29 @@
#define QPTRDICT_H_
#include <kwq.h>
+#include "qcollection.h"
-template <class T> class QPtrDict {
+template <class T> class QPtrDict : public QCollection {
public:
QPtrDict(int size=13);
+
uint count() const;
T *at(uint);
+ T *take(void *);
void append(const T *);
void insert(void *, const T *);
void remove(void *);
T *operator[](void *) const;
};
+template<class T> class QPtrDictIterator {
+public:
+ QPtrDictIterator(const QPtrDict<T> &);
+
+ T *current() const;
+ void *currentKey() const;
+
+ T *operator++();
+};
+
#endif
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 6266366..4b57487 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -58,6 +58,7 @@ public:
T *toFirst();
T *toLast();
T *current() const;
+ operator T *() const;
T *operator--();
T *operator++();
};
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 903ed06..700a9d1 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -26,6 +26,8 @@
#ifndef QRECT_H_
#define QRECT_H_
+class QSize;
+
class QRect {
public:
QRect();
@@ -35,6 +37,9 @@ public:
int top() const;
int width() const;
int height() const;
+ bool isNull() const;
+
+ QSize size() const;
};
#endif
diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 002fd23..25c6987 100644
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -31,10 +31,12 @@ public:
QSize();
QSize(int,int);
+ bool isValid() const;
int width() const;
int height() const;
friend inline QSize operator+(const QSize &, const QSize &);
+ friend inline bool operator!=(const QSize &, const QSize &);
};
#endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 61ed1aa..a18ae04 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -45,6 +45,7 @@ public:
bool isNull() const;
bool isDigit() const;
bool isSpace() const;
+ bool isLetter() const;
bool isLetterOrNumber() const;
uchar cell() const;
uchar row() const;
@@ -68,11 +69,15 @@ public:
class QString {
public:
static QString fromLatin1(const char*, int len = -1);
+
QString();
QString(const QChar *, uint);
QString(const char *);
+ QString(const QByteArray&);
+ QString(const QString&);
+
int toInt() const;
- int toInt(bool *) const;
+ int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
@@ -90,7 +95,6 @@ public:
int find(const QRegExp &, int index = 0, bool b = 0) const;
int findRev(char, int index = 0) const;
int findRev(const char *, int index = 0) const;
- QString left(uint) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
@@ -99,6 +103,8 @@ public:
QString arg(const QString&, int fieldwidth = 0) const;
+ QString left(uint) const;
+ QString right(uint) const;
QString mid(int, int len = 0xffffffff) const;
void fill(QChar, int len = -1);
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index e60c3ad..9e9f68d 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -26,6 +26,24 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
-class QTextCodec;
+#include "qstring.h"
+#include "qcstring.h"
+
+class QTextDecoder {
+public:
+ virtual QString toUnicode(const char* chars, int len) = 0;
+};
+
+class QTextCodec {
+public:
+ static QTextCodec *codecForMib(int mib);
+ static QTextCodec *codecForName(const char* hint, int accuracy=0);
+
+ virtual int mibEnum() const = 0;
+ virtual QTextDecoder *makeDecoder() const;
+ virtual QString toUnicode(const char *chars, int len) const;
+ QString toUnicode(const QByteArray&, int len) const;
+ QString toUnicode(const char *chars) const;
+};
#endif
diff --git a/WebCore/kwq/KWQToolTip.h b/WebCore/kwq/KWQToolTip.h
index ed8ad8b..7c024a6 100644
--- a/WebCore/kwq/KWQToolTip.h
+++ b/WebCore/kwq/KWQToolTip.h
@@ -26,4 +26,11 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
+class QPalette;
+
+class QToolTip {
+public:
+ static QPalette palette();
+};
+
#endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index b09b079..1472564 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -31,6 +31,7 @@ public:
QValueListIterator operator++();
bool operator!=(const QValueListIterator<T>& it);
T& operator*();
+ QValueListIterator<T>& operator--();
};
template<class T> class QValueListConstIterator {
@@ -47,19 +48,22 @@ 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);
- Iterator remove(Iterator it);
+ void append(const T&);
+ void remove(const T&);
+ uint contains(const T&);
+ Iterator remove(Iterator);
+ Iterator fromLast();
const T& first() const;
const T& last() const;
Iterator begin();
Iterator end();
ConstIterator begin() const;
ConstIterator end() const;
- T& operator[] (uint i);
+ T& operator[] (uint);
};
#endif
diff --git a/WebCore/kwq/KWQVariant.h b/WebCore/kwq/KWQVariant.h
index 3f87e7f..9f39241 100644
--- a/WebCore/kwq/KWQVariant.h
+++ b/WebCore/kwq/KWQVariant.h
@@ -30,6 +30,9 @@ typedef unsigned int uint;
class QString;
+// this isn't used in this class, but it other classes expect the forward decl
+class QImage;
+
class QVariant {
public:
enum Type {
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/kdecore/kapp.h
index 1c25109..c06251c 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/kwq/kdecore/kapp.h
@@ -26,11 +26,14 @@
#ifndef KAPP_H_
#define KAPP_H_
+#include <kglobal.h>
#include <dcopclient.h>
+#include <qapplication.h>
+#include <qpalette.h>
#define kapp KApplication::kApplication()
-class KApplication {
+class KApplication : public QApplication {
public:
static KApplication* kApplication() { return KApp; }
virtual DCOPClient *dcopClient();
diff --git a/WebCore/kwq/kdecore/kcharsets.h b/WebCore/kwq/kdecore/kcharsets.h
index b2854d0..ea088b9 100644
--- a/WebCore/kwq/kdecore/kcharsets.h
+++ b/WebCore/kwq/kdecore/kcharsets.h
@@ -26,11 +26,13 @@
#ifndef KCHARSETS_H_
#define KCHARSETS_H_
-class QFont;
+#include <qfont.h>
class QString;
+class QTextCodec;
class KCharsets {
public:
+ QTextCodec *codecForName(const QString &name, bool &ok) const;
void setQFont(QFont &f, QString charset) const;
QString xCharsetName(QFont::CharSet) const;
bool supportsScript(const QFont &f, QFont::CharSet charset);
diff --git a/WebCore/kwq/kdecore/kconfigbase.h b/WebCore/kwq/kdecore/kconfigbase.h
index f3ffa58..665ffe5 100644
--- a/WebCore/kwq/kdecore/kconfigbase.h
+++ b/WebCore/kwq/kdecore/kconfigbase.h
@@ -26,12 +26,16 @@
#ifndef KCONFIGBASE_H_
#define KCONFIGBASE_H_
+class QString;
+class QColor;
+
class KConfigBase {
public:
void setGroup(const QString& pGroup);
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;
+ QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
};
#endif
diff --git a/WebCore/kwq/kdecore/kglobal.h b/WebCore/kwq/kdecore/kglobal.h
index 1d8290d..3c3dfaa 100644
--- a/WebCore/kwq/kdecore/kglobal.h
+++ b/WebCore/kwq/kdecore/kglobal.h
@@ -26,10 +26,13 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
-class KInstance;
+#include <qstring.h>
+#include <kinstance.h>
+
class KCharsets;
class KLocale;
class KStandardDirs;
+class KConfig;
#define kMin(a, b) ((a) < (b) ? (a) : (b))
#define kMax(a, b) ((a) > (b) ? (a) : (b))
@@ -40,6 +43,9 @@ public:
static KCharsets *charsets();
static KLocale *locale();
static KStandardDirs *dirs();
+ static KConfig *config();
+
+ static const QString &staticQString(const QString &);
};
#endif
diff --git a/WebCore/kwq/kdecore/kiconloader.h b/WebCore/kwq/kdecore/kiconloader.h
index 317acfe..754b845 100644
--- a/WebCore/kwq/kdecore/kiconloader.h
+++ b/WebCore/kwq/kdecore/kiconloader.h
@@ -26,4 +26,15 @@
#ifndef KICONLOADER_H_
#define KICONLOADER_H_
+#include <qpixmap.h>
+#include <qstring.h>
+#include <kinstance.h>
+#include "kicontheme.h"
+
+class KIconLoader {
+public:
+ QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState,
+ QString *path_store=0L, bool canReturnNull=false) const;
+};
+
#endif
diff --git a/WebCore/kwq/kdecore/kinstance.h b/WebCore/kwq/kdecore/kinstance.h
index c47513a..5e93d92 100644
--- a/WebCore/kwq/kdecore/kinstance.h
+++ b/WebCore/kwq/kdecore/kinstance.h
@@ -26,8 +26,11 @@
#ifndef KINSTANCE_H_
#define KINSTANCE_H_
+class KIconLoader;
+
class KInstance {
public:
+ KIconLoader *iconLoader() const;
};
#endif
diff --git a/WebCore/kwq/kdecore/kstaticdeleter.h b/WebCore/kwq/kdecore/kstaticdeleter.h
index 7728b21..f8b45a3 100644
--- a/WebCore/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/kwq/kdecore/kstaticdeleter.h
@@ -26,4 +26,9 @@
#ifndef KSTATICDELETER_H_
#define KSTATICDELETER_H_
+template <class T> class KStaticDeleter {
+public:
+ T *setObject(T *obj, bool isArray = false);
+};
+
#endif
diff --git a/WebCore/kwq/kdecore/kurl.h b/WebCore/kwq/kdecore/kurl.h
index 0a99517..3f19b48 100644
--- a/WebCore/kwq/kdecore/kurl.h
+++ b/WebCore/kwq/kdecore/kurl.h
@@ -51,6 +51,7 @@ public:
void setPath(const QString& path);
void setPort(unsigned short int);
bool isEmpty() const;
+ bool isMalformed() const;
QString prettyURL(int _trailing = 0) const;
};
diff --git a/WebCore/kwq/kio/job.h b/WebCore/kwq/kio/job.h
index a7267e6..f15f47a 100644
--- a/WebCore/kwq/kio/job.h
+++ b/WebCore/kwq/kio/job.h
@@ -26,12 +26,18 @@
#ifndef JOB_H_
#define JOB_H_
+#include <kurl.h>
+#include "jobclasses.h"
+
+// for time_t
+#include <sys/types.h>
+
// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
-class Job {
-};
+SimpleJob *http_update_cache(const KURL& url, bool no_cache, time_t expireDate);
+TransferJob *get(const KURL& url, bool reload=false, bool showProgressInfo = true);
-}
+} // namespace KIO
#endif
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 0ef187d..7efdd6c 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -26,4 +26,26 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
+class QString;
+
+namespace KIO {
+
+class Job : public QObject {
+public:
+ int error();
+ const QString & errorText();
+ virtual void kill(bool quietly = true);
+};
+
+class SimpleJob : public KIO::Job {
+};
+
+class TransferJob : public SimpleJob {
+public:
+ bool isErrorPage() const;
+ void addMetaData(const QString &key, const QString &value);
+};
+
+} // namespace KIO
+
#endif
diff --git a/WebCore/kwq/kio/kimageio.h b/WebCore/kwq/kio/kimageio.h
index 77ead2d..5f730df 100644
--- a/WebCore/kwq/kio/kimageio.h
+++ b/WebCore/kwq/kio/kimageio.h
@@ -26,4 +26,11 @@
#ifndef KIMAGEIO_H_
#define KIMAGEIO_H_
+class KImageIO {
+public:
+ enum Mode { Reading, Writing };
+
+ static QStringList mimeTypes(Mode _mode = Writing);
+};
+
#endif
diff --git a/WebCore/kwq/kio/scheduler.h b/WebCore/kwq/kio/scheduler.h
index fc5ebc8..78dd266 100644
--- a/WebCore/kwq/kio/scheduler.h
+++ b/WebCore/kwq/kio/scheduler.h
@@ -26,4 +26,16 @@
#ifndef SCHEDULER_H_
#define SCHEDULER_H_
+#include "job.h"
+#include "jobclasses.h"
+
+namespace KIO {
+
+class Scheduler {
+public:
+ static void scheduleJob(SimpleJob *job);
+};
+
+} // namespace KIO
+
#endif
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index c95c2cc..ce27175 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -30,6 +30,7 @@
template <class T> class QArray {
public:
+ T &at(uint) const;
T *data() const;
uint size() const;
diff --git a/WebCore/kwq/qt/qasyncimageio.h b/WebCore/kwq/qt/qasyncimageio.h
index 056364a..187bb60 100644
--- a/WebCore/kwq/qt/qasyncimageio.h
+++ b/WebCore/kwq/qt/qasyncimageio.h
@@ -26,4 +26,9 @@
#ifndef QASYNCIMAGEIO_H_
#define QASYNCIMAGEIO_H_
+class QImageDecoder {
+public:
+ static const char* formatName(const uchar* buffer, int length);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qasyncio.h b/WebCore/kwq/qt/qasyncio.h
index c9dfbb8..a74ab92 100644
--- a/WebCore/kwq/qt/qasyncio.h
+++ b/WebCore/kwq/qt/qasyncio.h
@@ -26,4 +26,20 @@
#ifndef QASYNCIO_H_
#define QASYNCIO_H_
+class QAsynchIO {
+protected:
+ void ready();
+};
+
+class QDataSource : public QAsynchIO {
+public:
+ virtual void rewind();
+ void maybeReady();
+};
+
+class QDataSink : public QAsynchIO {
+public:
+ virtual void receive(const uchar*, int count)=0;
+};
+
#endif
diff --git a/WebCore/kwq/qt/qbitmap.h b/WebCore/kwq/qt/qbitmap.h
index 4586eb2..ee89f3a 100644
--- a/WebCore/kwq/qt/qbitmap.h
+++ b/WebCore/kwq/qt/qbitmap.h
@@ -26,4 +26,12 @@
#ifndef QBITMAP_H_
#define QBITMAP_H_
+#include "qpixmap.h"
+
+class QBitmap : public QPixmap {
+public:
+ QBitmap();
+ QBitmap(int,int);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qbrush.h b/WebCore/kwq/qt/qbrush.h
index 3f526a4..c757d04 100644
--- a/WebCore/kwq/qt/qbrush.h
+++ b/WebCore/kwq/qt/qbrush.h
@@ -26,4 +26,13 @@
#ifndef QBRUSH_H_
#define QBRUSH_H_
+#include "qcolor.h"
+
+class QBrush {
+friend class QPainter;
+public:
+ QBrush();
+ QBrush(const QColor &);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qbuffer.h b/WebCore/kwq/qt/qbuffer.h
index 0acd320..ab7968d 100644
--- a/WebCore/kwq/qt/qbuffer.h
+++ b/WebCore/kwq/qt/qbuffer.h
@@ -27,6 +27,14 @@
#define QBUFFER_H_
class QBuffer {
+public:
+ QByteArray buffer() const;
+
+ uint size() const;
+ bool isOpen();
+ bool open(int);
+ void close();
+ int writeBlock(const char *, uint);
};
#endif
diff --git a/WebCore/kwq/qt/qcollection.h b/WebCore/kwq/qt/qcollection.h
index 2d45385..0a17687 100644
--- a/WebCore/kwq/qt/qcollection.h
+++ b/WebCore/kwq/qt/qcollection.h
@@ -29,6 +29,7 @@
class QCollection {
public:
typedef void *Item;
+ void setAutoDelete(bool);
protected:
virtual Item newItem(Item);
};
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index 721d135..21b1a0d 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -26,21 +26,27 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
-// Forward declaration for khtml/html/html_imageimpl.h:58
-class QImage;
-
class QString;
class QColor {
public:
+ QColor();
+ QColor(const char *);
+
QString name() const;
+ void setNamedColor(const QString&);
int red() const;
int green() const;
int blue() const;
bool isValid() const;
+ void setRgb(int,int,int);
+ void setRgb(int);
+
+ QColor light(int f = 150) const;
-bool operator==(const QColor &x) const;
-bool operator!=(const QColor &x) const;
+ QColor &operator=(const QColor &);
+ 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 097c45c..ad5e599 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -38,10 +38,28 @@ typedef QArray<char> QByteArray;
class QCString : public QByteArray {
public:
QCString();
- QCString(uint);
+ QCString(int);
+ QCString(const char *);
QCString(const char *, uint);
+ QCString(const QCString&);
+
+ QCString mid(uint index, uint len=0xffffffff) const;
+
+ int find(const char *str, int index=0, bool cs=TRUE) const;
+ bool isEmpty() const;
+ bool isNull() const;
+ uint length() const;
+ QCString lower() const;
+
+ operator const char *() const;
+ QCString &operator=(const QCString&);
+ QCString &operator=(const char *);
+ QCString &operator+=(const char *);
+ QCString &operator+=(const QCString&);
};
+bool operator==(const char *, const QCString &);
+bool operator==(const QCString &, const char *);
bool operator!=(const char *, const QCString &);
bool operator!=(const QCString &, const char *);
diff --git a/WebCore/kwq/qt/qdict.h b/WebCore/kwq/qt/qdict.h
index 398f1fe..56227bb 100644
--- a/WebCore/kwq/qt/qdict.h
+++ b/WebCore/kwq/qt/qdict.h
@@ -26,7 +26,27 @@
#ifndef QDICT_H_
#define QDICT_H_
-template <class T> class QDict {
+#include "qcollection.h"
+
+template <class T> class QDict : public QCollection {
+public:
+ QDict(int size=17, bool caseSensitive=TRUE);
+
+ void insert(const QString &, const T *);
+ bool remove(const QString &);
+ T *find(const QString &) const;
+ uint count() const;
+};
+
+template<class T> class QDictIterator {
+public:
+ QDictIterator(const QDict<T> &);
+
+ uint count() const;
+ T *current() const;
+ T *toFirst();
+
+ T *operator++();
};
#endif
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
index 3ca1e59..2c819e2 100644
--- a/WebCore/kwq/qt/qfont.h
+++ b/WebCore/kwq/qt/qfont.h
@@ -31,6 +31,7 @@ class QString;
class QFont {
public:
+ enum CharSet { Latin1 };
enum Weight { Normal = 50, Bold = 63 };
int pixelSize() const;
@@ -44,7 +45,9 @@ public:
bool bold() const;
bool operator==(const QFont &x) const;
bool operator!=(const QFont &x) const;
- enum CharSet {};
+
+private:
+ friend class QPainter;
};
#endif
diff --git a/WebCore/kwq/qt/qfontdatabase.h b/WebCore/kwq/qt/qfontdatabase.h
index e1cf5df..9680e73 100644
--- a/WebCore/kwq/qt/qfontdatabase.h
+++ b/WebCore/kwq/qt/qfontdatabase.h
@@ -33,6 +33,7 @@ class QString;
class QFontDatabase {
public:
+ QFont font(const QString familyName, const QString &style, int pointSize, const QString charSetName = QString::null);
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 &);
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 0bec0e4..90cbe49 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -28,9 +28,12 @@
class QRect;
class QChar;
+class QFont;
class QFontMetrics {
public:
+ QFontMetrics();
+ QFontMetrics(const QFont&);
QRect boundingRect(QChar) const;
};
diff --git a/WebCore/kwq/qt/qimage.h b/WebCore/kwq/qt/qimage.h
index f2e043b..d824748 100644
--- a/WebCore/kwq/qt/qimage.h
+++ b/WebCore/kwq/qt/qimage.h
@@ -27,6 +27,13 @@
#define QIMAGE_H_
class QImage {
+public:
+ int width() const;
+ int height() const;
+ int depth() const;
+ int pixelIndex(int,int) const;
+ QImage createAlphaMask(int conversion_flags=0) const;
+ bool hasAlphaBuffer() const;
};
#endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 6266366..4b57487 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -58,6 +58,7 @@ public:
T *toFirst();
T *toLast();
T *current() const;
+ operator T *() const;
T *operator--();
T *operator++();
};
diff --git a/WebCore/kwq/qt/qmovie.h b/WebCore/kwq/qt/qmovie.h
index f6aba29..89d2531 100644
--- a/WebCore/kwq/qt/qmovie.h
+++ b/WebCore/kwq/qt/qmovie.h
@@ -26,4 +26,35 @@
#ifndef QMOVIE_H_
#define QMOVIE_H_
+#include "qobject.h"
+#include "qpixmap.h"
+#include "qimage.h"
+
+class QMovie {
+public:
+ enum Status { EndOfFrame, EndOfMovie };
+
+ QMovie();
+ QMovie(QDataSource*, int bufsize=1024);
+
+ void unpause();
+ void pause();
+ void restart();
+ bool finished();
+ bool running();
+ int frameNumber() const;
+
+ const QRect& getValidRect() const;
+ const QPixmap& framePixmap() const;
+ const QImage& frameImage() const;
+
+ void connectResize(QObject* receiver, const char *member);
+ void connectUpdate(QObject* receiver, const char *member);
+ void connectStatus(QObject* receiver, const char *member);
+
+ void disconnectResize(QObject* receiver, const char *member=0);
+ void disconnectUpdate(QObject* receiver, const char *member=0);
+ void disconnectStatus(QObject* receiver, const char *member=0);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index 55de268..4bfe679 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -26,6 +26,8 @@
#ifndef QNAMESPACE_H_
#define QNAMESPACE_H_
+class QColor;
+
class Qt {
public:
enum ButtonState {
@@ -36,6 +38,8 @@ public:
AltButton,
ShiftButton,
};
+
+ static const QColor &black;
};
#endif
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index 2faba76..0542b16 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -26,7 +26,24 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "qpaintdevice.h"
+#include "qcolor.h"
+#include "qbrush.h"
+
+class QFont;
+class QFontMetrics;
+class QPixmap;
+
class QPainter {
+public:
+ QPainter();
+ QPainter(const QPaintDevice *);
+
+ void setFont(const QFont &);
+ QFontMetrics fontMetrics() const;
+
+ void fillRect(int x, int y, int w, int h, const QBrush &);
+ void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &);
};
#endif
diff --git a/WebCore/kwq/qt/qpalette.h b/WebCore/kwq/qt/qpalette.h
index e944a6f..079ad89 100644
--- a/WebCore/kwq/qt/qpalette.h
+++ b/WebCore/kwq/qt/qpalette.h
@@ -26,16 +26,34 @@
#ifndef QPALETTE_H_
#define QPALETTE_H_
+class QColor;
+
class QColorGroup {
public:
- enum ColorRole { Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+ enum ColorRole { Foreground, Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+
void setColor(ColorRole role, const QColor &color);
+ const QColor &foreground() const;
+ const QColor &shadow() const;
+ const QColor &light() const;
+ const QColor &midlight() const;
+ const QColor &dark() const;
+ const QColor &base() const;
+ const QColor &buttonText() const;
+ const QColor &button() const;
+ const QColor &text() const;
+ const QColor &background() const;
};
class QPalette {
public:
enum ColorGroup { Active, Inactive };
+
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
+
+ const QColorGroup &active() const;
+ const QColorGroup &inactive() const;
+ const QColorGroup &disabled() const;
};
#endif
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
index 56464f9..c10f325 100644
--- a/WebCore/kwq/qt/qpixmap.h
+++ b/WebCore/kwq/qt/qpixmap.h
@@ -27,8 +27,26 @@
#define QPIXMAP_H_
#include "qpaintdevice.h"
+#include "qstring.h"
-class QPixmap {
+class QBitmap;
+
+class QPixmap : public QPaintDevice {
+public:
+ QPixmap();
+ QPixmap(const QSize&);
+ QPixmap(const QByteArray&);
+ QPixmap(int,int);
+
+ void setMask(const QBitmap &);
+ const QBitmap *mask() const;
+
+ QSize size() const;
+ QRect rect() const;
+ int width() const;
+ int height() const;
+ bool isNull() const;
+ void resize(const QSize &);
};
#endif
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
index 241d8d8..508225c 100644
--- a/WebCore/kwq/qt/qptrdict.h
+++ b/WebCore/kwq/qt/qptrdict.h
@@ -27,16 +27,29 @@
#define QPTRDICT_H_
#include <kwq.h>
+#include "qcollection.h"
-template <class T> class QPtrDict {
+template <class T> class QPtrDict : public QCollection {
public:
QPtrDict(int size=13);
+
uint count() const;
T *at(uint);
+ T *take(void *);
void append(const T *);
void insert(void *, const T *);
void remove(void *);
T *operator[](void *) const;
};
+template<class T> class QPtrDictIterator {
+public:
+ QPtrDictIterator(const QPtrDict<T> &);
+
+ T *current() const;
+ void *currentKey() const;
+
+ T *operator++();
+};
+
#endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 903ed06..700a9d1 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -26,6 +26,8 @@
#ifndef QRECT_H_
#define QRECT_H_
+class QSize;
+
class QRect {
public:
QRect();
@@ -35,6 +37,9 @@ public:
int top() const;
int width() const;
int height() const;
+ bool isNull() const;
+
+ QSize size() const;
};
#endif
diff --git a/WebCore/kwq/qt/qsize.h b/WebCore/kwq/qt/qsize.h
index 002fd23..25c6987 100644
--- a/WebCore/kwq/qt/qsize.h
+++ b/WebCore/kwq/qt/qsize.h
@@ -31,10 +31,12 @@ public:
QSize();
QSize(int,int);
+ bool isValid() const;
int width() const;
int height() const;
friend inline QSize operator+(const QSize &, const QSize &);
+ friend inline bool operator!=(const QSize &, const QSize &);
};
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 61ed1aa..a18ae04 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -45,6 +45,7 @@ public:
bool isNull() const;
bool isDigit() const;
bool isSpace() const;
+ bool isLetter() const;
bool isLetterOrNumber() const;
uchar cell() const;
uchar row() const;
@@ -68,11 +69,15 @@ public:
class QString {
public:
static QString fromLatin1(const char*, int len = -1);
+
QString();
QString(const QChar *, uint);
QString(const char *);
+ QString(const QByteArray&);
+ QString(const QString&);
+
int toInt() const;
- int toInt(bool *) const;
+ int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
@@ -90,7 +95,6 @@ public:
int find(const QRegExp &, int index = 0, bool b = 0) const;
int findRev(char, int index = 0) const;
int findRev(const char *, int index = 0) const;
- QString left(uint) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
@@ -99,6 +103,8 @@ public:
QString arg(const QString&, int fieldwidth = 0) const;
+ QString left(uint) const;
+ QString right(uint) const;
QString mid(int, int len = 0xffffffff) const;
void fill(QChar, int len = -1);
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index e60c3ad..9e9f68d 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -26,6 +26,24 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
-class QTextCodec;
+#include "qstring.h"
+#include "qcstring.h"
+
+class QTextDecoder {
+public:
+ virtual QString toUnicode(const char* chars, int len) = 0;
+};
+
+class QTextCodec {
+public:
+ static QTextCodec *codecForMib(int mib);
+ static QTextCodec *codecForName(const char* hint, int accuracy=0);
+
+ virtual int mibEnum() const = 0;
+ virtual QTextDecoder *makeDecoder() const;
+ virtual QString toUnicode(const char *chars, int len) const;
+ QString toUnicode(const QByteArray&, int len) const;
+ QString toUnicode(const char *chars) const;
+};
#endif
diff --git a/WebCore/kwq/qt/qtooltip.h b/WebCore/kwq/qt/qtooltip.h
index ed8ad8b..7c024a6 100644
--- a/WebCore/kwq/qt/qtooltip.h
+++ b/WebCore/kwq/qt/qtooltip.h
@@ -26,4 +26,11 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
+class QPalette;
+
+class QToolTip {
+public:
+ static QPalette palette();
+};
+
#endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index b09b079..1472564 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -31,6 +31,7 @@ public:
QValueListIterator operator++();
bool operator!=(const QValueListIterator<T>& it);
T& operator*();
+ QValueListIterator<T>& operator--();
};
template<class T> class QValueListConstIterator {
@@ -47,19 +48,22 @@ 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);
- Iterator remove(Iterator it);
+ void append(const T&);
+ void remove(const T&);
+ uint contains(const T&);
+ Iterator remove(Iterator);
+ Iterator fromLast();
const T& first() const;
const T& last() const;
Iterator begin();
Iterator end();
ConstIterator begin() const;
ConstIterator end() const;
- T& operator[] (uint i);
+ T& operator[] (uint);
};
#endif
diff --git a/WebCore/kwq/qt/qvariant.h b/WebCore/kwq/qt/qvariant.h
index 3f87e7f..9f39241 100644
--- a/WebCore/kwq/qt/qvariant.h
+++ b/WebCore/kwq/qt/qvariant.h
@@ -30,6 +30,9 @@ typedef unsigned int uint;
class QString;
+// this isn't used in this class, but it other classes expect the forward decl
+class QImage;
+
class QVariant {
public:
enum Type {
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
index 4ebd355..cc7da37 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
@@ -24,6 +24,8 @@ OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlecma.a
+PROGRAM = testecma
+
CLEAN_FILES = $(OBJECTS) \
kjs_window.moc \
$(LIBRARY) \
@@ -57,6 +59,9 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
+$(PROGRAM): testecma.o
+ $(CC) -o $@ $< -L. -lkhtmlecma
+
kjs_window.cpp: kjs_window.moc
kjs_window.moc:
touch $@
diff --git a/WebCore/khtml/css/MakeSystemChanges.sh b/WebCore/src/kdelibs/khtml/misc/MakeSystemChanges.sh
similarity index 100%
copy from WebCore/khtml/css/MakeSystemChanges.sh
copy to WebCore/src/kdelibs/khtml/misc/MakeSystemChanges.sh
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
similarity index 77%
copy from WebCore/src/kdelibs/khtml/css/Makefile.in.apple
copy to WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
index d74ed93..67deb42 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
@@ -18,26 +18,25 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
-ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-CXXOBJECTS = $(filter-out css_extensionsimpl.o,$(ALLOBJECTS))
+CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
-VALUEFILES = \
- cssvalues.c \
- cssvalues.h \
- cssvalues.gperf \
+TAGFILES = \
+ htmltags.c \
+ htmltags.h \
+ htmltags.gperf \
$(NULL)
-PROPFILES = \
- cssproperties.c \
- cssproperties.h \
- cssproperties.gperf \
+ATTRSFILES = \
+ htmlattrs.c \
+ htmlattrs.h \
+ htmlattrs.gperf \
$(NULL)
-CFILES = $(VALUEFILES) $(PROPFILES)
+CFILES = $(TAGFILES) $(ATTRSFILES)
OBJECTS = $(CFILES) $(CXXOBJECTS)
-LIBRARY = libkhtmlcss.a
+LIBRARY = libkhtmlmisc.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
@@ -49,13 +48,11 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = -I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/qt \
- -I$(TOPSRCDIR)/src/kwq/dcop \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kio \
- -I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/dcop \
-I../dom \
-I../html \
- -I../misc \
-I../xml \
-I.. \
-I. \
@@ -70,11 +67,15 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-$(VALUEFILES):
- sh ./makevalues
+loader.cpp: loader.moc
+loader.moc:
+ touch loader.moc
+
+$(TAGFILES):
+ ./maketags
-$(PROPFILES):
- sh ./makeprop
+$(ATTRSFILES):
+ ./makeattrs
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kdelibs/khtml/misc/htmlattrs.c b/WebCore/src/kdelibs/khtml/misc/htmlattrs.c
deleted file mode 100644
index 2365955..0000000
--- a/WebCore/src/kdelibs/khtml/misc/htmlattrs.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/* ANSI-C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -c -a -L ANSI-C -E -C -o -t -k '*' -NfindAttr -Hhash_attr -Wwordlist_attr -s 2 htmlattrs.gperf */
-/* This file is automatically generated from
-#htmlattrs.in by makeattrs, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmlattrs.h"
-struct attrs {
- const char *name;
- int id;
-};
-/* maximum key range = 944, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash_attr (register const char *str, register unsigned int len)
-{
- static const unsigned short asso_values[] =
- {
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 0, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 15, 65, 0,
- 125, 0, 10, 35, 180, 55, 0, 85, 0, 75,
- 0, 0, 40, 0, 150, 20, 175, 120, 160, 5,
- 5, 0, 10, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968, 968, 968, 968, 968,
- 968, 968, 968, 968, 968, 968
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- case 14:
- hval += asso_values[(unsigned char)str[13]];
- case 13:
- hval += asso_values[(unsigned char)str[12]];
- case 12:
- hval += asso_values[(unsigned char)str[11]];
- case 11:
- hval += asso_values[(unsigned char)str[10]];
- case 10:
- hval += asso_values[(unsigned char)str[9]];
- case 9:
- hval += asso_values[(unsigned char)str[8]];
- case 8:
- hval += asso_values[(unsigned char)str[7]];
- case 7:
- hval += asso_values[(unsigned char)str[6]];
- case 6:
- hval += asso_values[(unsigned char)str[5]];
- case 5:
- hval += asso_values[(unsigned char)str[4]];
- case 4:
- hval += asso_values[(unsigned char)str[3]];
- case 3:
- hval += asso_values[(unsigned char)str[2]];
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-const struct attrs *
-findAttr (register const char *str, register unsigned int len)
-{
- enum
- {
- TOTAL_KEYWORDS = 142,
- MIN_WORD_LENGTH = 2,
- MAX_WORD_LENGTH = 14,
- MIN_HASH_VALUE = 24,
- MAX_HASH_VALUE = 967
- };
-
- static const struct attrs wordlist_attr[] =
- {
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"cols", ATTR_COLS},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"face", ATTR_FACE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"lang", ATTR_LANG},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"class", ATTR_CLASS},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"scope", ATTR_SCOPE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"span", ATTR_SPAN},
- {"", 0}, {"", 0},
- {"colspan", ATTR_COLSPAN},
- {"", 0}, {"", 0},
- {"label", ATTR_LABEL},
- {"", 0}, {"", 0}, {"", 0},
- {"size", ATTR_SIZE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"name", ATTR_NAME},
- {"pagey", ATTR_PAGEY},
- {"", 0}, {"", 0}, {"", 0},
- {"axis", ATTR_AXIS},
- {"pagex", ATTR_PAGEX},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"align", ATTR_ALIGN},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"plain", ATTR_PLAIN},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"code", ATTR_CODE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"link", ATTR_LINK},
- {"", 0},
- {"onload", ATTR_ONLOAD},
- {"onclick", ATTR_ONCLICK},
- {"", 0},
- {"accesskey", ATTR_ACCESSKEY},
- {"", 0}, {"", 0}, {"", 0},
- {"rel", ATTR_REL},
- {"", 0},
- {"color", ATTR_COLOR},
- {"", 0},
- {"onfocus", ATTR_ONFOCUS},
- {"", 0}, {"", 0},
- {"alink", ATTR_ALINK},
- {"", 0}, {"", 0},
- {"for", ATTR_FOR},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"clear", ATTR_CLEAR},
- {"", 0}, {"", 0},
- {"src", ATTR_SRC},
- {"", 0}, {"", 0},
- {"cellspacing", ATTR_CELLSPACING},
- {"", 0}, {"", 0},
- {"rows", ATTR_ROWS},
- {"", 0}, {"", 0},
- {"id", ATTR_ID},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"longdesc", ATTR_LONGDESC},
- {"left", ATTR_LEFT},
- {"", 0}, {"", 0}, {"", 0},
- {"alt", ATTR_ALT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"style", ATTR_STYLE},
- {"nosave", ATTR_NOSAVE},
- {"z-index", ATTR_Z_INDEX},
- {"onselect", ATTR_ONSELECT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"ismap", ATTR_ISMAP},
- {"", 0}, {"", 0}, {"", 0},
- {"wrap", ATTR_WRAP},
- {"", 0},
- {"nowrap", ATTR_NOWRAP},
- {"unknown", ATTR_UNKNOWN},
- {"top", ATTR_TOP},
- {"type", ATTR_TYPE},
- {"", 0}, {"", 0},
- {"enctype", ATTR_ENCTYPE},
- {"", 0},
- {"onkeydown", ATTR_ONKEYDOWN},
- {"", 0}, {"", 0}, {"", 0},
- {"language", ATTR_LANGUAGE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"codebase", ATTR_CODEBASE},
- {"cite", ATTR_CITE},
- {"", 0},
- {"accept", ATTR_ACCEPT},
- {"rowspan", ATTR_ROWSPAN},
- {"onchange", ATTR_ONCHANGE},
- {"", 0}, {"", 0},
- {"vspace", ATTR_VSPACE},
- {"classid", ATTR_CLASSID},
- {"noresize", ATTR_NORESIZE},
- {"", 0}, {"", 0},
- {"object", ATTR_OBJECT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"action", ATTR_ACTION},
- {"onkeyup", ATTR_ONKEYUP},
- {"", 0}, {"", 0},
- {"frame", ATTR_FRAME},
- {"", 0},
- {"bgcolor", ATTR_BGCOLOR},
- {"", 0}, {"", 0},
- {"shape", ATTR_SHAPE},
- {"hspace", ATTR_HSPACE},
- {"profile", ATTR_PROFILE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"onunload", ATTR_ONUNLOAD},
- {"scrolling", ATTR_SCROLLING},
- {"", 0},
- {"valign", ATTR_VALIGN},
- {"", 0}, {"", 0}, {"", 0},
- {"media", ATTR_MEDIA},
- {"usemap", ATTR_USEMAP},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"scheme", ATTR_SCHEME},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"defer", ATTR_DEFER},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"rules", ATTR_RULES},
- {"", 0},
- {"declare", ATTR_DECLARE},
- {"readonly", ATTR_READONLY},
- {"abbr", ATTR_ABBR},
- {"value", ATTR_VALUE},
- {"coords", ATTR_COORDS},
- {"", 0}, {"", 0}, {"", 0},
- {"vlink", ATTR_VLINK},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"compact", ATTR_COMPACT},
- {"rev", ATTR_REV},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"onkeypress", ATTR_ONKEYPRESS},
- {"", 0}, {"", 0},
- {"selected", ATTR_SELECTED},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"dir", ATTR_DIR},
- {"data", ATTR_DATA},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"ondblclick", ATTR_ONDBLCLICK},
- {"onblur", ATTR_ONBLUR},
- {"", 0}, {"", 0},
- {"href", ATTR_HREF},
- {"", 0},
- {"nohref", ATTR_NOHREF},
- {"noshade", ATTR_NOSHADE},
- {"codetype", ATTR_CODETYPE},
- {"char", ATTR_CHAR},
- {"pluginpage", ATTR_PLUGINPAGE},
- {"", 0},
- {"onreset", ATTR_ONRESET},
- {"", 0}, {"", 0}, {"", 0},
- {"onmousedown", ATTR_ONMOUSEDOWN},
- {"content", ATTR_CONTENT},
- {"", 0},
- {"text", ATTR_TEXT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"pluginspage", ATTR_PLUGINSPAGE},
- {"charoff", ATTR_CHAROFF},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"onmouseup", ATTR_ONMOUSEUP},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"version", ATTR_VERSION},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"checked", ATTR_CHECKED},
- {"hreflang", ATTR_HREFLANG},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"cellpadding", ATTR_CELLPADDING},
- {"standby", ATTR_STANDBY},
- {"", 0}, {"", 0},
- {"title", ATTR_TITLE},
- {"", 0},
- {"onabort", ATTR_ONABORT},
- {"disabled", ATTR_DISABLED},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"html", ATTR_HTML},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"tabindex", ATTR_TABINDEX},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"onerror", ATTR_ONERROR},
- {"", 0}, {"", 0}, {"", 0},
- {"onmousemove", ATTR_ONMOUSEMOVE},
- {"summary", ATTR_SUMMARY},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0},
- {"multiple", ATTR_MULTIPLE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0},
- {"prompt", ATTR_PROMPT},
- {"oversrc", ATTR_OVERSRC},
- {"", 0}, {"", 0}, {"", 0},
- {"hidden", ATTR_HIDDEN},
- {"", 0}, {"", 0},
- {"maxlength", ATTR_MAXLENGTH},
- {"", 0},
- {"border", ATTR_BORDER},
- {"headers", ATTR_HEADERS},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0},
- {"onsubmit", ATTR_ONSUBMIT},
- {"valuetype", ATTR_VALUETYPE},
- {"onmouseout", ATTR_ONMOUSEOUT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"leftmargin", ATTR_LEFTMARGIN},
- {"", 0}, {"", 0}, {"", 0},
- {"pluginurl", ATTR_PLUGINURL},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"onmouseover", ATTR_ONMOUSEOVER},
- {"", 0}, {"", 0}, {"", 0},
- {"start", ATTR_START},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"width", ATTR_WIDTH},
- {"", 0},
- {"charset", ATTR_CHARSET},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"topmargin", ATTR_TOPMARGIN},
- {"", 0},
- {"target", ATTR_TARGET},
- {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"method", ATTR_METHOD},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"archive", ATTR_ARCHIVE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0},
- {"background", ATTR_BACKGROUND},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"autocomplete", ATTR_AUTOCOMPLETE},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"datetime", ATTR_DATETIME},
- {"", 0}, {"", 0},
- {"height", ATTR_HEIGHT},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"visibility", ATTR_VISIBILITY},
- {"bordercolor", ATTR_BORDERCOLOR},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"bgproperties", ATTR_BGPROPERTIES},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"frameborder", ATTR_FRAMEBORDER},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"accept-charset", ATTR_ACCEPT_CHARSET},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"marginwidth", ATTR_MARGINWIDTH},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"http-equiv", ATTR_HTTP_EQUIV},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
- {"marginheight", ATTR_MARGINHEIGHT}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash_attr (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register const char *s = wordlist_attr[key].name;
-
- if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
- return &wordlist_attr[key];
- }
- }
- return 0;
-}
-
-
-static const char *attrList[] = {
- "ABBR",
- "ACCEPT-CHARSET",
- "ACCEPT",
- "ACCESSKEY",
- "ACTION",
- "ALIGN",
- "ALINK",
- "ALT",
- "ARCHIVE",
- "AUTOCOMPLETE",
- "AXIS",
- "BACKGROUND",
- "BGCOLOR",
- "BGPROPERTIES",
- "BORDER",
- "BORDERCOLOR",
- "CELLPADDING",
- "CELLSPACING",
- "CHAR",
- "CHAROFF",
- "CHARSET",
- "CHECKED",
- "CITE",
- "CLASS",
- "CLASSID",
- "CLEAR",
- "CODE",
- "CODEBASE",
- "CODETYPE",
- "COLOR",
- "COLS",
- "COLSPAN",
- "COMPACT",
- "CONTENT",
- "COORDS",
- "DATA",
- "DATETIME",
- "DECLARE",
- "DEFER",
- "DIR",
- "DISABLED",
- "ENCTYPE",
- "FACE",
- "FOR",
- "FRAME",
- "FRAMEBORDER",
- "HEADERS",
- "HEIGHT",
- "HIDDEN",
- "HREF",
- "HREFLANG",
- "HSPACE",
- "HTML",
- "HTTP-EQUIV",
- "ID",
- "ISMAP",
- "LABEL",
- "LANG",
- "LANGUAGE",
- "LEFT",
- "LEFTMARGIN",
- "LINK",
- "LONGDESC",
- "MARGINHEIGHT",
- "MARGINWIDTH",
- "MAXLENGTH",
- "MEDIA",
- "METHOD",
- "MULTIPLE",
- "NAME",
- "NOHREF",
- "NORESIZE",
- "NOSAVE",
- "NOSHADE",
- "NOWRAP",
- "OBJECT",
- "ONABORT",
- "ONBLUR",
- "ONCHANGE",
- "ONCLICK",
- "ONDBLCLICK",
- "ONERROR",
- "ONFOCUS",
- "ONKEYDOWN",
- "ONKEYPRESS",
- "ONKEYUP",
- "ONLOAD",
- "ONMOUSEDOWN",
- "ONMOUSEMOVE",
- "ONMOUSEOUT",
- "ONMOUSEOVER",
- "ONMOUSEUP",
- "ONRESET",
- "ONSELECT",
- "ONSUBMIT",
- "ONUNLOAD",
- "OVERSRC",
- "PAGEX",
- "PAGEY",
- "PLAIN",
- "PLUGINPAGE",
- "PLUGINSPAGE",
- "PLUGINURL",
- "PROFILE",
- "PROMPT",
- "READONLY",
- "REL",
- "REV",
- "ROWS",
- "ROWSPAN",
- "RULES",
- "SCHEME",
- "SCOPE",
- "SCROLLING",
- "SELECTED",
- "SHAPE",
- "SIZE",
- "SPAN",
- "SRC",
- "STANDBY",
- "START",
- "STYLE",
- "SUMMARY",
- "TABINDEX",
- "TARGET",
- "TEXT",
- "TITLE",
- "TOP",
- "TOPMARGIN",
- "TYPE",
- "UNKNOWN",
- "USEMAP",
- "VALIGN",
- "VALUE",
- "VALUETYPE",
- "VERSION",
- "VISIBILITY",
- "VLINK",
- "VSPACE",
- "WIDTH",
- "WRAP",
- "Z-INDEX",
- 0
-};
-DOMString getAttrName(unsigned short id)
-{
- return attrList[id-1];
-};
diff --git a/WebCore/src/kdelibs/khtml/misc/htmlattrs.gperf b/WebCore/src/kdelibs/khtml/misc/htmlattrs.gperf
deleted file mode 100644
index 2abdd77..0000000
--- a/WebCore/src/kdelibs/khtml/misc/htmlattrs.gperf
+++ /dev/null
@@ -1,154 +0,0 @@
-%{
-/* This file is automatically generated from
-#htmlattrs.in by makeattrs, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmlattrs.h"
-%}
-struct attrs {
- const char *name;
- int id;
-};
-%%
-abbr, ATTR_ABBR
-accept-charset, ATTR_ACCEPT_CHARSET
-accept, ATTR_ACCEPT
-accesskey, ATTR_ACCESSKEY
-action, ATTR_ACTION
-align, ATTR_ALIGN
-alink, ATTR_ALINK
-alt, ATTR_ALT
-archive, ATTR_ARCHIVE
-autocomplete, ATTR_AUTOCOMPLETE
-axis, ATTR_AXIS
-background, ATTR_BACKGROUND
-bgcolor, ATTR_BGCOLOR
-bgproperties, ATTR_BGPROPERTIES
-border, ATTR_BORDER
-bordercolor, ATTR_BORDERCOLOR
-cellpadding, ATTR_CELLPADDING
-cellspacing, ATTR_CELLSPACING
-char, ATTR_CHAR
-charoff, ATTR_CHAROFF
-charset, ATTR_CHARSET
-checked, ATTR_CHECKED
-cite, ATTR_CITE
-class, ATTR_CLASS
-classid, ATTR_CLASSID
-clear, ATTR_CLEAR
-code, ATTR_CODE
-codebase, ATTR_CODEBASE
-codetype, ATTR_CODETYPE
-color, ATTR_COLOR
-cols, ATTR_COLS
-colspan, ATTR_COLSPAN
-compact, ATTR_COMPACT
-content, ATTR_CONTENT
-coords, ATTR_COORDS
-data, ATTR_DATA
-datetime, ATTR_DATETIME
-declare, ATTR_DECLARE
-defer, ATTR_DEFER
-dir, ATTR_DIR
-disabled, ATTR_DISABLED
-enctype, ATTR_ENCTYPE
-face, ATTR_FACE
-for, ATTR_FOR
-frame, ATTR_FRAME
-frameborder, ATTR_FRAMEBORDER
-headers, ATTR_HEADERS
-height, ATTR_HEIGHT
-hidden, ATTR_HIDDEN
-href, ATTR_HREF
-hreflang, ATTR_HREFLANG
-hspace, ATTR_HSPACE
-html, ATTR_HTML
-http-equiv, ATTR_HTTP_EQUIV
-id, ATTR_ID
-ismap, ATTR_ISMAP
-label, ATTR_LABEL
-lang, ATTR_LANG
-language, ATTR_LANGUAGE
-left, ATTR_LEFT
-leftmargin, ATTR_LEFTMARGIN
-link, ATTR_LINK
-longdesc, ATTR_LONGDESC
-marginheight, ATTR_MARGINHEIGHT
-marginwidth, ATTR_MARGINWIDTH
-maxlength, ATTR_MAXLENGTH
-media, ATTR_MEDIA
-method, ATTR_METHOD
-multiple, ATTR_MULTIPLE
-name, ATTR_NAME
-nohref, ATTR_NOHREF
-noresize, ATTR_NORESIZE
-nosave, ATTR_NOSAVE
-noshade, ATTR_NOSHADE
-nowrap, ATTR_NOWRAP
-object, ATTR_OBJECT
-onabort, ATTR_ONABORT
-onblur, ATTR_ONBLUR
-onchange, ATTR_ONCHANGE
-onclick, ATTR_ONCLICK
-ondblclick, ATTR_ONDBLCLICK
-onerror, ATTR_ONERROR
-onfocus, ATTR_ONFOCUS
-onkeydown, ATTR_ONKEYDOWN
-onkeypress, ATTR_ONKEYPRESS
-onkeyup, ATTR_ONKEYUP
-onload, ATTR_ONLOAD
-onmousedown, ATTR_ONMOUSEDOWN
-onmousemove, ATTR_ONMOUSEMOVE
-onmouseout, ATTR_ONMOUSEOUT
-onmouseover, ATTR_ONMOUSEOVER
-onmouseup, ATTR_ONMOUSEUP
-onreset, ATTR_ONRESET
-onselect, ATTR_ONSELECT
-onsubmit, ATTR_ONSUBMIT
-onunload, ATTR_ONUNLOAD
-oversrc, ATTR_OVERSRC
-pagex, ATTR_PAGEX
-pagey, ATTR_PAGEY
-plain, ATTR_PLAIN
-pluginpage, ATTR_PLUGINPAGE
-pluginspage, ATTR_PLUGINSPAGE
-pluginurl, ATTR_PLUGINURL
-profile, ATTR_PROFILE
-prompt, ATTR_PROMPT
-readonly, ATTR_READONLY
-rel, ATTR_REL
-rev, ATTR_REV
-rows, ATTR_ROWS
-rowspan, ATTR_ROWSPAN
-rules, ATTR_RULES
-scheme, ATTR_SCHEME
-scope, ATTR_SCOPE
-scrolling, ATTR_SCROLLING
-selected, ATTR_SELECTED
-shape, ATTR_SHAPE
-size, ATTR_SIZE
-span, ATTR_SPAN
-src, ATTR_SRC
-standby, ATTR_STANDBY
-start, ATTR_START
-style, ATTR_STYLE
-summary, ATTR_SUMMARY
-tabindex, ATTR_TABINDEX
-target, ATTR_TARGET
-text, ATTR_TEXT
-title, ATTR_TITLE
-top, ATTR_TOP
-topmargin, ATTR_TOPMARGIN
-type, ATTR_TYPE
-unknown, ATTR_UNKNOWN
-usemap, ATTR_USEMAP
-valign, ATTR_VALIGN
-value, ATTR_VALUE
-valuetype, ATTR_VALUETYPE
-version, ATTR_VERSION
-visibility, ATTR_VISIBILITY
-vlink, ATTR_VLINK
-vspace, ATTR_VSPACE
-width, ATTR_WIDTH
-wrap, ATTR_WRAP
-z-index, ATTR_Z_INDEX
-%%
diff --git a/WebCore/src/kdelibs/khtml/misc/htmlattrs.h b/WebCore/src/kdelibs/khtml/misc/htmlattrs.h
deleted file mode 100644
index eede729..0000000
--- a/WebCore/src/kdelibs/khtml/misc/htmlattrs.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* This file is automatically generated from
-htmlattrs.in by makeattrs, do not edit */
-/* Copyright 1999 Lars Knoll */
-
-#ifndef HTML_ATTRS_H
-#define HTML_ATTRS_H
-
-#include "dom_string.h"
-using namespace DOM;
-
-#define ATTR_ABBR 1
-#define ATTR_ACCEPT_CHARSET 2
-#define ATTR_ACCEPT 3
-#define ATTR_ACCESSKEY 4
-#define ATTR_ACTION 5
-#define ATTR_ALIGN 6
-#define ATTR_ALINK 7
-#define ATTR_ALT 8
-#define ATTR_ARCHIVE 9
-#define ATTR_AUTOCOMPLETE 10
-#define ATTR_AXIS 11
-#define ATTR_BACKGROUND 12
-#define ATTR_BGCOLOR 13
-#define ATTR_BGPROPERTIES 14
-#define ATTR_BORDER 15
-#define ATTR_BORDERCOLOR 16
-#define ATTR_CELLPADDING 17
-#define ATTR_CELLSPACING 18
-#define ATTR_CHAR 19
-#define ATTR_CHAROFF 20
-#define ATTR_CHARSET 21
-#define ATTR_CHECKED 22
-#define ATTR_CITE 23
-#define ATTR_CLASS 24
-#define ATTR_CLASSID 25
-#define ATTR_CLEAR 26
-#define ATTR_CODE 27
-#define ATTR_CODEBASE 28
-#define ATTR_CODETYPE 29
-#define ATTR_COLOR 30
-#define ATTR_COLS 31
-#define ATTR_COLSPAN 32
-#define ATTR_COMPACT 33
-#define ATTR_CONTENT 34
-#define ATTR_COORDS 35
-#define ATTR_DATA 36
-#define ATTR_DATETIME 37
-#define ATTR_DECLARE 38
-#define ATTR_DEFER 39
-#define ATTR_DIR 40
-#define ATTR_DISABLED 41
-#define ATTR_ENCTYPE 42
-#define ATTR_FACE 43
-#define ATTR_FOR 44
-#define ATTR_FRAME 45
-#define ATTR_FRAMEBORDER 46
-#define ATTR_HEADERS 47
-#define ATTR_HEIGHT 48
-#define ATTR_HIDDEN 49
-#define ATTR_HREF 50
-#define ATTR_HREFLANG 51
-#define ATTR_HSPACE 52
-#define ATTR_HTML 53
-#define ATTR_HTTP_EQUIV 54
-#define ATTR_ID 55
-#define ATTR_ISMAP 56
-#define ATTR_LABEL 57
-#define ATTR_LANG 58
-#define ATTR_LANGUAGE 59
-#define ATTR_LEFT 60
-#define ATTR_LEFTMARGIN 61
-#define ATTR_LINK 62
-#define ATTR_LONGDESC 63
-#define ATTR_MARGINHEIGHT 64
-#define ATTR_MARGINWIDTH 65
-#define ATTR_MAXLENGTH 66
-#define ATTR_MEDIA 67
-#define ATTR_METHOD 68
-#define ATTR_MULTIPLE 69
-#define ATTR_NAME 70
-#define ATTR_NOHREF 71
-#define ATTR_NORESIZE 72
-#define ATTR_NOSAVE 73
-#define ATTR_NOSHADE 74
-#define ATTR_NOWRAP 75
-#define ATTR_OBJECT 76
-#define ATTR_ONABORT 77
-#define ATTR_ONBLUR 78
-#define ATTR_ONCHANGE 79
-#define ATTR_ONCLICK 80
-#define ATTR_ONDBLCLICK 81
-#define ATTR_ONERROR 82
-#define ATTR_ONFOCUS 83
-#define ATTR_ONKEYDOWN 84
-#define ATTR_ONKEYPRESS 85
-#define ATTR_ONKEYUP 86
-#define ATTR_ONLOAD 87
-#define ATTR_ONMOUSEDOWN 88
-#define ATTR_ONMOUSEMOVE 89
-#define ATTR_ONMOUSEOUT 90
-#define ATTR_ONMOUSEOVER 91
-#define ATTR_ONMOUSEUP 92
-#define ATTR_ONRESET 93
-#define ATTR_ONSELECT 94
-#define ATTR_ONSUBMIT 95
-#define ATTR_ONUNLOAD 96
-#define ATTR_OVERSRC 97
-#define ATTR_PAGEX 98
-#define ATTR_PAGEY 99
-#define ATTR_PLAIN 100
-#define ATTR_PLUGINPAGE 101
-#define ATTR_PLUGINSPAGE 102
-#define ATTR_PLUGINURL 103
-#define ATTR_PROFILE 104
-#define ATTR_PROMPT 105
-#define ATTR_READONLY 106
-#define ATTR_REL 107
-#define ATTR_REV 108
-#define ATTR_ROWS 109
-#define ATTR_ROWSPAN 110
-#define ATTR_RULES 111
-#define ATTR_SCHEME 112
-#define ATTR_SCOPE 113
-#define ATTR_SCROLLING 114
-#define ATTR_SELECTED 115
-#define ATTR_SHAPE 116
-#define ATTR_SIZE 117
-#define ATTR_SPAN 118
-#define ATTR_SRC 119
-#define ATTR_STANDBY 120
-#define ATTR_START 121
-#define ATTR_STYLE 122
-#define ATTR_SUMMARY 123
-#define ATTR_TABINDEX 124
-#define ATTR_TARGET 125
-#define ATTR_TEXT 126
-#define ATTR_TITLE 127
-#define ATTR_TOP 128
-#define ATTR_TOPMARGIN 129
-#define ATTR_TYPE 130
-#define ATTR_UNKNOWN 131
-#define ATTR_USEMAP 132
-#define ATTR_VALIGN 133
-#define ATTR_VALUE 134
-#define ATTR_VALUETYPE 135
-#define ATTR_VERSION 136
-#define ATTR_VISIBILITY 137
-#define ATTR_VLINK 138
-#define ATTR_VSPACE 139
-#define ATTR_WIDTH 140
-#define ATTR_WRAP 141
-#define ATTR_Z_INDEX 142
-DOMString getAttrName(unsigned short id);
-
-#endif
diff --git a/WebCore/src/kdelibs/khtml/misc/htmltags.c b/WebCore/src/kdelibs/khtml/misc/htmltags.c
deleted file mode 100644
index 847dba2..0000000
--- a/WebCore/src/kdelibs/khtml/misc/htmltags.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/* ANSI-C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -a -L ANSI-C -D -E -C -l -o -t -k '*' -NfindTag -Hhash_tag -Wwordlist_tag htmltags.gperf */
-/* This file is automatically generated from htmltags.in by maketags, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmltags.h"
-struct tags {
- const char *name;
- int id;
-};
-/* maximum key range = 277, duplicates = 1 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash_tag (register const char *str, register unsigned int len)
-{
- static const unsigned short asso_values[] =
- {
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 0, 278, 278, 278, 40,
- 45, 60, 65, 20, 30, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 0, 117, 35,
- 20, 0, 90, 75, 30, 10, 0, 5, 45, 80,
- 10, 0, 25, 5, 5, 40, 0, 60, 15, 278,
- 30, 35, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
- 278, 278, 278, 278, 278, 278
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- case 10:
- hval += asso_values[(unsigned char)str[9]];
- case 9:
- hval += asso_values[(unsigned char)str[8]];
- case 8:
- hval += asso_values[(unsigned char)str[7]];
- case 7:
- hval += asso_values[(unsigned char)str[6]];
- case 6:
- hval += asso_values[(unsigned char)str[5]];
- case 5:
- hval += asso_values[(unsigned char)str[4]];
- case 4:
- hval += asso_values[(unsigned char)str[3]];
- case 3:
- hval += asso_values[(unsigned char)str[2]];
- case 2:
- hval += asso_values[(unsigned char)str[1]];
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
- return hval;
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-const struct tags *
-findTag (register const char *str, register unsigned int len)
-{
- enum
- {
- TOTAL_KEYWORDS = 102,
- MIN_WORD_LENGTH = 1,
- MAX_WORD_LENGTH = 10,
- MIN_HASH_VALUE = 1,
- MAX_HASH_VALUE = 277
- };
-
- static const unsigned char lengthtable[] =
- {
- 1, 2, 1, 2, 4, 1, 2, 2, 3, 1, 2, 3, 2, 3,
- 1, 2, 8, 2, 3, 4, 6, 2, 4, 5, 6, 2, 4, 5,
- 1, 2, 3, 6, 2, 3, 2, 4, 2, 4, 2, 3, 4, 6,
- 7, 5, 2, 5, 2, 6, 7, 4, 2, 3, 5, 5, 1, 6,
- 3, 2, 5, 6, 7, 3, 9, 6, 7, 8, 6, 3, 3, 3,
- 4, 4, 6, 6, 4, 4, 5, 3, 5, 7, 4, 5, 4, 5,
- 6, 6, 7, 8, 3, 5, 8, 5, 3, 5, 8, 10, 8, 7,
- 4, 8, 8, 10
- };
- static const struct tags wordlist_tag[] =
- {
- {"a", ID_A},
- {"tt", ID_TT},
- {"q", ID_Q},
- {"tr", ID_TR},
- {"area", ID_AREA},
- {"i", ID_I},
- {"dt", ID_DT},
- {"td", ID_TD},
- {"var", ID_VAR},
- {"p", ID_P},
- {"th", ID_TH},
- {"pre", ID_PRE},
- {"hr", ID_HR},
- {"dir", ID_DIR},
- {"s", ID_S},
- {"dd", ID_DD},
- {"textarea", ID_TEXTAREA},
- {"ol", ID_OL},
- {"div", ID_DIV},
- {"cite", ID_CITE},
- {"option", ID_OPTION},
- {"h5", ID_H5},
- {"head", ID_HEAD},
- {"thead", ID_THEAD},
- {"center", ID_CENTER},
- {"li", ID_LI},
- {"code", ID_CODE},
- {"title", ID_TITLE},
- {"u", ID_U},
- {"h6", ID_H6},
- {"ins", ID_INS},
- {"strike", ID_STRIKE},
- {"dl", ID_DL},
- {"del", ID_DEL},
- {"h1", ID_H1},
- {"link", ID_LINK},
- {"h2", ID_H2},
- {"span", ID_SPAN},
- {"em", ID_EM},
- {"col", ID_COL},
- {"meta", ID_META},
- {"anchor", ID_A},
- {"caption", ID_CAPTION},
- {"layer", ID_LAYER},
- {"h3", ID_H3},
- {"tfoot", ID_TFOOT},
- {"h4", ID_H4},
- {"applet", ID_APPLET},
- {"nolayer", ID_NOLAYER},
- {"font", ID_FONT},
- {"ul", ID_UL},
- {"map", ID_MAP},
- {"input", ID_INPUT},
- {"param", ID_PARAM},
- {"b", ID_B},
- {"script", ID_SCRIPT},
- {"dfn", ID_DFN},
- {"br", ID_BR},
- {"style", ID_STYLE},
- {"select", ID_SELECT},
- {"isindex", ID_ISINDEX},
- {"sup", ID_SUP},
- {"plaintext", ID_PLAINTEXT},
- {"keygen", ID_KEYGEN},
- {"address", ID_ADDRESS},
- {"noscript", ID_NOSCRIPT},
- {"strong", ID_STRONG},
- {"xmp", ID_PRE},
- {"bdo", ID_BDO},
- {"kbd", ID_KBD},
- {"samp", ID_SAMP},
- {"menu", ID_MENU},
- {"legend", ID_LEGEND},
- {"object", ID_OBJECT},
- {"html", ID_HTML},
- {"base", ID_BASE},
- {"table", ID_TABLE},
- {"img", ID_IMG},
- {"image", ID_IMG},
- {"acronym", ID_ACRONYM},
- {"body", ID_BODY},
- {"tbody", ID_TBODY},
- {"form", ID_FORM},
- {"frame", ID_FRAME},
- {"iframe", ID_IFRAME},
- {"button", ID_BUTTON},
- {"listing", ID_LISTING},
- {"optgroup", ID_OPTGROUP},
- {"big", ID_BIG},
- {"label", ID_LABEL},
- {"fieldset", ID_FIELDSET},
- {"small", ID_SMALL},
- {"sub", ID_SUB},
- {"embed", ID_EMBED},
- {"frameset", ID_FRAMESET},
- {"-konqblock", ID__KONQBLOCK},
- {"noframes", ID_NOFRAMES},
- {"noembed", ID_NOEMBED},
- {"abbr", ID_ABBR},
- {"colgroup", ID_COLGROUP},
- {"basefont", ID_BASEFONT},
- {"blockquote", ID_BLOCKQUOTE}
- };
-
- static const signed char lookup[] =
- {
- -1, 0, 1, -1, -1, -1, 2, 3,
- -1, 4, -1, 5, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -127, 8,
- -96, -2, 9, -1, -1, -1, -1, -1,
- 10, 11, -1, -1, -1, 12, 13, -1,
- -1, 14, 15, 16, -1, -1, -1, 17,
- 18, 19, -1, 20, 21, -1, 22, 23,
- 24, 25, -1, 26, 27, 28, 29, 30,
- -1, -1, 31, 32, 33, -1, -1, -1,
- 34, -1, 35, -1, -1, 36, -1, 37,
- -1, -1, 38, 39, 40, -1, 41, 42,
- -1, -1, 43, -1, 44, -1, -1, 45,
- -1, 46, -1, -1, -1, 47, 48, -1,
- 49, -1, -1, 50, 51, -1, 52, -1,
- -1, -1, -1, 53, -1, -1, 54, -1,
- -1, 55, -1, 56, 57, 58, 59, 60,
- 61, 62, -1, 63, 64, 65, -1, -1,
- 66, -1, 67, -1, 68, -1, -1, -1,
- -1, 69, -1, -1, -1, 70, -1, -1,
- -1, -1, 71, -1, 72, -1, 73, 74,
- -1, 75, -1, -1, -1, -1, -1, 76,
- 77, -1, 78, -1, 79, -1, -1, -1,
- 80, 81, -1, 82, 83, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 84,
- -1, 85, -1, -1, -1, 86, 87, -1,
- -1, -1, -1, -1, -1, 88, -1, -1,
- -1, -1, -1, -1, 89, 90, -1, 91,
- -1, -1, -1, -1, 92, -1, 93, 94,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 95, 96, 97, -1, -1, -1, -1, -1,
- -1, -1, -1, 98, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 99, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 100, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 101
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash_tag (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register int index = lookup[key];
-
- if (index >= 0)
- {
- if (len == lengthtable[index])
- {
- register const char *s = wordlist_tag[index].name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist_tag[index];
- }
- }
- else if (index < -TOTAL_KEYWORDS)
- {
- register int offset = - 1 - TOTAL_KEYWORDS - index;
- register const unsigned char *lengthptr = &lengthtable[TOTAL_KEYWORDS + lookup[offset]];
- register const struct tags *wordptr = &wordlist_tag[TOTAL_KEYWORDS + lookup[offset]];
- register const struct tags *wordendptr = wordptr + -lookup[offset + 1];
-
- while (wordptr < wordendptr)
- {
- if (len == *lengthptr)
- {
- register const char *s = wordptr->name;
-
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return wordptr;
- }
- lengthptr++;
- wordptr++;
- }
- }
- }
- }
- return 0;
-}
-
-
-static const char * tagList[] = {
-"",
- "A",
- "ABBR",
- "ACRONYM",
- "ADDRESS",
- "APPLET",
- "AREA",
- "B",
- "BASE",
- "BASEFONT",
- "BDO",
- "BIG",
- "BLOCKQUOTE",
- "BODY",
- "BR",
- "BUTTON",
- "CAPTION",
- "CENTER",
- "CITE",
- "CODE",
- "COL",
- "COLGROUP",
- "DD",
- "DEL",
- "DFN",
- "DIR",
- "DIV",
- "DL",
- "DT",
- "EM",
- "EMBED",
- "FIELDSET",
- "FONT",
- "FORM",
- "FRAME",
- "FRAMESET",
- "H1",
- "H2",
- "H3",
- "H4",
- "H5",
- "H6",
- "HEAD",
- "HR",
- "HTML",
- "I",
- "IFRAME",
- "IMG",
- "INPUT",
- "INS",
- "ISINDEX",
- "KBD",
- "KEYGEN",
- "-KONQBLOCK",
- "LABEL",
- "LAYER",
- "LEGEND",
- "LI",
- "LINK",
- "LISTING",
- "MAP",
- "MENU",
- "META",
- "NOEMBED",
- "NOFRAMES",
- "NOSCRIPT",
- "NOLAYER",
- "OBJECT",
- "OL",
- "OPTGROUP",
- "OPTION",
- "P",
- "PARAM",
- "PLAINTEXT",
- "PRE",
- "Q",
- "S",
- "SAMP",
- "SCRIPT",
- "SELECT",
- "SMALL",
- "SPAN",
- "STRIKE",
- "STRONG",
- "STYLE",
- "SUB",
- "SUP",
- "TABLE",
- "TBODY",
- "TD",
- "TEXTAREA",
- "TFOOT",
- "TH",
- "THEAD",
- "TITLE",
- "TR",
- "TT",
- "U",
- "UL",
- "VAR",
-"TEXT",
-"COMMENT",
- "/A",
- "/ABBR",
- "/ACRONYM",
- "/ADDRESS",
- "/APPLET",
- "/AREA",
- "/B",
- "/BASE",
- "/BASEFONT",
- "/BDO",
- "/BIG",
- "/BLOCKQUOTE",
- "/BODY",
- "/BR",
- "/BUTTON",
- "/CAPTION",
- "/CENTER",
- "/CITE",
- "/CODE",
- "/COL",
- "/COLGROUP",
- "/DD",
- "/DEL",
- "/DFN",
- "/DIR",
- "/DIV",
- "/DL",
- "/DT",
- "/EM",
- "/EMBED",
- "/FIELDSET",
- "/FONT",
- "/FORM",
- "/FRAME",
- "/FRAMESET",
- "/H1",
- "/H2",
- "/H3",
- "/H4",
- "/H5",
- "/H6",
- "/HEAD",
- "/HR",
- "/HTML",
- "/I",
- "/IFRAME",
- "/IMG",
- "/INPUT",
- "/INS",
- "/ISINDEX",
- "/KBD",
- "/KEYGEN",
- "/-KONQBLOCK",
- "/LABEL",
- "/LAYER",
- "/LEGEND",
- "/LI",
- "/LINK",
- "/LISTING",
- "/MAP",
- "/MENU",
- "/META",
- "/NOEMBED",
- "/NOFRAMES",
- "/NOSCRIPT",
- "/NOLAYER",
- "/OBJECT",
- "/OL",
- "/OPTGROUP",
- "/OPTION",
- "/P",
- "/PARAM",
- "/PLAINTEXT",
- "/PRE",
- "/Q",
- "/S",
- "/SAMP",
- "/SCRIPT",
- "/SELECT",
- "/SMALL",
- "/SPAN",
- "/STRIKE",
- "/STRONG",
- "/STYLE",
- "/SUB",
- "/SUP",
- "/TABLE",
- "/TBODY",
- "/TD",
- "/TEXTAREA",
- "/TFOOT",
- "/TH",
- "/THEAD",
- "/TITLE",
- "/TR",
- "/TT",
- "/U",
- "/UL",
- "/VAR",
- 0
-};
-DOMString getTagName(unsigned short id)
-{
- if(id > ID_CLOSE_TAG*2) id = ID_CLOSE_TAG+1;
- return DOMString(tagList[id]);
-};
diff --git a/WebCore/src/kdelibs/khtml/misc/htmltags.gperf b/WebCore/src/kdelibs/khtml/misc/htmltags.gperf
deleted file mode 100644
index 238eb77..0000000
--- a/WebCore/src/kdelibs/khtml/misc/htmltags.gperf
+++ /dev/null
@@ -1,113 +0,0 @@
-%{
-/* This file is automatically generated from htmltags.in by maketags, do not edit */
-/* Copyright 1999 Lars Knoll */
-#include "htmltags.h"
-%}
-struct tags {
- const char *name;
- int id;
-};
-%%
-a, ID_A
-abbr, ID_ABBR
-acronym, ID_ACRONYM
-address, ID_ADDRESS
-applet, ID_APPLET
-area, ID_AREA
-b, ID_B
-base, ID_BASE
-basefont, ID_BASEFONT
-bdo, ID_BDO
-big, ID_BIG
-blockquote, ID_BLOCKQUOTE
-body, ID_BODY
-br, ID_BR
-button, ID_BUTTON
-caption, ID_CAPTION
-center, ID_CENTER
-cite, ID_CITE
-code, ID_CODE
-col, ID_COL
-colgroup, ID_COLGROUP
-dd, ID_DD
-del, ID_DEL
-dfn, ID_DFN
-dir, ID_DIR
-div, ID_DIV
-dl, ID_DL
-dt, ID_DT
-em, ID_EM
-embed, ID_EMBED
-fieldset, ID_FIELDSET
-font, ID_FONT
-form, ID_FORM
-frame, ID_FRAME
-frameset, ID_FRAMESET
-h1, ID_H1
-h2, ID_H2
-h3, ID_H3
-h4, ID_H4
-h5, ID_H5
-h6, ID_H6
-head, ID_HEAD
-hr, ID_HR
-html, ID_HTML
-i, ID_I
-iframe, ID_IFRAME
-img, ID_IMG
-input, ID_INPUT
-ins, ID_INS
-isindex, ID_ISINDEX
-kbd, ID_KBD
-keygen, ID_KEYGEN
--konqblock, ID__KONQBLOCK
-label, ID_LABEL
-layer, ID_LAYER
-legend, ID_LEGEND
-li, ID_LI
-link, ID_LINK
-listing, ID_LISTING
-map, ID_MAP
-menu, ID_MENU
-meta, ID_META
-noembed, ID_NOEMBED
-noframes, ID_NOFRAMES
-noscript, ID_NOSCRIPT
-nolayer, ID_NOLAYER
-object, ID_OBJECT
-ol, ID_OL
-optgroup, ID_OPTGROUP
-option, ID_OPTION
-p, ID_P
-param, ID_PARAM
-plaintext, ID_PLAINTEXT
-pre, ID_PRE
-q, ID_Q
-s, ID_S
-samp, ID_SAMP
-script, ID_SCRIPT
-select, ID_SELECT
-small, ID_SMALL
-span, ID_SPAN
-strike, ID_STRIKE
-strong, ID_STRONG
-style, ID_STYLE
-sub, ID_SUB
-sup, ID_SUP
-table, ID_TABLE
-tbody, ID_TBODY
-td, ID_TD
-textarea, ID_TEXTAREA
-tfoot, ID_TFOOT
-th, ID_TH
-thead, ID_THEAD
-title, ID_TITLE
-tr, ID_TR
-tt, ID_TT
-u, ID_U
-ul, ID_UL
-var, ID_VAR
-anchor, ID_A
-image, ID_IMG
-xmp, ID_PRE
-%%
diff --git a/WebCore/src/kdelibs/khtml/misc/htmltags.h b/WebCore/src/kdelibs/khtml/misc/htmltags.h
deleted file mode 100644
index 3a26df1..0000000
--- a/WebCore/src/kdelibs/khtml/misc/htmltags.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* This file is automatically generated from
-htmltags.in by maketags, do not edit */
-/* Copyright 1999 Lars Knoll */
-
-#ifndef KHTML_TAGS_H
-#define KHTML_TAGS_H
-
-#include "dom_string.h"
-
-DOM::DOMString getTagName(unsigned short id);
-#define ID_A 1
-#define ID_ABBR 2
-#define ID_ACRONYM 3
-#define ID_ADDRESS 4
-#define ID_APPLET 5
-#define ID_AREA 6
-#define ID_B 7
-#define ID_BASE 8
-#define ID_BASEFONT 9
-#define ID_BDO 10
-#define ID_BIG 11
-#define ID_BLOCKQUOTE 12
-#define ID_BODY 13
-#define ID_BR 14
-#define ID_BUTTON 15
-#define ID_CAPTION 16
-#define ID_CENTER 17
-#define ID_CITE 18
-#define ID_CODE 19
-#define ID_COL 20
-#define ID_COLGROUP 21
-#define ID_DD 22
-#define ID_DEL 23
-#define ID_DFN 24
-#define ID_DIR 25
-#define ID_DIV 26
-#define ID_DL 27
-#define ID_DT 28
-#define ID_EM 29
-#define ID_EMBED 30
-#define ID_FIELDSET 31
-#define ID_FONT 32
-#define ID_FORM 33
-#define ID_FRAME 34
-#define ID_FRAMESET 35
-#define ID_H1 36
-#define ID_H2 37
-#define ID_H3 38
-#define ID_H4 39
-#define ID_H5 40
-#define ID_H6 41
-#define ID_HEAD 42
-#define ID_HR 43
-#define ID_HTML 44
-#define ID_I 45
-#define ID_IFRAME 46
-#define ID_IMG 47
-#define ID_INPUT 48
-#define ID_INS 49
-#define ID_ISINDEX 50
-#define ID_KBD 51
-#define ID_KEYGEN 52
-#define ID__KONQBLOCK 53
-#define ID_LABEL 54
-#define ID_LAYER 55
-#define ID_LEGEND 56
-#define ID_LI 57
-#define ID_LINK 58
-#define ID_LISTING 59
-#define ID_MAP 60
-#define ID_MENU 61
-#define ID_META 62
-#define ID_NOEMBED 63
-#define ID_NOFRAMES 64
-#define ID_NOSCRIPT 65
-#define ID_NOLAYER 66
-#define ID_OBJECT 67
-#define ID_OL 68
-#define ID_OPTGROUP 69
-#define ID_OPTION 70
-#define ID_P 71
-#define ID_PARAM 72
-#define ID_PLAINTEXT 73
-#define ID_PRE 74
-#define ID_Q 75
-#define ID_S 76
-#define ID_SAMP 77
-#define ID_SCRIPT 78
-#define ID_SELECT 79
-#define ID_SMALL 80
-#define ID_SPAN 81
-#define ID_STRIKE 82
-#define ID_STRONG 83
-#define ID_STYLE 84
-#define ID_SUB 85
-#define ID_SUP 86
-#define ID_TABLE 87
-#define ID_TBODY 88
-#define ID_TD 89
-#define ID_TEXTAREA 90
-#define ID_TFOOT 91
-#define ID_TH 92
-#define ID_THEAD 93
-#define ID_TITLE 94
-#define ID_TR 95
-#define ID_TT 96
-#define ID_U 97
-#define ID_UL 98
-#define ID_VAR 99
-#define ID_TEXT 100
-#define ID_COMMENT 101
-#define ID_CLOSE_TAG 101
-
-#endif
diff --git a/WebCore/src/kwq/kdecore/kapp.h b/WebCore/src/kwq/kdecore/kapp.h
index 1c25109..c06251c 100644
--- a/WebCore/src/kwq/kdecore/kapp.h
+++ b/WebCore/src/kwq/kdecore/kapp.h
@@ -26,11 +26,14 @@
#ifndef KAPP_H_
#define KAPP_H_
+#include <kglobal.h>
#include <dcopclient.h>
+#include <qapplication.h>
+#include <qpalette.h>
#define kapp KApplication::kApplication()
-class KApplication {
+class KApplication : public QApplication {
public:
static KApplication* kApplication() { return KApp; }
virtual DCOPClient *dcopClient();
diff --git a/WebCore/src/kwq/kdecore/kcharsets.h b/WebCore/src/kwq/kdecore/kcharsets.h
index b2854d0..ea088b9 100644
--- a/WebCore/src/kwq/kdecore/kcharsets.h
+++ b/WebCore/src/kwq/kdecore/kcharsets.h
@@ -26,11 +26,13 @@
#ifndef KCHARSETS_H_
#define KCHARSETS_H_
-class QFont;
+#include <qfont.h>
class QString;
+class QTextCodec;
class KCharsets {
public:
+ QTextCodec *codecForName(const QString &name, bool &ok) const;
void setQFont(QFont &f, QString charset) const;
QString xCharsetName(QFont::CharSet) const;
bool supportsScript(const QFont &f, QFont::CharSet charset);
diff --git a/WebCore/src/kwq/kdecore/kconfigbase.h b/WebCore/src/kwq/kdecore/kconfigbase.h
index f3ffa58..665ffe5 100644
--- a/WebCore/src/kwq/kdecore/kconfigbase.h
+++ b/WebCore/src/kwq/kdecore/kconfigbase.h
@@ -26,12 +26,16 @@
#ifndef KCONFIGBASE_H_
#define KCONFIGBASE_H_
+class QString;
+class QColor;
+
class KConfigBase {
public:
void setGroup(const QString& pGroup);
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;
+ QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kglobal.h b/WebCore/src/kwq/kdecore/kglobal.h
index 1d8290d..3c3dfaa 100644
--- a/WebCore/src/kwq/kdecore/kglobal.h
+++ b/WebCore/src/kwq/kdecore/kglobal.h
@@ -26,10 +26,13 @@
#ifndef KGLOBAL_H_
#define KGLOBAL_H_
-class KInstance;
+#include <qstring.h>
+#include <kinstance.h>
+
class KCharsets;
class KLocale;
class KStandardDirs;
+class KConfig;
#define kMin(a, b) ((a) < (b) ? (a) : (b))
#define kMax(a, b) ((a) > (b) ? (a) : (b))
@@ -40,6 +43,9 @@ public:
static KCharsets *charsets();
static KLocale *locale();
static KStandardDirs *dirs();
+ static KConfig *config();
+
+ static const QString &staticQString(const QString &);
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kiconloader.h b/WebCore/src/kwq/kdecore/kiconloader.h
index 317acfe..754b845 100644
--- a/WebCore/src/kwq/kdecore/kiconloader.h
+++ b/WebCore/src/kwq/kdecore/kiconloader.h
@@ -26,4 +26,15 @@
#ifndef KICONLOADER_H_
#define KICONLOADER_H_
+#include <qpixmap.h>
+#include <qstring.h>
+#include <kinstance.h>
+#include "kicontheme.h"
+
+class KIconLoader {
+public:
+ QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState,
+ QString *path_store=0L, bool canReturnNull=false) const;
+};
+
#endif
diff --git a/WebCore/src/kwq/kdecore/kinstance.h b/WebCore/src/kwq/kdecore/kinstance.h
index c47513a..5e93d92 100644
--- a/WebCore/src/kwq/kdecore/kinstance.h
+++ b/WebCore/src/kwq/kdecore/kinstance.h
@@ -26,8 +26,11 @@
#ifndef KINSTANCE_H_
#define KINSTANCE_H_
+class KIconLoader;
+
class KInstance {
public:
+ KIconLoader *iconLoader() const;
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kstaticdeleter.h b/WebCore/src/kwq/kdecore/kstaticdeleter.h
index 7728b21..f8b45a3 100644
--- a/WebCore/src/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/src/kwq/kdecore/kstaticdeleter.h
@@ -26,4 +26,9 @@
#ifndef KSTATICDELETER_H_
#define KSTATICDELETER_H_
+template <class T> class KStaticDeleter {
+public:
+ T *setObject(T *obj, bool isArray = false);
+};
+
#endif
diff --git a/WebCore/src/kwq/kdecore/kurl.h b/WebCore/src/kwq/kdecore/kurl.h
index 0a99517..3f19b48 100644
--- a/WebCore/src/kwq/kdecore/kurl.h
+++ b/WebCore/src/kwq/kdecore/kurl.h
@@ -51,6 +51,7 @@ public:
void setPath(const QString& path);
void setPort(unsigned short int);
bool isEmpty() const;
+ bool isMalformed() const;
QString prettyURL(int _trailing = 0) const;
};
diff --git a/WebCore/src/kwq/kio/job.h b/WebCore/src/kwq/kio/job.h
index a7267e6..f15f47a 100644
--- a/WebCore/src/kwq/kio/job.h
+++ b/WebCore/src/kwq/kio/job.h
@@ -26,12 +26,18 @@
#ifndef JOB_H_
#define JOB_H_
+#include <kurl.h>
+#include "jobclasses.h"
+
+// for time_t
+#include <sys/types.h>
+
// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
-class Job {
-};
+SimpleJob *http_update_cache(const KURL& url, bool no_cache, time_t expireDate);
+TransferJob *get(const KURL& url, bool reload=false, bool showProgressInfo = true);
-}
+} // namespace KIO
#endif
diff --git a/WebCore/src/kwq/kio/jobclasses.h b/WebCore/src/kwq/kio/jobclasses.h
index 0ef187d..7efdd6c 100644
--- a/WebCore/src/kwq/kio/jobclasses.h
+++ b/WebCore/src/kwq/kio/jobclasses.h
@@ -26,4 +26,26 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
+class QString;
+
+namespace KIO {
+
+class Job : public QObject {
+public:
+ int error();
+ const QString & errorText();
+ virtual void kill(bool quietly = true);
+};
+
+class SimpleJob : public KIO::Job {
+};
+
+class TransferJob : public SimpleJob {
+public:
+ bool isErrorPage() const;
+ void addMetaData(const QString &key, const QString &value);
+};
+
+} // namespace KIO
+
#endif
diff --git a/WebCore/src/kwq/kio/kimageio.h b/WebCore/src/kwq/kio/kimageio.h
index 77ead2d..5f730df 100644
--- a/WebCore/src/kwq/kio/kimageio.h
+++ b/WebCore/src/kwq/kio/kimageio.h
@@ -26,4 +26,11 @@
#ifndef KIMAGEIO_H_
#define KIMAGEIO_H_
+class KImageIO {
+public:
+ enum Mode { Reading, Writing };
+
+ static QStringList mimeTypes(Mode _mode = Writing);
+};
+
#endif
diff --git a/WebCore/src/kwq/kio/scheduler.h b/WebCore/src/kwq/kio/scheduler.h
index fc5ebc8..78dd266 100644
--- a/WebCore/src/kwq/kio/scheduler.h
+++ b/WebCore/src/kwq/kio/scheduler.h
@@ -26,4 +26,16 @@
#ifndef SCHEDULER_H_
#define SCHEDULER_H_
+#include "job.h"
+#include "jobclasses.h"
+
+namespace KIO {
+
+class Scheduler {
+public:
+ static void scheduleJob(SimpleJob *job);
+};
+
+} // namespace KIO
+
#endif
diff --git a/WebCore/src/kwq/qt/qarray.h b/WebCore/src/kwq/qt/qarray.h
index c95c2cc..ce27175 100644
--- a/WebCore/src/kwq/qt/qarray.h
+++ b/WebCore/src/kwq/qt/qarray.h
@@ -30,6 +30,7 @@
template <class T> class QArray {
public:
+ T &at(uint) const;
T *data() const;
uint size() const;
diff --git a/WebCore/src/kwq/qt/qasyncimageio.h b/WebCore/src/kwq/qt/qasyncimageio.h
index 056364a..187bb60 100644
--- a/WebCore/src/kwq/qt/qasyncimageio.h
+++ b/WebCore/src/kwq/qt/qasyncimageio.h
@@ -26,4 +26,9 @@
#ifndef QASYNCIMAGEIO_H_
#define QASYNCIMAGEIO_H_
+class QImageDecoder {
+public:
+ static const char* formatName(const uchar* buffer, int length);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qasyncio.h b/WebCore/src/kwq/qt/qasyncio.h
index c9dfbb8..a74ab92 100644
--- a/WebCore/src/kwq/qt/qasyncio.h
+++ b/WebCore/src/kwq/qt/qasyncio.h
@@ -26,4 +26,20 @@
#ifndef QASYNCIO_H_
#define QASYNCIO_H_
+class QAsynchIO {
+protected:
+ void ready();
+};
+
+class QDataSource : public QAsynchIO {
+public:
+ virtual void rewind();
+ void maybeReady();
+};
+
+class QDataSink : public QAsynchIO {
+public:
+ virtual void receive(const uchar*, int count)=0;
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qbitmap.h b/WebCore/src/kwq/qt/qbitmap.h
index 4586eb2..ee89f3a 100644
--- a/WebCore/src/kwq/qt/qbitmap.h
+++ b/WebCore/src/kwq/qt/qbitmap.h
@@ -26,4 +26,12 @@
#ifndef QBITMAP_H_
#define QBITMAP_H_
+#include "qpixmap.h"
+
+class QBitmap : public QPixmap {
+public:
+ QBitmap();
+ QBitmap(int,int);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qbrush.h b/WebCore/src/kwq/qt/qbrush.h
index 3f526a4..c757d04 100644
--- a/WebCore/src/kwq/qt/qbrush.h
+++ b/WebCore/src/kwq/qt/qbrush.h
@@ -26,4 +26,13 @@
#ifndef QBRUSH_H_
#define QBRUSH_H_
+#include "qcolor.h"
+
+class QBrush {
+friend class QPainter;
+public:
+ QBrush();
+ QBrush(const QColor &);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qbuffer.h b/WebCore/src/kwq/qt/qbuffer.h
index 0acd320..ab7968d 100644
--- a/WebCore/src/kwq/qt/qbuffer.h
+++ b/WebCore/src/kwq/qt/qbuffer.h
@@ -27,6 +27,14 @@
#define QBUFFER_H_
class QBuffer {
+public:
+ QByteArray buffer() const;
+
+ uint size() const;
+ bool isOpen();
+ bool open(int);
+ void close();
+ int writeBlock(const char *, uint);
};
#endif
diff --git a/WebCore/src/kwq/qt/qcollection.h b/WebCore/src/kwq/qt/qcollection.h
index 2d45385..0a17687 100644
--- a/WebCore/src/kwq/qt/qcollection.h
+++ b/WebCore/src/kwq/qt/qcollection.h
@@ -29,6 +29,7 @@
class QCollection {
public:
typedef void *Item;
+ void setAutoDelete(bool);
protected:
virtual Item newItem(Item);
};
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index 721d135..21b1a0d 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -26,21 +26,27 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
-// Forward declaration for khtml/html/html_imageimpl.h:58
-class QImage;
-
class QString;
class QColor {
public:
+ QColor();
+ QColor(const char *);
+
QString name() const;
+ void setNamedColor(const QString&);
int red() const;
int green() const;
int blue() const;
bool isValid() const;
+ void setRgb(int,int,int);
+ void setRgb(int);
+
+ QColor light(int f = 150) const;
-bool operator==(const QColor &x) const;
-bool operator!=(const QColor &x) const;
+ QColor &operator=(const QColor &);
+ 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 097c45c..ad5e599 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -38,10 +38,28 @@ typedef QArray<char> QByteArray;
class QCString : public QByteArray {
public:
QCString();
- QCString(uint);
+ QCString(int);
+ QCString(const char *);
QCString(const char *, uint);
+ QCString(const QCString&);
+
+ QCString mid(uint index, uint len=0xffffffff) const;
+
+ int find(const char *str, int index=0, bool cs=TRUE) const;
+ bool isEmpty() const;
+ bool isNull() const;
+ uint length() const;
+ QCString lower() const;
+
+ operator const char *() const;
+ QCString &operator=(const QCString&);
+ QCString &operator=(const char *);
+ QCString &operator+=(const char *);
+ QCString &operator+=(const QCString&);
};
+bool operator==(const char *, const QCString &);
+bool operator==(const QCString &, const char *);
bool operator!=(const char *, const QCString &);
bool operator!=(const QCString &, const char *);
diff --git a/WebCore/src/kwq/qt/qdict.h b/WebCore/src/kwq/qt/qdict.h
index 398f1fe..56227bb 100644
--- a/WebCore/src/kwq/qt/qdict.h
+++ b/WebCore/src/kwq/qt/qdict.h
@@ -26,7 +26,27 @@
#ifndef QDICT_H_
#define QDICT_H_
-template <class T> class QDict {
+#include "qcollection.h"
+
+template <class T> class QDict : public QCollection {
+public:
+ QDict(int size=17, bool caseSensitive=TRUE);
+
+ void insert(const QString &, const T *);
+ bool remove(const QString &);
+ T *find(const QString &) const;
+ uint count() const;
+};
+
+template<class T> class QDictIterator {
+public:
+ QDictIterator(const QDict<T> &);
+
+ uint count() const;
+ T *current() const;
+ T *toFirst();
+
+ T *operator++();
};
#endif
diff --git a/WebCore/src/kwq/qt/qfont.h b/WebCore/src/kwq/qt/qfont.h
index 3ca1e59..2c819e2 100644
--- a/WebCore/src/kwq/qt/qfont.h
+++ b/WebCore/src/kwq/qt/qfont.h
@@ -31,6 +31,7 @@ class QString;
class QFont {
public:
+ enum CharSet { Latin1 };
enum Weight { Normal = 50, Bold = 63 };
int pixelSize() const;
@@ -44,7 +45,9 @@ public:
bool bold() const;
bool operator==(const QFont &x) const;
bool operator!=(const QFont &x) const;
- enum CharSet {};
+
+private:
+ friend class QPainter;
};
#endif
diff --git a/WebCore/src/kwq/qt/qfontdatabase.h b/WebCore/src/kwq/qt/qfontdatabase.h
index e1cf5df..9680e73 100644
--- a/WebCore/src/kwq/qt/qfontdatabase.h
+++ b/WebCore/src/kwq/qt/qfontdatabase.h
@@ -33,6 +33,7 @@ class QString;
class QFontDatabase {
public:
+ QFont font(const QString familyName, const QString &style, int pointSize, const QString charSetName = QString::null);
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 &);
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 0bec0e4..90cbe49 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -28,9 +28,12 @@
class QRect;
class QChar;
+class QFont;
class QFontMetrics {
public:
+ QFontMetrics();
+ QFontMetrics(const QFont&);
QRect boundingRect(QChar) const;
};
diff --git a/WebCore/src/kwq/qt/qimage.h b/WebCore/src/kwq/qt/qimage.h
index f2e043b..d824748 100644
--- a/WebCore/src/kwq/qt/qimage.h
+++ b/WebCore/src/kwq/qt/qimage.h
@@ -27,6 +27,13 @@
#define QIMAGE_H_
class QImage {
+public:
+ int width() const;
+ int height() const;
+ int depth() const;
+ int pixelIndex(int,int) const;
+ QImage createAlphaMask(int conversion_flags=0) const;
+ bool hasAlphaBuffer() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 6266366..4b57487 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -58,6 +58,7 @@ public:
T *toFirst();
T *toLast();
T *current() const;
+ operator T *() const;
T *operator--();
T *operator++();
};
diff --git a/WebCore/src/kwq/qt/qmovie.h b/WebCore/src/kwq/qt/qmovie.h
index f6aba29..89d2531 100644
--- a/WebCore/src/kwq/qt/qmovie.h
+++ b/WebCore/src/kwq/qt/qmovie.h
@@ -26,4 +26,35 @@
#ifndef QMOVIE_H_
#define QMOVIE_H_
+#include "qobject.h"
+#include "qpixmap.h"
+#include "qimage.h"
+
+class QMovie {
+public:
+ enum Status { EndOfFrame, EndOfMovie };
+
+ QMovie();
+ QMovie(QDataSource*, int bufsize=1024);
+
+ void unpause();
+ void pause();
+ void restart();
+ bool finished();
+ bool running();
+ int frameNumber() const;
+
+ const QRect& getValidRect() const;
+ const QPixmap& framePixmap() const;
+ const QImage& frameImage() const;
+
+ void connectResize(QObject* receiver, const char *member);
+ void connectUpdate(QObject* receiver, const char *member);
+ void connectStatus(QObject* receiver, const char *member);
+
+ void disconnectResize(QObject* receiver, const char *member=0);
+ void disconnectUpdate(QObject* receiver, const char *member=0);
+ void disconnectStatus(QObject* receiver, const char *member=0);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index 55de268..4bfe679 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -26,6 +26,8 @@
#ifndef QNAMESPACE_H_
#define QNAMESPACE_H_
+class QColor;
+
class Qt {
public:
enum ButtonState {
@@ -36,6 +38,8 @@ public:
AltButton,
ShiftButton,
};
+
+ static const QColor &black;
};
#endif
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index 2faba76..0542b16 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -26,7 +26,24 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "qpaintdevice.h"
+#include "qcolor.h"
+#include "qbrush.h"
+
+class QFont;
+class QFontMetrics;
+class QPixmap;
+
class QPainter {
+public:
+ QPainter();
+ QPainter(const QPaintDevice *);
+
+ void setFont(const QFont &);
+ QFontMetrics fontMetrics() const;
+
+ void fillRect(int x, int y, int w, int h, const QBrush &);
+ void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &);
};
#endif
diff --git a/WebCore/src/kwq/qt/qpalette.h b/WebCore/src/kwq/qt/qpalette.h
index e944a6f..079ad89 100644
--- a/WebCore/src/kwq/qt/qpalette.h
+++ b/WebCore/src/kwq/qt/qpalette.h
@@ -26,16 +26,34 @@
#ifndef QPALETTE_H_
#define QPALETTE_H_
+class QColor;
+
class QColorGroup {
public:
- enum ColorRole { Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+ enum ColorRole { Foreground, Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+
void setColor(ColorRole role, const QColor &color);
+ const QColor &foreground() const;
+ const QColor &shadow() const;
+ const QColor &light() const;
+ const QColor &midlight() const;
+ const QColor &dark() const;
+ const QColor &base() const;
+ const QColor &buttonText() const;
+ const QColor &button() const;
+ const QColor &text() const;
+ const QColor &background() const;
};
class QPalette {
public:
enum ColorGroup { Active, Inactive };
+
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
+
+ const QColorGroup &active() const;
+ const QColorGroup &inactive() const;
+ const QColorGroup &disabled() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qpixmap.h b/WebCore/src/kwq/qt/qpixmap.h
index 56464f9..c10f325 100644
--- a/WebCore/src/kwq/qt/qpixmap.h
+++ b/WebCore/src/kwq/qt/qpixmap.h
@@ -27,8 +27,26 @@
#define QPIXMAP_H_
#include "qpaintdevice.h"
+#include "qstring.h"
-class QPixmap {
+class QBitmap;
+
+class QPixmap : public QPaintDevice {
+public:
+ QPixmap();
+ QPixmap(const QSize&);
+ QPixmap(const QByteArray&);
+ QPixmap(int,int);
+
+ void setMask(const QBitmap &);
+ const QBitmap *mask() const;
+
+ QSize size() const;
+ QRect rect() const;
+ int width() const;
+ int height() const;
+ bool isNull() const;
+ void resize(const QSize &);
};
#endif
diff --git a/WebCore/src/kwq/qt/qptrdict.h b/WebCore/src/kwq/qt/qptrdict.h
index 241d8d8..508225c 100644
--- a/WebCore/src/kwq/qt/qptrdict.h
+++ b/WebCore/src/kwq/qt/qptrdict.h
@@ -27,16 +27,29 @@
#define QPTRDICT_H_
#include <kwq.h>
+#include "qcollection.h"
-template <class T> class QPtrDict {
+template <class T> class QPtrDict : public QCollection {
public:
QPtrDict(int size=13);
+
uint count() const;
T *at(uint);
+ T *take(void *);
void append(const T *);
void insert(void *, const T *);
void remove(void *);
T *operator[](void *) const;
};
+template<class T> class QPtrDictIterator {
+public:
+ QPtrDictIterator(const QPtrDict<T> &);
+
+ T *current() const;
+ void *currentKey() const;
+
+ T *operator++();
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 903ed06..700a9d1 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -26,6 +26,8 @@
#ifndef QRECT_H_
#define QRECT_H_
+class QSize;
+
class QRect {
public:
QRect();
@@ -35,6 +37,9 @@ public:
int top() const;
int width() const;
int height() const;
+ bool isNull() const;
+
+ QSize size() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/src/kwq/qt/qsize.h
index 002fd23..25c6987 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/src/kwq/qt/qsize.h
@@ -31,10 +31,12 @@ public:
QSize();
QSize(int,int);
+ bool isValid() const;
int width() const;
int height() const;
friend inline QSize operator+(const QSize &, const QSize &);
+ friend inline bool operator!=(const QSize &, const QSize &);
};
#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 61ed1aa..a18ae04 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -45,6 +45,7 @@ public:
bool isNull() const;
bool isDigit() const;
bool isSpace() const;
+ bool isLetter() const;
bool isLetterOrNumber() const;
uchar cell() const;
uchar row() const;
@@ -68,11 +69,15 @@ public:
class QString {
public:
static QString fromLatin1(const char*, int len = -1);
+
QString();
QString(const QChar *, uint);
QString(const char *);
+ QString(const QByteArray&);
+ QString(const QString&);
+
int toInt() const;
- int toInt(bool *) const;
+ int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
@@ -90,7 +95,6 @@ public:
int find(const QRegExp &, int index = 0, bool b = 0) const;
int findRev(char, int index = 0) const;
int findRev(const char *, int index = 0) const;
- QString left(uint) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
@@ -99,6 +103,8 @@ public:
QString arg(const QString&, int fieldwidth = 0) const;
+ QString left(uint) const;
+ QString right(uint) const;
QString mid(int, int len = 0xffffffff) const;
void fill(QChar, int len = -1);
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index e60c3ad..9e9f68d 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -26,6 +26,24 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
-class QTextCodec;
+#include "qstring.h"
+#include "qcstring.h"
+
+class QTextDecoder {
+public:
+ virtual QString toUnicode(const char* chars, int len) = 0;
+};
+
+class QTextCodec {
+public:
+ static QTextCodec *codecForMib(int mib);
+ static QTextCodec *codecForName(const char* hint, int accuracy=0);
+
+ virtual int mibEnum() const = 0;
+ virtual QTextDecoder *makeDecoder() const;
+ virtual QString toUnicode(const char *chars, int len) const;
+ QString toUnicode(const QByteArray&, int len) const;
+ QString toUnicode(const char *chars) const;
+};
#endif
diff --git a/WebCore/src/kwq/qt/qtooltip.h b/WebCore/src/kwq/qt/qtooltip.h
index ed8ad8b..7c024a6 100644
--- a/WebCore/src/kwq/qt/qtooltip.h
+++ b/WebCore/src/kwq/qt/qtooltip.h
@@ -26,4 +26,11 @@
#ifndef QTOOLTIP_H_
#define QTOOLTIP_H_
+class QPalette;
+
+class QToolTip {
+public:
+ static QPalette palette();
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index b09b079..1472564 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -31,6 +31,7 @@ public:
QValueListIterator operator++();
bool operator!=(const QValueListIterator<T>& it);
T& operator*();
+ QValueListIterator<T>& operator--();
};
template<class T> class QValueListConstIterator {
@@ -47,19 +48,22 @@ 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);
- Iterator remove(Iterator it);
+ void append(const T&);
+ void remove(const T&);
+ uint contains(const T&);
+ Iterator remove(Iterator);
+ Iterator fromLast();
const T& first() const;
const T& last() const;
Iterator begin();
Iterator end();
ConstIterator begin() const;
ConstIterator end() const;
- T& operator[] (uint i);
+ T& operator[] (uint);
};
#endif
diff --git a/WebCore/src/kwq/qt/qvariant.h b/WebCore/src/kwq/qt/qvariant.h
index 3f87e7f..9f39241 100644
--- a/WebCore/src/kwq/qt/qvariant.h
+++ b/WebCore/src/kwq/qt/qvariant.h
@@ -30,6 +30,9 @@ typedef unsigned int uint;
class QString;
+// this isn't used in this class, but it other classes expect the forward decl
+class QImage;
+
class QVariant {
public:
enum Type {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list