Commit 23918b0e authored by darin's avatar darin

Remove some unused stuff; total of 1000s of lines.

	* Makefile.am: Removed some strange uses of "./" and
	improved stamp-related rules.

	* WebCore-tests.exp: Removed QDir functions.

	* khtml/Makefile.am: Removed java subdirectory.
	* khtml/java/*: Removed.
	* khtml/rendering/render_applet.cpp: Rearrange APPLE_CHANGES so
	that we use our own KJavaAppletWidget rather than a QWidget.
	* kwq/khtml/java/kjavaappletcontext.h: Added.
	* kwq/khtml/java/kjavaappletwidget.h: Added.
	* kwq/KWQKJavaAppletWidget.mm: Added. Replaces WCJavaAppletWidget.mm.
	* kwq/KWQsignals.mm: Removed java-related signals.

	* khtml/css/Makefile.am:
	* khtml/misc/Makefile.am:
	Improve stamp-related rules.

	* khtml/misc/loader.cpp: Move around and add ifdefs so we don't
	need as much KWQ code. Maybe revisit this later -- related to the
	KDE implementation of animated and progressive loading images,
	which we probably don't need, but it may integrate slightly better than
	doing our hacks inside QPixmap.

	* kwq/KWQApplication.mm:
	* kwq/KWQFontInfo.mm:
	* kwq/KWQInputDialog.mm:
	* kwq/KWQKFileDialog.mm:
	* kwq/KWQKHTMLPartBrowserExtension.mm:
	* kwq/KWQKWin.mm:
	* kwq/KWQKWinModule.mm:
	* kwq/KWQKstddirs.mm:
	* kwq/KWQPixmap.mm:
	Simplified, removed unused code, minor tweaks.

	* kwq/Makefile.am: Removed all the old files, added some new ones.
	* kwq/KWQBitmap.mm: Removed.
	* kwq/KWQBrush.mm: Removed.
	* kwq/KWQDCOPClient.mm: Removed.
	* kwq/KWQDataStream.h: Removed.
	* kwq/KWQDir.mm: Removed.
	* kwq/KWQFontDatabase.mm: Removed.
	* kwq/KWQImage.mm: Removed.
	* kwq/KWQKInstance.mm: Removed.
	* kwq/KWQPaintDevice.mm: Removed.
	* kwq/KWQPart.mm: Removed.
	* kwq/KWQasyncimageio.mm: Removed.
	* kwq/KWQasyncio.mm: Removed.
	* kwq/KWQbrowserextension.mm: Removed.
	* kwq/WCJavaAppletWidget.h: Removed.
	* kwq/WCJavaAppletWidget.mm: Removed.
	* kwq/qt/qdatastream.h: Removed.
	* kwq/qt/qdir.h: Removed.
	* kwq/qt/qlayout.h: Removed.

	* kwq/KWQCursor.mm:
	(QCursor::handle): Return the cursor object as an integer rather than
	just returning 0; makes the code that uses handle() more likely to work
	although it introduces a 64-bit cleanliness problem.

	* kwq/KWQEvent.mm: Initialize event type in QEvent subclasses.

	* kwq/WebCoreImageRenderer.h: Added NSObject and NSCopying protocols to
	the WebCoreImageRenderer protocol.

	* kwq/kwqdebug.h: Use displayableString in DEBUG_OBJECT for better logging.

	* kwq/dcop/dcopclient.h:
	* kwq/kdecore/kstddirs.h:
	* kwq/kdecore/kwin.h:
	* kwq/kdecore/kwinmodule.h:
	* kwq/kfile/kfiledialog.h:
	* kwq/kparts/browserextension.h:
	* kwq/kparts/event.h:
	* kwq/qt/qapplication.h:
	* kwq/qt/qasyncimageio.h:
	* kwq/qt/qasyncio.h:
	* kwq/qt/qbitmap.h:
	* kwq/qt/qbrush.h:
	* kwq/qt/qbutton.h:
	* kwq/qt/qcheckbox.h:
	* kwq/qt/qcollection.h:
	* kwq/qt/qcolor.h:
	* kwq/qt/qcombobox.h:
	* kwq/qt/qcursor.h:
	* kwq/qt/qdrawutil.h:
	* kwq/qt/qevent.h:
	* kwq/qt/qfont.h:
	* kwq/qt/qfontdatabase.h:
	* kwq/qt/qfontinfo.h:
	* kwq/qt/qimage.h:
	* kwq/qt/qinputdialog.h:
	* kwq/qt/qintcache.h:
	* kwq/qt/qintdict.h:
	* kwq/qt/qpaintdevice.h:
	* kwq/qt/qpixmap.h:
	* kwq/qt/qstring.h:
	Removed lots of unused stuff, including old conditionals and the like.

	* khtml/khtml_part.cpp:
	(KHTMLPart::khtmlMouseMoveEvent): Add missing parenthesis.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1245 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7413a80a
2002-05-31 Darin Adler <darin@apple.com>
Remove some unused stuff; total of 1000s of lines.
* Makefile.am: Removed some strange uses of "./" and
improved stamp-related rules.
* WebCore-tests.exp: Removed QDir functions.
* khtml/Makefile.am: Removed java subdirectory.
* khtml/java/*: Removed.
* khtml/rendering/render_applet.cpp: Rearrange APPLE_CHANGES so
that we use our own KJavaAppletWidget rather than a QWidget.
* kwq/khtml/java/kjavaappletcontext.h: Added.
* kwq/khtml/java/kjavaappletwidget.h: Added.
* kwq/KWQKJavaAppletWidget.mm: Added. Replaces WCJavaAppletWidget.mm.
* kwq/KWQsignals.mm: Removed java-related signals.
* khtml/css/Makefile.am:
* khtml/misc/Makefile.am:
Improve stamp-related rules.
* khtml/misc/loader.cpp: Move around and add ifdefs so we don't
need as much KWQ code. Maybe revisit this later -- related to the
KDE implementation of animated and progressive loading images,
which we probably don't need, but it may integrate slightly better than
doing our hacks inside QPixmap.
* kwq/KWQApplication.mm:
* kwq/KWQFontInfo.mm:
* kwq/KWQInputDialog.mm:
* kwq/KWQKFileDialog.mm:
* kwq/KWQKHTMLPartBrowserExtension.mm:
* kwq/KWQKWin.mm:
* kwq/KWQKWinModule.mm:
* kwq/KWQKstddirs.mm:
* kwq/KWQPixmap.mm:
Simplified, removed unused code, minor tweaks.
* kwq/Makefile.am: Removed all the old files, added some new ones.
* kwq/KWQBitmap.mm: Removed.
* kwq/KWQBrush.mm: Removed.
* kwq/KWQDCOPClient.mm: Removed.
* kwq/KWQDataStream.h: Removed.
* kwq/KWQDir.mm: Removed.
* kwq/KWQFontDatabase.mm: Removed.
* kwq/KWQImage.mm: Removed.
* kwq/KWQKInstance.mm: Removed.
* kwq/KWQPaintDevice.mm: Removed.
* kwq/KWQPart.mm: Removed.
* kwq/KWQasyncimageio.mm: Removed.
* kwq/KWQasyncio.mm: Removed.
* kwq/KWQbrowserextension.mm: Removed.
* kwq/WCJavaAppletWidget.h: Removed.
* kwq/WCJavaAppletWidget.mm: Removed.
* kwq/qt/qdatastream.h: Removed.
* kwq/qt/qdir.h: Removed.
* kwq/qt/qlayout.h: Removed.
* kwq/KWQCursor.mm:
(QCursor::handle): Return the cursor object as an integer rather than
just returning 0; makes the code that uses handle() more likely to work
although it introduces a 64-bit cleanliness problem.
* kwq/KWQEvent.mm: Initialize event type in QEvent subclasses.
* kwq/WebCoreImageRenderer.h: Added NSObject and NSCopying protocols to
the WebCoreImageRenderer protocol.
* kwq/kwqdebug.h: Use displayableString in DEBUG_OBJECT for better logging.
* kwq/dcop/dcopclient.h:
* kwq/kdecore/kstddirs.h:
* kwq/kdecore/kwin.h:
* kwq/kdecore/kwinmodule.h:
* kwq/kfile/kfiledialog.h:
* kwq/kparts/browserextension.h:
* kwq/kparts/event.h:
* kwq/qt/qapplication.h:
* kwq/qt/qasyncimageio.h:
* kwq/qt/qasyncio.h:
* kwq/qt/qbitmap.h:
* kwq/qt/qbrush.h:
* kwq/qt/qbutton.h:
* kwq/qt/qcheckbox.h:
* kwq/qt/qcollection.h:
* kwq/qt/qcolor.h:
* kwq/qt/qcombobox.h:
* kwq/qt/qcursor.h:
* kwq/qt/qdrawutil.h:
* kwq/qt/qevent.h:
* kwq/qt/qfont.h:
* kwq/qt/qfontdatabase.h:
* kwq/qt/qfontinfo.h:
* kwq/qt/qimage.h:
* kwq/qt/qinputdialog.h:
* kwq/qt/qintcache.h:
* kwq/qt/qintdict.h:
* kwq/qt/qpaintdevice.h:
* kwq/qt/qpixmap.h:
* kwq/qt/qstring.h:
Removed lots of unused stuff, including old conditionals and the like.
* khtml/khtml_part.cpp:
(KHTMLPart::khtmlMouseMoveEvent): Add missing parenthesis.
2002-05-30 Maciej Stachowiak <mjs@apple.com>
WebCore part of fixes for:
......
2002-05-31 Darin Adler <darin@apple.com>
Remove some unused stuff; total of 1000s of lines.
* Makefile.am: Removed some strange uses of "./" and
improved stamp-related rules.
* WebCore-tests.exp: Removed QDir functions.
* khtml/Makefile.am: Removed java subdirectory.
* khtml/java/*: Removed.
* khtml/rendering/render_applet.cpp: Rearrange APPLE_CHANGES so
that we use our own KJavaAppletWidget rather than a QWidget.
* kwq/khtml/java/kjavaappletcontext.h: Added.
* kwq/khtml/java/kjavaappletwidget.h: Added.
* kwq/KWQKJavaAppletWidget.mm: Added. Replaces WCJavaAppletWidget.mm.
* kwq/KWQsignals.mm: Removed java-related signals.
* khtml/css/Makefile.am:
* khtml/misc/Makefile.am:
Improve stamp-related rules.
* khtml/misc/loader.cpp: Move around and add ifdefs so we don't
need as much KWQ code. Maybe revisit this later -- related to the
KDE implementation of animated and progressive loading images,
which we probably don't need, but it may integrate slightly better than
doing our hacks inside QPixmap.
* kwq/KWQApplication.mm:
* kwq/KWQFontInfo.mm:
* kwq/KWQInputDialog.mm:
* kwq/KWQKFileDialog.mm:
* kwq/KWQKHTMLPartBrowserExtension.mm:
* kwq/KWQKWin.mm:
* kwq/KWQKWinModule.mm:
* kwq/KWQKstddirs.mm:
* kwq/KWQPixmap.mm:
Simplified, removed unused code, minor tweaks.
* kwq/Makefile.am: Removed all the old files, added some new ones.
* kwq/KWQBitmap.mm: Removed.
* kwq/KWQBrush.mm: Removed.
* kwq/KWQDCOPClient.mm: Removed.
* kwq/KWQDataStream.h: Removed.
* kwq/KWQDir.mm: Removed.
* kwq/KWQFontDatabase.mm: Removed.
* kwq/KWQImage.mm: Removed.
* kwq/KWQKInstance.mm: Removed.
* kwq/KWQPaintDevice.mm: Removed.
* kwq/KWQPart.mm: Removed.
* kwq/KWQasyncimageio.mm: Removed.
* kwq/KWQasyncio.mm: Removed.
* kwq/KWQbrowserextension.mm: Removed.
* kwq/WCJavaAppletWidget.h: Removed.
* kwq/WCJavaAppletWidget.mm: Removed.
* kwq/qt/qdatastream.h: Removed.
* kwq/qt/qdir.h: Removed.
* kwq/qt/qlayout.h: Removed.
* kwq/KWQCursor.mm:
(QCursor::handle): Return the cursor object as an integer rather than
just returning 0; makes the code that uses handle() more likely to work
although it introduces a 64-bit cleanliness problem.
* kwq/KWQEvent.mm: Initialize event type in QEvent subclasses.
* kwq/WebCoreImageRenderer.h: Added NSObject and NSCopying protocols to
the WebCoreImageRenderer protocol.
* kwq/kwqdebug.h: Use displayableString in DEBUG_OBJECT for better logging.
* kwq/dcop/dcopclient.h:
* kwq/kdecore/kstddirs.h:
* kwq/kdecore/kwin.h:
* kwq/kdecore/kwinmodule.h:
* kwq/kfile/kfiledialog.h:
* kwq/kparts/browserextension.h:
* kwq/kparts/event.h:
* kwq/qt/qapplication.h:
* kwq/qt/qasyncimageio.h:
* kwq/qt/qasyncio.h:
* kwq/qt/qbitmap.h:
* kwq/qt/qbrush.h:
* kwq/qt/qbutton.h:
* kwq/qt/qcheckbox.h:
* kwq/qt/qcollection.h:
* kwq/qt/qcolor.h:
* kwq/qt/qcombobox.h:
* kwq/qt/qcursor.h:
* kwq/qt/qdrawutil.h:
* kwq/qt/qevent.h:
* kwq/qt/qfont.h:
* kwq/qt/qfontdatabase.h:
* kwq/qt/qfontinfo.h:
* kwq/qt/qimage.h:
* kwq/qt/qinputdialog.h:
* kwq/qt/qintcache.h:
* kwq/qt/qintdict.h:
* kwq/qt/qpaintdevice.h:
* kwq/qt/qpixmap.h:
* kwq/qt/qstring.h:
Removed lots of unused stuff, including old conditionals and the like.
* khtml/khtml_part.cpp:
(KHTMLPart::khtmlMouseMoveEvent): Add missing parenthesis.
2002-05-30 Maciej Stachowiak <mjs@apple.com>
WebCore part of fixes for:
......
2002-05-31 Darin Adler <darin@apple.com>
Remove some unused stuff; total of 1000s of lines.
* Makefile.am: Removed some strange uses of "./" and
improved stamp-related rules.
* WebCore-tests.exp: Removed QDir functions.
* khtml/Makefile.am: Removed java subdirectory.
* khtml/java/*: Removed.
* khtml/rendering/render_applet.cpp: Rearrange APPLE_CHANGES so
that we use our own KJavaAppletWidget rather than a QWidget.
* kwq/khtml/java/kjavaappletcontext.h: Added.
* kwq/khtml/java/kjavaappletwidget.h: Added.
* kwq/KWQKJavaAppletWidget.mm: Added. Replaces WCJavaAppletWidget.mm.
* kwq/KWQsignals.mm: Removed java-related signals.
* khtml/css/Makefile.am:
* khtml/misc/Makefile.am:
Improve stamp-related rules.
* khtml/misc/loader.cpp: Move around and add ifdefs so we don't
need as much KWQ code. Maybe revisit this later -- related to the
KDE implementation of animated and progressive loading images,
which we probably don't need, but it may integrate slightly better than
doing our hacks inside QPixmap.
* kwq/KWQApplication.mm:
* kwq/KWQFontInfo.mm:
* kwq/KWQInputDialog.mm:
* kwq/KWQKFileDialog.mm:
* kwq/KWQKHTMLPartBrowserExtension.mm:
* kwq/KWQKWin.mm:
* kwq/KWQKWinModule.mm:
* kwq/KWQKstddirs.mm:
* kwq/KWQPixmap.mm:
Simplified, removed unused code, minor tweaks.
* kwq/Makefile.am: Removed all the old files, added some new ones.
* kwq/KWQBitmap.mm: Removed.
* kwq/KWQBrush.mm: Removed.
* kwq/KWQDCOPClient.mm: Removed.
* kwq/KWQDataStream.h: Removed.
* kwq/KWQDir.mm: Removed.
* kwq/KWQFontDatabase.mm: Removed.
* kwq/KWQImage.mm: Removed.
* kwq/KWQKInstance.mm: Removed.
* kwq/KWQPaintDevice.mm: Removed.
* kwq/KWQPart.mm: Removed.
* kwq/KWQasyncimageio.mm: Removed.
* kwq/KWQasyncio.mm: Removed.
* kwq/KWQbrowserextension.mm: Removed.
* kwq/WCJavaAppletWidget.h: Removed.
* kwq/WCJavaAppletWidget.mm: Removed.
* kwq/qt/qdatastream.h: Removed.
* kwq/qt/qdir.h: Removed.
* kwq/qt/qlayout.h: Removed.
* kwq/KWQCursor.mm:
(QCursor::handle): Return the cursor object as an integer rather than
just returning 0; makes the code that uses handle() more likely to work
although it introduces a 64-bit cleanliness problem.
* kwq/KWQEvent.mm: Initialize event type in QEvent subclasses.
* kwq/WebCoreImageRenderer.h: Added NSObject and NSCopying protocols to
the WebCoreImageRenderer protocol.
* kwq/kwqdebug.h: Use displayableString in DEBUG_OBJECT for better logging.
* kwq/dcop/dcopclient.h:
* kwq/kdecore/kstddirs.h:
* kwq/kdecore/kwin.h:
* kwq/kdecore/kwinmodule.h:
* kwq/kfile/kfiledialog.h:
* kwq/kparts/browserextension.h:
* kwq/kparts/event.h:
* kwq/qt/qapplication.h:
* kwq/qt/qasyncimageio.h:
* kwq/qt/qasyncio.h:
* kwq/qt/qbitmap.h:
* kwq/qt/qbrush.h:
* kwq/qt/qbutton.h:
* kwq/qt/qcheckbox.h:
* kwq/qt/qcollection.h:
* kwq/qt/qcolor.h:
* kwq/qt/qcombobox.h:
* kwq/qt/qcursor.h:
* kwq/qt/qdrawutil.h:
* kwq/qt/qevent.h:
* kwq/qt/qfont.h:
* kwq/qt/qfontdatabase.h:
* kwq/qt/qfontinfo.h:
* kwq/qt/qimage.h:
* kwq/qt/qinputdialog.h:
* kwq/qt/qintcache.h:
* kwq/qt/qintdict.h:
* kwq/qt/qpaintdevice.h:
* kwq/qt/qpixmap.h:
* kwq/qt/qstring.h:
Removed lots of unused stuff, including old conditionals and the like.
* khtml/khtml_part.cpp:
(KHTMLPart::khtmlMouseMoveEvent): Add missing parenthesis.
2002-05-30 Maciej Stachowiak <mjs@apple.com>
WebCore part of fixes for:
......
......@@ -11,8 +11,8 @@ libwebcore_dylib_SOURCES = \
$(NULL)
libwebcore_dylib_LIBADD = \
./khtml/libkhtml.o \
./kwq/libkwq.o \
khtml/libkhtml.o \
kwq/libkwq.o \
$(NULL)
WEBCORE_INSTALL_PATH = $(SYMROOTS)
......@@ -53,8 +53,7 @@ FRAMEWORK_RESOURCE_DIR = $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/Resource
FRAMEWORK_LOCALIZED_RESOURCE_DIR = $(FRAMEWORK_RESOURCE_DIR)/English.lproj
framework-stamp: framework-dylib-stamp framework-resource-stamp framework-header-stamp
$(MAKE) embed && \
touch ./framework-stamp
$(MAKE) embed && touch $@
framework-resource-stamp: $(FRAMEWORK_RESOURCES) $(FRAMEWORK_LOCALIZED_RESOURCES)
rm -rf $(FRAMEWORK_RESOURCE_DIR)
......@@ -70,14 +69,14 @@ framework-resource-stamp: $(FRAMEWORK_RESOURCES) $(FRAMEWORK_LOCALIZED_RESOURCES
echo " $(INSTALL_DATA) $$p $(FRAMEWORK_LOCALIZED_RESOURCE_DIR)/$$p"; \
$(INSTALL_DATA) $$p $(FRAMEWORK_LOCALIZED_RESOURCE_DIR); \
done
touch ./framework-resource-stamp
touch $@
framework-header-stamp:
mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/Headers
mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)/PrivateHeaders
ln -sf Versions/Current/Headers $(FRAMEWORK_DIR)/Headers
ln -sf Versions/Current/PrivateHeaders $(FRAMEWORK_DIR)/PrivateHeaders
touch ./framework-header-stamp
touch $@
framework-dylib-stamp: $(libwebcore_dylib_OBJECTS) $(libwebcore_dylib_DEPENDENCIES) WebCore-combined.exp
mkdir -p $(FRAMEWORK_DIR)/Versions/$(FRAMEWORK_VERSION)
......@@ -86,7 +85,7 @@ framework-dylib-stamp: $(libwebcore_dylib_OBJECTS) $(libwebcore_dylib_DEPENDENCI
$(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(FRAMEWORK_LINKFLAGS) $(libwebcore_dylib_OBJECTS) -o $(FRAMEWORK_DYLIB)
nmedit -s WebCore-combined.exp - $(FRAMEWORK_DYLIB)
ln -sf Versions/Current/$(FRAMEWORK_NAME) $(FRAMEWORK_DIR)/$(FRAMEWORK_NAME)
touch ./framework-dylib-stamp
touch $@
CLEANFILES = $(noinst_DATA)
......
......@@ -121,13 +121,6 @@ __ZN4KURLC1ERK7QStringi
__ZN4KURLC1ERKS_
__ZN4KURLC1ERKS_RK7QString
__ZN4KURLC1Ev
__ZN4QDir4cdUpEv
__ZN4QDir9entryListERK7QString
__ZN4QDirC1ERK7QString
__ZN4QDirC1ERKS_
__ZN4QDirC1Ev
__ZN4QDirD1Ev
__ZN4QDiraSERKS_
__ZN5QDateC1Eiii
__ZN5QDateC1Ev
__ZN5QFile4openEi
......@@ -242,9 +235,6 @@ __ZNK4KURL7hasPathEv
__ZNK4KURL7isEmptyEv
__ZNK4KURL8protocolEv
__ZNK4KURL9prettyURLEi
__ZNK4QDir11absFilePathERK7QString
__ZNK4QDir6existsERK7QString
__ZNK4QDir7absPathEv
__ZNK5QChar16isLetterOrNumberEv
__ZNK5QChar5lowerEv
__ZNK5QChar5upperEv
......
......@@ -6,7 +6,6 @@ SUBDIRS = \
dom \
ecma \
xml \
java \
html \
rendering \
$(NULL)
......@@ -27,7 +26,6 @@ libkhtml_o_LIBADD = \
./dom/libkhtmldom.o \
./ecma/libkhtmlecma.o \
./xml/libkhtmlxml.o \
./java/libkhtmljava.o \
./html/libkhtmlhtml.o \
./rendering/libkhtmlrendering.o \
$(NULL)
......
......@@ -46,14 +46,12 @@ INCLUDES = \
$(VALUEFILES): value-stamp
value-stamp: makevalues cssvalues.in
sh $<
touch $@
sh $< && touch $@
$(PROPFILES): prop-stamp
prop-stamp: makeprop cssproperties.in
sh $<
touch $@
sh $< && touch $@
BUILT_SOURCES = $(VALUEFILES) $(PROPFILES) value-stamp prop-stamp
......
Makefile
Makefile.in
.deps
NULL =
noinst_LIBRARIES = libkhtmljava.o
LDFLAGS = -Wl,-r -nostdlib
libkhtmljava_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
libkhtmljava_o_SOURCES = \
kjavaapplet.cpp \
kjavaapplet.h \
kjavaappletcontext.cpp \
kjavaappletcontext.h \
kjavaappletserver.cpp \
kjavaappletserver.h \
kjavaappletwidget.cpp \
kjavaappletwidget.h \
kjavadownloader.cpp \
kjavadownloader.h \
kjavaprocess.cpp \
kjavaprocess.h \
$(NULL)
INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
/* This file is part of the KDE project
*
* Copyright (C) 2000 Wynn Wilkes <wynnw@caldera.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/****************************************************************************
This is a modified version of QXEmbed from Troll Tech. It's been modified
to work better with java applets.
*****************************************************************************/
#ifndef KJAVAEMBED_H
#define KJAVAEMBED_H
#include <qwidget.h>
#ifdef APPLE_CHANGES
typedef QWidget KJavaEmbed;
#else
#ifndef Q_WS_QWS // FIXME(E)? I don't think this is possible with Qt Embedded.
class KJavaEmbedPrivate;
class KJavaEmbed : public QWidget
{
Q_OBJECT
public:
KJavaEmbed( QWidget *parent=0, const char *name=0, WFlags f = 0 );
~KJavaEmbed();
/**
* Swallows the window with the given Window ID.
*/
void embed( WId w );
/**
* Returns whether or not we have embedded our window
*/
bool embedded() { if( window != 0 ) return true; else return false; }
QSize sizeHint() const;
QSize minimumSizeHint() const;
QSizePolicy sizePolicy() const;
bool eventFilter( QObject *, QEvent * );
protected:
bool event( QEvent * );
void focusInEvent( QFocusEvent * );
void focusOutEvent( QFocusEvent * );
void resizeEvent(QResizeEvent *);
//void showEvent( QShowEvent * );
bool x11Event( XEvent* );
bool focusNextPrevChild( bool next );
private:
WId window;
KJavaEmbedPrivate* d;
};
#endif
#endif
#endif
#include "kjavaappletwidget.h"
#include "kjavaappletcontext.h"
#include <kdebug.h>
class KJavaAppletPrivate
{
friend class KJavaApplet;
private:
bool reallyExists;
QString className;
QString appName;
QString baseURL;
QString codeBase;
QString archives;
QSize size;
QString windowName;
KJavaAppletWidget* UIwidget;
};
KJavaApplet::KJavaApplet( KJavaAppletWidget* _parent,
KJavaAppletContext* _context )
: params()
{
d = new KJavaAppletPrivate;
d->UIwidget = _parent;
if( _context )
context = _context;
else
context = new KJavaAppletContext();
d->reallyExists = false;
id = -1;
}
KJavaApplet::~KJavaApplet()
{
if ( d->reallyExists )
context->destroy( this );
delete d;
}
bool KJavaApplet::isCreated()
{
return d->reallyExists;
}
void KJavaApplet::setAppletClass( const QString& _className )
{
d->className = _className;
}
QString& KJavaApplet::appletClass()
{
return d->className;
}
QString& KJavaApplet::parameter( const QString& name )
{
return params[ name ];
}
void KJavaApplet::setParameter( const QString& name, const QString& value )