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

The following commit has been merged in the debian/unstable branch:
commit 11e0da0ea60fde7d201c4655f21b76ad17a8b171
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 28 17:41:23 2001 +0000

    Added a bunch of extra declarations, includes, etc. in the process
    of getting khtml/dom to compile
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@25 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 0b06d02..145726f 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -26,6 +26,11 @@
 #ifndef QCSTRING_H_
 #define QCSTRING_H_
 
+// added to help in compilation of khtml/khtml_part.h:811
 #include "qarray.h"
 
+// added to help in compilation of khtml/dom/html_documnent.cpp:182
+class QCString {
+};
+
 #endif
diff --git a/WebCore/kwq/KWQDCOPClient.h b/WebCore/kwq/KWQDCOPClient.h
index 00a32be..19878ad 100644
--- a/WebCore/kwq/KWQDCOPClient.h
+++ b/WebCore/kwq/KWQDCOPClient.h
@@ -26,4 +26,14 @@
 #ifndef DCOPCLIENT_H_
 #define DCOPCLIENT_H_
 
+class QCString;
+class QByteArray;
+
+// KApplication needs this
+class DCOPClient {
+public:
+	bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
+		QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
+};
+
 #endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index 7b97d0e..1c18bd0 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -26,4 +26,13 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+// all the following events added to support khtmlview.h 
+class QEvent {};
+class QFocusEvent : public QEvent {};
+class QHideEvent : public QEvent {};
+class QKeyEvent : public QEvent {};
+class QResizeEvent : public QEvent {};
+class QShowEvent : public QEvent {};
+class QWheelEvent : public QEvent {};
+
 #endif
diff --git a/WebCore/kwq/KWQKJob.h b/WebCore/kwq/KWQKJob.h
index d2a9086..a7267e6 100644
--- a/WebCore/kwq/KWQKJob.h
+++ b/WebCore/kwq/KWQKJob.h
@@ -26,4 +26,12 @@
 #ifndef JOB_H_
 #define JOB_H_
 
+// added to help in compilation of khtml/khtml_part.h:867
+namespace KIO {
+
+class Job {
+};
+
+}
+
 #endif
diff --git a/WebCore/kwq/KWQKPartsBrowserExtension.h b/WebCore/kwq/KWQKPartsBrowserExtension.h
index a60025a..c2ba1ee 100644
--- a/WebCore/kwq/KWQKPartsBrowserExtension.h
+++ b/WebCore/kwq/KWQKPartsBrowserExtension.h
@@ -26,4 +26,24 @@
 #ifndef BROWSEREXTENSION_H_
 #define BROWSEREXTENSION_H_
 
+// Added for compilation of khtml/dom/html_document.cpp:184
+#include <qdatastream.h>
+
+// Added for compilation of khtml/khtml_part.h:734
+class QPoint;
+
+// Added for compilation of khtml/khtml_part.h:755
+class QEvent;
+
+namespace KParts {
+
+// Added for compilation of khtml/khtml_part.h:695
+struct URLArgs {
+};
+
+class BrowserExtension {
+};
+
+};
+
 #endif
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index fcbed62..e855ab1 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -26,4 +26,7 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
+template <class K, class T> class QMap {
+};
+
 #endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index f560204..6845bfe 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -26,6 +26,10 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
+// includes added to help in compilation of khtml/khtmlview.h
+#include "qobjectdefs.h"
+#include "qevent.h"
+
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
 #define SLOT(x) x
diff --git a/WebCore/kwq/KWQRegExp.h b/WebCore/kwq/KWQRegExp.h
index e79ff6a..b5f4418 100644
--- a/WebCore/kwq/KWQRegExp.h
+++ b/WebCore/kwq/KWQRegExp.h
@@ -26,4 +26,7 @@
 #ifndef QREGEXP_H_
 #define QREGEXP_H_
 
+class QRegExp {
+};
+
 #endif
diff --git a/WebCore/kwq/dcop/dcopclient.h b/WebCore/kwq/dcop/dcopclient.h
index 00a32be..19878ad 100644
--- a/WebCore/kwq/dcop/dcopclient.h
+++ b/WebCore/kwq/dcop/dcopclient.h
@@ -26,4 +26,14 @@
 #ifndef DCOPCLIENT_H_
 #define DCOPCLIENT_H_
 
+class QCString;
+class QByteArray;
+
+// KApplication needs this
+class DCOPClient {
+public:
+	bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
+		QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
+};
+
 #endif
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/kdecore/kapp.h
index 053a44d..1c25109 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/kwq/kdecore/kapp.h
@@ -26,4 +26,17 @@
 #ifndef KAPP_H_
 #define KAPP_H_
 
+#include <dcopclient.h>
+
+#define kapp KApplication::kApplication()
+
+class KApplication {
+public:
+	static KApplication* kApplication() { return KApp; }
+	virtual DCOPClient *dcopClient();
+protected:
+	static KApplication *KApp;
+};
+
+
 #endif
diff --git a/WebCore/kwq/kio/job.h b/WebCore/kwq/kio/job.h
index d2a9086..a7267e6 100644
--- a/WebCore/kwq/kio/job.h
+++ b/WebCore/kwq/kio/job.h
@@ -26,4 +26,12 @@
 #ifndef JOB_H_
 #define JOB_H_
 
+// added to help in compilation of khtml/khtml_part.h:867
+namespace KIO {
+
+class Job {
+};
+
+}
+
 #endif
diff --git a/WebCore/kwq/kparts/browserextension.h b/WebCore/kwq/kparts/browserextension.h
index a60025a..c2ba1ee 100644
--- a/WebCore/kwq/kparts/browserextension.h
+++ b/WebCore/kwq/kparts/browserextension.h
@@ -26,4 +26,24 @@
 #ifndef BROWSEREXTENSION_H_
 #define BROWSEREXTENSION_H_
 
+// Added for compilation of khtml/dom/html_document.cpp:184
+#include <qdatastream.h>
+
+// Added for compilation of khtml/khtml_part.h:734
+class QPoint;
+
+// Added for compilation of khtml/khtml_part.h:755
+class QEvent;
+
+namespace KParts {
+
+// Added for compilation of khtml/khtml_part.h:695
+struct URLArgs {
+};
+
+class BrowserExtension {
+};
+
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index 0b06d02..145726f 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -26,6 +26,11 @@
 #ifndef QCSTRING_H_
 #define QCSTRING_H_
 
+// added to help in compilation of khtml/khtml_part.h:811
 #include "qarray.h"
 
+// added to help in compilation of khtml/dom/html_documnent.cpp:182
+class QCString {
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index 7b97d0e..1c18bd0 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -26,4 +26,13 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+// all the following events added to support khtmlview.h 
+class QEvent {};
+class QFocusEvent : public QEvent {};
+class QHideEvent : public QEvent {};
+class QKeyEvent : public QEvent {};
+class QResizeEvent : public QEvent {};
+class QShowEvent : public QEvent {};
+class QWheelEvent : public QEvent {};
+
 #endif
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index fcbed62..e855ab1 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -26,4 +26,7 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
+template <class K, class T> class QMap {
+};
+
 #endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index f560204..6845bfe 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -26,6 +26,10 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
+// includes added to help in compilation of khtml/khtmlview.h
+#include "qobjectdefs.h"
+#include "qevent.h"
+
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
 #define SLOT(x) x
diff --git a/WebCore/kwq/qt/qregexp.h b/WebCore/kwq/qt/qregexp.h
index e79ff6a..b5f4418 100644
--- a/WebCore/kwq/qt/qregexp.h
+++ b/WebCore/kwq/qt/qregexp.h
@@ -26,4 +26,7 @@
 #ifndef QREGEXP_H_
 #define QREGEXP_H_
 
+class QRegExp {
+};
+
 #endif
diff --git a/WebCore/src/kwq/dcop/dcopclient.h b/WebCore/src/kwq/dcop/dcopclient.h
index 00a32be..19878ad 100644
--- a/WebCore/src/kwq/dcop/dcopclient.h
+++ b/WebCore/src/kwq/dcop/dcopclient.h
@@ -26,4 +26,14 @@
 #ifndef DCOPCLIENT_H_
 #define DCOPCLIENT_H_
 
+class QCString;
+class QByteArray;
+
+// KApplication needs this
+class DCOPClient {
+public:
+	bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
+		QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
+};
+
 #endif
diff --git a/WebCore/src/kwq/kdecore/kapp.h b/WebCore/src/kwq/kdecore/kapp.h
index 053a44d..1c25109 100644
--- a/WebCore/src/kwq/kdecore/kapp.h
+++ b/WebCore/src/kwq/kdecore/kapp.h
@@ -26,4 +26,17 @@
 #ifndef KAPP_H_
 #define KAPP_H_
 
+#include <dcopclient.h>
+
+#define kapp KApplication::kApplication()
+
+class KApplication {
+public:
+	static KApplication* kApplication() { return KApp; }
+	virtual DCOPClient *dcopClient();
+protected:
+	static KApplication *KApp;
+};
+
+
 #endif
diff --git a/WebCore/src/kwq/kio/job.h b/WebCore/src/kwq/kio/job.h
index d2a9086..a7267e6 100644
--- a/WebCore/src/kwq/kio/job.h
+++ b/WebCore/src/kwq/kio/job.h
@@ -26,4 +26,12 @@
 #ifndef JOB_H_
 #define JOB_H_
 
+// added to help in compilation of khtml/khtml_part.h:867
+namespace KIO {
+
+class Job {
+};
+
+}
+
 #endif
diff --git a/WebCore/src/kwq/kparts/browserextension.h b/WebCore/src/kwq/kparts/browserextension.h
index a60025a..c2ba1ee 100644
--- a/WebCore/src/kwq/kparts/browserextension.h
+++ b/WebCore/src/kwq/kparts/browserextension.h
@@ -26,4 +26,24 @@
 #ifndef BROWSEREXTENSION_H_
 #define BROWSEREXTENSION_H_
 
+// Added for compilation of khtml/dom/html_document.cpp:184
+#include <qdatastream.h>
+
+// Added for compilation of khtml/khtml_part.h:734
+class QPoint;
+
+// Added for compilation of khtml/khtml_part.h:755
+class QEvent;
+
+namespace KParts {
+
+// Added for compilation of khtml/khtml_part.h:695
+struct URLArgs {
+};
+
+class BrowserExtension {
+};
+
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index 0b06d02..145726f 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -26,6 +26,11 @@
 #ifndef QCSTRING_H_
 #define QCSTRING_H_
 
+// added to help in compilation of khtml/khtml_part.h:811
 #include "qarray.h"
 
+// added to help in compilation of khtml/dom/html_documnent.cpp:182
+class QCString {
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index 7b97d0e..1c18bd0 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -26,4 +26,13 @@
 #ifndef QEVENT_H_
 #define QEVENT_H_
 
+// all the following events added to support khtmlview.h 
+class QEvent {};
+class QFocusEvent : public QEvent {};
+class QHideEvent : public QEvent {};
+class QKeyEvent : public QEvent {};
+class QResizeEvent : public QEvent {};
+class QShowEvent : public QEvent {};
+class QWheelEvent : public QEvent {};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index fcbed62..e855ab1 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -26,4 +26,7 @@
 #ifndef QMAP_H_
 #define QMAP_H_
 
+template <class K, class T> class QMap {
+};
+
 #endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index f560204..6845bfe 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -26,6 +26,10 @@
 #ifndef QOBJECT_H_
 #define QOBJECT_H_
 
+// includes added to help in compilation of khtml/khtmlview.h
+#include "qobjectdefs.h"
+#include "qevent.h"
+
 // FIXME: should these macros be in "kwq.h" or other header file?
 #define slots
 #define SLOT(x) x
diff --git a/WebCore/src/kwq/qt/qregexp.h b/WebCore/src/kwq/qt/qregexp.h
index e79ff6a..b5f4418 100644
--- a/WebCore/src/kwq/qt/qregexp.h
+++ b/WebCore/src/kwq/qt/qregexp.h
@@ -26,4 +26,7 @@
 #ifndef QREGEXP_H_
 #define QREGEXP_H_
 
+class QRegExp {
+};
+
 #endif

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list