Commit eaaa22cb authored by kocienda's avatar kocienda

Finished getting khtml/java to compile


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 365cc625
......@@ -23,6 +23,7 @@ SUBDIRS = \
src/kdelibs/khtml/dom \
src/kdelibs/khtml/ecma \
src/kdelibs/khtml/xml \
src/kdelibs/khtml/java \
$(NULL)
#----------------------------------------------------------------------
......
This diff is collapsed.
......@@ -40,11 +40,12 @@ dnl
SUBDIRS='
src/kdelibs/kjs
src/kdelibs/khtml/misc
src/kdelibs/khtml/css
src/kdelibs/khtml/dom
src/kdelibs/khtml/ecma
src/kdelibs/khtml/xml
src/kdelibs/khtml/misc
src/kdelibs/khtml/java
'
for subdir in $SUBDIRS; do
if (test -f "./$subdir/MakeSystemChanges.sh"); then
......@@ -185,10 +186,11 @@ AC_OUTPUT(
Makefile.vars
Makefile.rules
src/kdelibs/kjs/Makefile
src/kdelibs/khtml/misc/Makefile
src/kdelibs/khtml/css/Makefile
src/kdelibs/khtml/dom/Makefile
src/kdelibs/khtml/ecma/Makefile
src/kdelibs/khtml/xml/Makefile
src/kdelibs/khtml/misc/Makefile
src/kdelibs/khtml/java/Makefile
)
Makefile
Makefile.am
Makefile.in
libkjava_la.all_cpp.cpp
*.kdoc
SunWS_cache
ir.out
kjava.policy
*.kdevprj
*.kde
*.dep
*.moc
#!/bin/sh
FILES='Makefile.am configure.in.in'
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
# Generated automatically from Makefile.in by configure.
#======================================================================
#
# 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
ALLOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
CXXOBJECTS = $(filter-out javaembed.o,$(ALLOBJECTS))
OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmljava.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
*.moc \
$(NULL)
#----------------------------------------------------------------------
# Set flags for this directory
CXXFLAGS = -DNEED_BOGUS_X_DEFINES -I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I.. \
-I. \
$(NULL)
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
kjavaapplet.cpp: kjavaapplet.moc
kjavaapplet.moc:
touch $@
kjavaappletcontext.cpp: kjavaappletcontext.moc
kjavaappletcontext.moc:
touch $@
kjavaappletserver.cpp: kjavaappletserver.moc
kjavaappletserver.moc:
touch $@
kjavaappletwidget.cpp: kjavaappletwidget.moc
kjavaappletwidget.moc:
touch $@
kjavadownloader.cpp: kjavadownloader.moc
kjavadownloader.moc:
touch $@
kjavaprocess.cpp: kjavaprocess.moc
kjavaprocess.moc:
touch $@
#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
#======================================================================
# end
#======================================================================
......@@ -32,6 +32,8 @@
// added to help in compilation of khtml/khtml_part.h:811
#include "qarray.h"
#include <string.h>
typedef QArray<char> QByteArray;
// added to help in compilation of khtml/dom/html_documnent.cpp:182
......
......@@ -32,6 +32,9 @@ class QFile {
public:
QFile();
QFile(const QString &);
bool exists() const;
static bool exists(const QString &);
bool open(int);
void close();
uint size() const;
......
/*
* Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QFRAME_H_
#define QFRAME_H_
#include "qwidget.h"
class QFrame : public QWidget {
public:
enum Shape {
StyledPanel,
};
enum Shadow {
Sunken,
};
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
};
#endif
......@@ -32,7 +32,7 @@ class QString;
class KConfig : public KConfigBase {
public:
KConfig(const QString &);
KConfig(const QString &, bool bReadOnly=false);
};
#endif
......@@ -34,6 +34,7 @@ class Job : public QObject {
public:
int error();
const QString & errorText();
QString errorString();
virtual void kill(bool quietly = true);
};
......
......@@ -27,6 +27,7 @@
#define PART_H_
#include <kurl.h>
#include <qobject.h>
#include <qvariant.h>
#include <qlist.h>
#include <qstringlist.h>
......
......@@ -26,12 +26,15 @@
#ifndef KWIN_H_
#define KWIN_H_
#include <qrect.h>
#include <qobjectdefs.h>
#include <qstring.h>
class KWin {
public:
struct Info {
QRect geometry;
QString name;
QString visibleName;
};
static Info info(int win);
};
......
......@@ -26,11 +26,16 @@
#ifndef KWINMODULE_H_
#define KWINMODULE_H_
#include <qobject.h>
class QRect;
class KWinModule {
class KWinModule : public QObject {
public:
KWinModule(QObject* parent = 0);
QRect workArea(int desktop = - 1) const;
void doNotManage(const QString&);
};
#endif
......@@ -26,4 +26,14 @@
#ifndef QLABEL_H_
#define QLABEL_H_
#include "qframe.h"
class QLabel : public QFrame {
public:
QLabel(QWidget *parent);
virtual void setText(const QString &);
virtual void setAlignment(int);
};
#endif
......@@ -26,24 +26,48 @@
#ifndef QMAP_H_
#define QMAP_H_
#include <kwqdef.h>
template<class K, class T> class QMapIterator {
public:
QMapIterator();
QMapIterator(const QMapIterator<K,T>& it);
const K& key() const;
const T& data() const;
bool operator!=(const QMapIterator<K,T>&) const;
T& operator*();
const T& operator*() const;
QMapIterator<K,T>& operator++();
};
template<class K, class T> class QMapConstIterator {
public:
bool operator!=(const QMapConstIterator <K, T> &) const;
QMapConstIterator();
QMapConstIterator(const QMapIterator<K,T>&);
const K& key() const;
const T& data() const;
bool operator!=(const QMapConstIterator<K,T>&) const;
const T &operator*() const;
QMapConstIterator<K,T>& operator++();
};
template <class K, class T> class QMap {
public:
typedef QMapIterator<K, T> Iterator;
typedef QMapConstIterator< K, T> ConstIterator;
Iterator begin();
Iterator end();
ConstIterator begin() const;
ConstIterator end() const;
Iterator insert(const K&, const T&);
ConstIterator find (const K &) const;
void remove(const K&);
void clear();
uint count() const;
T& operator[](const K& k);
};
......
......@@ -26,16 +26,18 @@
#ifndef QARRAY_H_
#define QARRAY_H_
#include <kwq.h>
#include <kwqdef.h>
template <class T> class QArray {
public:
QArray();
QArray(int);
T &at(uint) const;
T *data() const;
uint size() const;
bool resize(uint);
bool resize(uint size);
QArray<T>& duplicate(const T*, int);
T &operator[](int) const;
};
......
......@@ -39,6 +39,11 @@ public:
ShiftButton,
};
enum AlignmentFlags {
AlignCenter,
WordBreak,
};
static const QColor &black;
};
......
......@@ -26,10 +26,13 @@
#ifndef QOBJECT_H_
#define QOBJECT_H_
#include <kwqdef.h>
// includes added to help in compilation of khtml/khtmlview.h
#include "qobjectdefs.h"
#include "qstring.h"
#include "qevent.h"
#include "qvariant.h"
#include "qstringlist.h"
// FIXME: should these macros be in "kwq.h" or other header file?
#define slots
......@@ -39,6 +42,8 @@
#define emit
#define Q_OBJECT
class QVariant;
class QObject {
public:
QObject(QObject *parent=0, const char *name=0);
......@@ -46,9 +51,9 @@ public:
virtual void setName(const char *);
QVariant property(const char *name) const;
bool inherits(const char *) const;
static bool connect(const QObject *, const char *, const QObject *, const
char *);
static bool connect(const QObject *, const char *, const QObject *, const char *);
bool connect(const QObject *, const char *, const char *) const;
static bool disconnect( const QObject *, const char *, const QObject *, const char *);
int startTimer(int);
void killTimer(int);
void killTimers();
......
......@@ -27,7 +27,9 @@
#define QPIXMAP_H_
#include "qpaintdevice.h"
#include "qcolor.h"
#include "qstring.h"
#include "qnamespace.h"
class QBitmap;
......
......@@ -26,7 +26,7 @@
#ifndef QPTRDICT_H_
#define QPTRDICT_H_
#include <kwq.h>
#include <kwqdef.h>
#include "qcollection.h"
template <class T> class QPtrDict : public QCollection {
......
......@@ -26,7 +26,7 @@
#ifndef QLIST_H_
#define QLIST_H_
#include <kwq.h>
#include <kwqdef.h>
#include "qcollection.h"
template <class T> class QList {
......@@ -39,6 +39,7 @@ public:
void setAutoDelete(bool);
bool insert(uint i, const T *);
bool remove(const T *);
bool removeFirst();
bool removeLast();
void prepend(const T *);
T *take(uint i);
......
......@@ -26,7 +26,7 @@
#ifndef QRECT_H_
#define QRECT_H_
class QSize;
#include "qsize.h"
class QRect {
public:
......
......@@ -26,6 +26,8 @@
#ifndef QREGEXP_H_
#define QREGEXP_H_
#include "qstring.h"
class QRegExp {
public:
QRegExp(const QString &);
......
......@@ -26,6 +26,9 @@
#ifndef QREGION_H_
#define QREGION_H_
#include "qobjectdefs.h"
#include "qrect.h"
class QRegion {
};
......
......@@ -26,13 +26,10 @@
#ifndef QSTRING_H_
#define QSTRING_H_
#include <kwq.h>
#include <string.h>
#include "qcstring.h"
#include "qregexp.h"
class QString;
class QRegExp;
class QChar {
public:
......@@ -71,6 +68,7 @@ public:
static QString fromLatin1(const char*, int len = -1);
QString();
QString(QChar);
QString(const QChar *, uint);
QString(const char *);
QString(const QByteArray&);
......@@ -140,6 +138,10 @@ public:
QString &operator+(const char *, const QString &);
QString &operator+(QChar, const QString &);
bool operator==(const QString &, QChar);
bool operator==(const QString &, const QString &);
bool operator==(const QString &, const char *);
bool operator==(const char *, const QString &);
bool operator!=(const QString &, QChar);
bool operator!=(const QString &, const QString &);
bool operator!=(const QString &, const char *);
......
......@@ -31,7 +31,7 @@
class QStringList : public QValueList<QString> {
public:
static QStringList split(const QChar &sep, const QString &str, bool allowEmptyEntries = FALSE);
static QStringList split(const QString &sep, const QString &str, bool allowEmptyEntries = FALSE );
QString join(const QString &sepx ) const;
};
......
......@@ -26,7 +26,17 @@
#ifndef QTEXTSTREAM_H_
#define QTEXTSTREAM_H_
#include "qstring.h"
class QTextStream {
public:
QTextStream();
QTextStream(QByteArray, int);
QTextStream &operator<<(char);
QTextStream &operator<<(const char *);
QTextStream &operator<<(const QCString&);
QTextStream &operator<<(const QString&);
};
class QTextIStream : public QTextStream {
......@@ -35,4 +45,9 @@ public:
QString readLine();
};
class QTextOStream : public QTextStream {
public:
QTextOStream(QByteArray ba);
};
#endif
......@@ -28,9 +28,11 @@
template<class T> class QValueListIterator {
public:
QValueListIterator operator++();
bool operator!=(const QValueListIterator<T>& it);
T& operator*();
const T& operator*() const;
QValueListIterator<T>& operator++();
QValueListIterator<T>& operator++(int);
QValueListIterator<T>& operator--();
};
......@@ -64,6 +66,7 @@ public:
ConstIterator begin() const;
ConstIterator end() const;
T& operator[] (uint);
const T& operator[] (uint) const;
};
#endif
......@@ -40,8 +40,10 @@ public:
int width() const;
int height() const;
QSize size() const;
virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
virtual void show();
virtual void move(const QPoint &);
void move(int, int);
QWidget *topLevelWidget() const;
......
......@@ -30,6 +30,7 @@
#include <dcopclient.h>
#include <qapplication.h>
#include <qpalette.h>
#include <qregexp.h>
#define kapp KApplication::kApplication()
......
......@@ -32,7 +32,7 @@ class QString;
class KConfig : public KConfigBase {
public:
KConfig(const QString &);
KConfig(const QString &, bool bReadOnly=false);
};
#endif
......@@ -26,6 +26,15 @@
#ifndef KCONFIGBASE_H_
#define KCONFIGBASE_H_
#include <qobject.h>
#include <qcolor.h>
#include <qfont.h>
#include <qdatetime.h>
#include <qstrlist.h>
#include <qstringlist.h>
#include <qvariant.h>
#include <qmap.h>
class QString;
class QColor;
......@@ -35,6 +44,7 @@ public:
QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
int readNumEntry(const char *pKey, int nDefault = 0) const;
unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
};
......
......@@ -26,4 +26,25 @@
#ifndef KPROCESS_H_
#define KPROCESS_H_
#include <signal.h>
#include <qobject.h>
#include <qstring.h>
#include <qstrlist.h>
class KProcess : public QObject {
public:
enum Communication { NoCommunication = 0, Stdin = 1, Stdout = 2, NoRead };
enum RunMode { DontCare, NotifyOnExit, Block };
QStrList *args();
bool isRunning() const;
bool writeStdin(const char *buffer, int buflen);
virtual bool start(RunMode runmode = NotifyOnExit, Communication comm = NoCommunication);
virtual bool kill(int signo = SIGTERM);
void resume();
KProcess &operator<<(const QString& arg);
};
#endif
......@@ -26,12 +26,15 @@
#ifndef KWIN_H_
#define KWIN_H_
#include <qrect.h>
#include <qobjectdefs.h>
#include <qstring.h>