Commit c99debf1 authored by kocienda's avatar kocienda

More whacks to get khtml/dom to compile, and, by gum, now it does!


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@32 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 424bcd57
This diff is collapsed.
#!/bin/sh
FILES='Makefile.am'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
if (test -z "$A"); then
echo "Moving KDE build file $file..."
mv $file $file.kde
fi
fi
done
if (! test -L "Makefile.in"); then
echo "Making link to Apple Makefile.in..."
ln -s Makefile.in.apple Makefile.in
fi
#======================================================================
#
# Makefile
#
# $RCSfile$
# $Revision$
# $Author$
# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
TOPSRCDIR = ../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
CXXYACCOBJECTS = grammar.cpp grammar.h
CXXOBJECTS = \
array_object.o \
bool_object.o \
collector.o \
date_object.o \
debugger.o \
error_object.o \
function.o \
function_object.o \
global_object.o \
grammar.o \
internal.o \
kjs.o \
lexer.o \
lookup.o \
math_object.o \
nodes.o \
number_object.o \
object.o \
object_object.o \
operations.o \
regexp.o \
regexp_object.o \
string_object.o \
types.o \
ustring.o \
$(NULL)
PROGRAM = testkjs
OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS)
LIBRARY = libkjs.a
CLEAN_FILES = $(OBJECTS) \
grammar.h \
grammar.cpp \
grammar.cpp.h \
testkjs.o \
$(LIBRARY) \
$(PROGRAM) \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
#======================================================================
# end
#======================================================================
......@@ -53,6 +53,8 @@ namespace khtml {
void applyRule(RenderStyle *style, DOM::CSSProperty *prop, DOM::ElementImpl *e);
};
#include "khtml_part.h"
class KHTMLPart;
class KHTMLViewPrivate;
......
......@@ -29,6 +29,8 @@
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
typedef QArray<char> QByteArray;
// added to help in compilation of khtml/dom/html_documnent.cpp:182
class QCString {
};
......
......@@ -26,6 +26,9 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
// Forward declaration for khtml/html/html_imageimpl.h:58
class QImage;
class QColor {
public:
int red() const;
......
......@@ -26,8 +26,7 @@
#ifndef DCOPCLIENT_H_
#define DCOPCLIENT_H_
class QCString;
class QByteArray;
#include <qcstring.h>
// KApplication needs this
class DCOPClient {
......
......@@ -26,4 +26,7 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
class QImage {
};
#endif
......@@ -26,7 +26,7 @@
#ifndef QARRAY_H_
#define QARRAY_H_
class QByteArray {
template <class T> class QArray {
};
#endif
......@@ -26,4 +26,7 @@
#ifndef QREGION_H_
#define QREGION_H_
class QRegion {
};
#endif
......@@ -70,6 +70,8 @@ public:
static const QString null;
static QString number(long n, int base=10);
// FIXME: bogus constructor hack for "conversion from int to non-scalar
// type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
QString(int);
......
......@@ -26,8 +26,7 @@
#ifndef DCOPCLIENT_H_
#define DCOPCLIENT_H_
class QCString;
class QByteArray;
#include <qcstring.h>
// KApplication needs this
class DCOPClient {
......
......@@ -26,7 +26,7 @@
#ifndef QARRAY_H_
#define QARRAY_H_
class QByteArray {
template <class T> class QArray {
};
#endif
......@@ -26,6 +26,9 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
// Forward declaration for khtml/html/html_imageimpl.h:58
class QImage;
class QColor {
public:
int red() const;
......
......@@ -29,6 +29,8 @@
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
typedef QArray<char> QByteArray;
// added to help in compilation of khtml/dom/html_documnent.cpp:182
class QCString {
};
......
......@@ -26,4 +26,7 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
class QImage {
};
#endif
......@@ -26,4 +26,7 @@
#ifndef QREGION_H_
#define QREGION_H_
class QRegion {
};
#endif
......@@ -70,6 +70,8 @@ public:
static const QString null;
static QString number(long n, int base=10);
// FIXME: bogus constructor hack for "conversion from int to non-scalar
// type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
QString(int);
......
#!/bin/sh
FILES='Makefile.am'
for file in $FILES; do
if (test -f "$file"); then
A=`grep APPLE $file`
if (test -z "$A"); then
echo "Moving KDE build file $file..."
mv $file $file.kde
fi
fi
done
if (! test -L "Makefile.in"); then
echo "Making link to Apple Makefile.in..."
ln -s Makefile.in.apple Makefile.in
fi
#======================================================================
#
# Makefile
#
# $RCSfile$
# $Revision$
# $Author$
# $Date$
#
#======================================================================
# set top source dir relative to this directory
# include make vars boilerplate
#
TOPSRCDIR = ../../..
include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
CXXYACCOBJECTS = grammar.cpp grammar.h
CXXOBJECTS = \
array_object.o \
bool_object.o \
collector.o \
date_object.o \
debugger.o \
error_object.o \
function.o \
function_object.o \
global_object.o \
grammar.o \
internal.o \
kjs.o \
lexer.o \
lookup.o \
math_object.o \
nodes.o \
number_object.o \
object.o \
object_object.o \
operations.o \
regexp.o \
regexp_object.o \
string_object.o \
types.o \
ustring.o \
$(NULL)
PROGRAM = testkjs
OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS)
LIBRARY = libkjs.a
CLEAN_FILES = $(OBJECTS) \
grammar.h \
grammar.cpp \
grammar.cpp.h \
testkjs.o \
$(LIBRARY) \
$(PROGRAM) \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
#======================================================================
# end
#======================================================================
......@@ -53,6 +53,8 @@ namespace khtml {
void applyRule(RenderStyle *style, DOM::CSSProperty *prop, DOM::ElementImpl *e);
};
#include "khtml_part.h"
class KHTMLPart;
class KHTMLViewPrivate;
......
This diff is collapsed.
......@@ -26,8 +26,7 @@
#ifndef DCOPCLIENT_H_
#define DCOPCLIENT_H_
class QCString;
class QByteArray;
#include <qcstring.h>
// KApplication needs this
class DCOPClient {
......
......@@ -26,7 +26,7 @@
#ifndef QARRAY_H_
#define QARRAY_H_
class QByteArray {
template <class T> class QArray {
};
#endif
......@@ -26,6 +26,9 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
// Forward declaration for khtml/html/html_imageimpl.h:58
class QImage;
class QColor {
public:
int red() const;
......
......@@ -29,6 +29,8 @@
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
typedef QArray<char> QByteArray;
// added to help in compilation of khtml/dom/html_documnent.cpp:182
class QCString {
};
......
......@@ -26,4 +26,7 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
class QImage {
};
#endif
......@@ -26,4 +26,7 @@
#ifndef QREGION_H_
#define QREGION_H_
class QRegion {
};
#endif
......@@ -70,6 +70,8 @@ public:
static const QString null;
static QString number(long n, int base=10);
// FIXME: bogus constructor hack for "conversion from int to non-scalar
// type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
QString(int);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment