[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:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 839e781688b39a4f8f0598c8b4fa69431b7b8f5d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 28 17:43:10 2001 +0000
Added a bunch of extra declarations, includes, etc. in the process
of getting khtml/dom to compile.
Several new files were added as well.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@26 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQCursor.h
similarity index 96%
copy from WebCore/kwq/KWQKURL.h
copy to WebCore/kwq/KWQCursor.h
index a87579b..ebf8cb5 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQCursor.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KURL_H_
-#define KURL_H_
+#ifndef QCURSOR_H
+#define QCURSOR_H
-class KURL {
+class QCursor {
};
#endif
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQIODevice.h
similarity index 71%
copy from WebCore/kwq/KWQApplication.h
copy to WebCore/kwq/KWQIODevice.h
index e6ff0ed..c63a14e 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQIODevice.h
@@ -23,15 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QAPPLICATION_H_
-#define QAPPLICATION_H_
+#ifndef QIODEVICE_H_
+#define QIODEVICE_H_
-#include "qpalette.h"
-#include "qwidget.h"
-
-class QApplication {
-public:
- static QPalette palette(const QWidget* = 0);
-};
+// constants added to help in compilation of html_document.cpp:184
+#define IO_ReadOnly 0x0001 // readable device
+#define IO_WriteOnly 0x0002 // writable device
+#define IO_ReadWrite 0x0003 // read+write device
+#define IO_Append 0x0004 // append
+#define IO_Truncate 0x0008 // truncate device
+#define IO_Translate 0x0010 // translate CR+LF
+#define IO_ModeMask 0x00ff
#endif
diff --git a/WebCore/kwq/kio/job.h b/WebCore/kwq/KWQKPartsPart.h
similarity index 70%
copy from WebCore/kwq/kio/job.h
copy to WebCore/kwq/KWQKPartsPart.h
index a7267e6..f8a52c0 100644
--- a/WebCore/kwq/kio/job.h
+++ b/WebCore/kwq/KWQKPartsPart.h
@@ -23,15 +23,40 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef JOB_H_
-#define JOB_H_
+#ifndef PART_H_
+#define PART_H_
+
+#include <kurl.h>
// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
+class Job;
+}
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:166
+class QWidget;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:249
+class QVariant;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:552
+class QCursor;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:631
+class QDataStream;
+
+namespace KParts {
-class Job {
+class Part {
};
-}
+class ReadOnlyPart : public Part {
+};
+
+// hack to help in compilation of khtml/khtml_part.h:785
+class GUIActivateEvent {
+};
+
+};
#endif
diff --git a/WebCore/kwq/kio/job.h b/WebCore/kwq/kparts/part.h
similarity index 70%
copy from WebCore/kwq/kio/job.h
copy to WebCore/kwq/kparts/part.h
index a7267e6..f8a52c0 100644
--- a/WebCore/kwq/kio/job.h
+++ b/WebCore/kwq/kparts/part.h
@@ -23,15 +23,40 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef JOB_H_
-#define JOB_H_
+#ifndef PART_H_
+#define PART_H_
+
+#include <kurl.h>
// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
+class Job;
+}
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:166
+class QWidget;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:249
+class QVariant;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:552
+class QCursor;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:631
+class QDataStream;
+
+namespace KParts {
-class Job {
+class Part {
};
-}
+class ReadOnlyPart : public Part {
+};
+
+// hack to help in compilation of khtml/khtml_part.h:785
+class GUIActivateEvent {
+};
+
+};
#endif
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/qt/qcursor.h
similarity index 96%
copy from WebCore/kwq/KWQKURL.h
copy to WebCore/kwq/qt/qcursor.h
index a87579b..ebf8cb5 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/qt/qcursor.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KURL_H_
-#define KURL_H_
+#ifndef QCURSOR_H
+#define QCURSOR_H
-class KURL {
+class QCursor {
};
#endif
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/kwq/qt/qdatastream.h
similarity index 83%
copy from WebCore/kwq/kdecore/kapp.h
copy to WebCore/kwq/qt/qdatastream.h
index 1c25109..9033198 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/kwq/qt/qdatastream.h
@@ -23,20 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KAPP_H_
-#define KAPP_H_
+#ifndef QDATASTREAM_H_
+#define QDATASTREAM_H_
-#include <dcopclient.h>
+#include <qarray.h>
+#include <qiodevice.h>
-#define kapp KApplication::kApplication()
-
-class KApplication {
+class QDataStream {
public:
- static KApplication* kApplication() { return KApp; }
- virtual DCOPClient *dcopClient();
-protected:
- static KApplication *KApp;
-};
+ QDataStream( QByteArray, int mode );
+ virtual ~QDataStream();
+ QDataStream &operator<<( const char *str );
+ QDataStream &operator<<( const QString &str );
+};
#endif
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/qt/qiodevice.h
similarity index 71%
copy from WebCore/kwq/KWQApplication.h
copy to WebCore/kwq/qt/qiodevice.h
index e6ff0ed..c63a14e 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/qt/qiodevice.h
@@ -23,15 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QAPPLICATION_H_
-#define QAPPLICATION_H_
+#ifndef QIODEVICE_H_
+#define QIODEVICE_H_
-#include "qpalette.h"
-#include "qwidget.h"
-
-class QApplication {
-public:
- static QPalette palette(const QWidget* = 0);
-};
+// constants added to help in compilation of html_document.cpp:184
+#define IO_ReadOnly 0x0001 // readable device
+#define IO_WriteOnly 0x0002 // writable device
+#define IO_ReadWrite 0x0003 // read+write device
+#define IO_Append 0x0004 // append
+#define IO_Truncate 0x0008 // truncate device
+#define IO_Translate 0x0010 // translate CR+LF
+#define IO_ModeMask 0x00ff
#endif
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/qt/qobjectdefs.h
similarity index 90%
copy from WebCore/kwq/KWQDateTime.h
copy to WebCore/kwq/qt/qobjectdefs.h
index ca8a604..c8409e8 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/qt/qobjectdefs.h
@@ -23,13 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QDATETIME_H_
-#define QDATETIME_H_
+#ifndef QOBJECTDEFS_H_
+#define QOBJECTDEFS_H_
-class QTime {
-};
+// FIXME: should these macros be in "kwq.h" or other header file?
-class QDateTime {
-};
+#define Q_PROPERTY(text)
#endif
diff --git a/WebCore/kwq/kio/job.h b/WebCore/src/kwq/kparts/part.h
similarity index 70%
copy from WebCore/kwq/kio/job.h
copy to WebCore/src/kwq/kparts/part.h
index a7267e6..f8a52c0 100644
--- a/WebCore/kwq/kio/job.h
+++ b/WebCore/src/kwq/kparts/part.h
@@ -23,15 +23,40 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef JOB_H_
-#define JOB_H_
+#ifndef PART_H_
+#define PART_H_
+
+#include <kurl.h>
// added to help in compilation of khtml/khtml_part.h:867
namespace KIO {
+class Job;
+}
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:166
+class QWidget;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:249
+class QVariant;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:552
+class QCursor;
+
+// forward declaration hack to help in compilation of khtml/khtml_part.h:631
+class QDataStream;
+
+namespace KParts {
-class Job {
+class Part {
};
-}
+class ReadOnlyPart : public Part {
+};
+
+// hack to help in compilation of khtml/khtml_part.h:785
+class GUIActivateEvent {
+};
+
+};
#endif
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/src/kwq/qt/qcursor.h
similarity index 96%
copy from WebCore/kwq/KWQKURL.h
copy to WebCore/src/kwq/qt/qcursor.h
index a87579b..ebf8cb5 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/src/kwq/qt/qcursor.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KURL_H_
-#define KURL_H_
+#ifndef QCURSOR_H
+#define QCURSOR_H
-class KURL {
+class QCursor {
};
#endif
diff --git a/WebCore/kwq/kdecore/kapp.h b/WebCore/src/kwq/qt/qdatastream.h
similarity index 83%
copy from WebCore/kwq/kdecore/kapp.h
copy to WebCore/src/kwq/qt/qdatastream.h
index 1c25109..9033198 100644
--- a/WebCore/kwq/kdecore/kapp.h
+++ b/WebCore/src/kwq/qt/qdatastream.h
@@ -23,20 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KAPP_H_
-#define KAPP_H_
+#ifndef QDATASTREAM_H_
+#define QDATASTREAM_H_
-#include <dcopclient.h>
+#include <qarray.h>
+#include <qiodevice.h>
-#define kapp KApplication::kApplication()
-
-class KApplication {
+class QDataStream {
public:
- static KApplication* kApplication() { return KApp; }
- virtual DCOPClient *dcopClient();
-protected:
- static KApplication *KApp;
-};
+ QDataStream( QByteArray, int mode );
+ virtual ~QDataStream();
+ QDataStream &operator<<( const char *str );
+ QDataStream &operator<<( const QString &str );
+};
#endif
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/src/kwq/qt/qiodevice.h
similarity index 71%
copy from WebCore/kwq/KWQApplication.h
copy to WebCore/src/kwq/qt/qiodevice.h
index e6ff0ed..c63a14e 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/src/kwq/qt/qiodevice.h
@@ -23,15 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QAPPLICATION_H_
-#define QAPPLICATION_H_
+#ifndef QIODEVICE_H_
+#define QIODEVICE_H_
-#include "qpalette.h"
-#include "qwidget.h"
-
-class QApplication {
-public:
- static QPalette palette(const QWidget* = 0);
-};
+// constants added to help in compilation of html_document.cpp:184
+#define IO_ReadOnly 0x0001 // readable device
+#define IO_WriteOnly 0x0002 // writable device
+#define IO_ReadWrite 0x0003 // read+write device
+#define IO_Append 0x0004 // append
+#define IO_Truncate 0x0008 // truncate device
+#define IO_Translate 0x0010 // translate CR+LF
+#define IO_ModeMask 0x00ff
#endif
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/src/kwq/qt/qobjectdefs.h
similarity index 90%
copy from WebCore/kwq/KWQDateTime.h
copy to WebCore/src/kwq/qt/qobjectdefs.h
index ca8a604..c8409e8 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/src/kwq/qt/qobjectdefs.h
@@ -23,13 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QDATETIME_H_
-#define QDATETIME_H_
+#ifndef QOBJECTDEFS_H_
+#define QOBJECTDEFS_H_
-class QTime {
-};
+// FIXME: should these macros be in "kwq.h" or other header file?
-class QDateTime {
-};
+#define Q_PROPERTY(text)
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list