[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:39:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 289136c40764e78c7d8b56dc92196859c82f8947
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 27 19:11:18 2001 +0000
Changes to get some of khtml/dom files to compile
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQBuffer.h b/WebCore/kwq/KWQBuffer.h
index 3193a7b..489a9b7 100644
--- a/WebCore/kwq/KWQBuffer.h
+++ b/WebCore/kwq/KWQBuffer.h
@@ -26,4 +26,6 @@
#ifndef QBUFFER_H_
#define QBUFFER_H_
+class QBuffer;
+
#endif
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index cc07df6..674ea5c 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -26,4 +26,11 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
+class QColor {
+public:
+ int red() const;
+ int green() const;
+ int blue() const;
+};
+
#endif
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/KWQDateTime.h
index ad572e4..a555917 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/KWQDateTime.h
@@ -26,4 +26,7 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
+class QTime {
+};
+
#endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index de4cd73..f560204 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -26,4 +26,15 @@
#ifndef QOBJECT_H_
#define QOBJECT_H_
+// FIXME: should these macros be in "kwq.h" or other header file?
+#define slots
+#define SLOT(x) x
+#define signals protected
+#define SIGNAL(x) x
+#define emit
+#define Q_OBJECT
+
+class QObject {
+};
+
#endif
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index 4bf8cd4..4523216 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -26,4 +26,6 @@
#ifndef QPIXMAP_H_
#define QPIXMAP_H_
+class QPixmap;
+
#endif
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 989f23a..6acccf2 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -26,4 +26,13 @@
#ifndef QLIST_H_
#define QLIST_H_
+#include <kwq.h>
+
+template <class T> class QList {
+public:
+ uint count() const;
+ T *at(uint);
+ void append(const T *);
+};
+
#endif
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 8f5bec5..6b80e59 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -26,4 +26,7 @@
#ifndef QRECT_H_
#define QRECT_H_
+class QRect {
+};
+
#endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 6330034..b7acef6 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -26,4 +26,40 @@
#ifndef QSTRING_H_
#define QSTRING_H_
+#include <kwq.h>
+#include <string.h>
+
+class QChar {
+public:
+ QChar(char);
+ QChar(const QChar &);
+ QChar lower() const;
+ char latin1() const;
+ bool isDigit();
+ friend inline int operator==(QChar, QChar);
+ friend inline int operator!=(QChar, QChar);
+};
+
+class QString {
+public:
+ QString();
+ int toInt() const;
+ int toInt(bool *) const;
+ bool isNull() const;
+ const QChar *unicode() const;
+ uint length() const;
+
+ static const QString null;
+
+ // FIXME: bogus constructor hack for "conversion from int to non-scalar
+ // type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
+ QString(int);
+};
+
+class QConstString {
+public:
+ QConstString(QChar *, uint);
+ const QString string() const;
+};
+
#endif
diff --git a/WebCore/kwq/KWQStringList.h b/WebCore/kwq/KWQStringList.h
index a56ae78..724ec01 100644
--- a/WebCore/kwq/KWQStringList.h
+++ b/WebCore/kwq/KWQStringList.h
@@ -26,4 +26,7 @@
#ifndef QSTRINGLIST_H_
#define QSTRINGLIST_H_
+class QStringList {
+};
+
#endif
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index eaf88e9..e60c3ad 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -26,4 +26,6 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
+class QTextCodec;
+
#endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index 93e6253..d108e40 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -26,4 +26,7 @@
#ifndef QVALUELIST_H_
#define QVALUELIST_H_
+template <class T> class QValueList {
+};
+
#endif
diff --git a/WebCore/kwq/qt/qbuffer.h b/WebCore/kwq/qt/qbuffer.h
index 3193a7b..489a9b7 100644
--- a/WebCore/kwq/qt/qbuffer.h
+++ b/WebCore/kwq/qt/qbuffer.h
@@ -26,4 +26,6 @@
#ifndef QBUFFER_H_
#define QBUFFER_H_
+class QBuffer;
+
#endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index cc07df6..674ea5c 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -26,4 +26,11 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
+class QColor {
+public:
+ int red() const;
+ int green() const;
+ int blue() const;
+};
+
#endif
diff --git a/WebCore/kwq/qt/qdatetime.h b/WebCore/kwq/qt/qdatetime.h
index ad572e4..a555917 100644
--- a/WebCore/kwq/qt/qdatetime.h
+++ b/WebCore/kwq/qt/qdatetime.h
@@ -26,4 +26,7 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
+class QTime {
+};
+
#endif
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 989f23a..6acccf2 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -26,4 +26,13 @@
#ifndef QLIST_H_
#define QLIST_H_
+#include <kwq.h>
+
+template <class T> class QList {
+public:
+ uint count() const;
+ T *at(uint);
+ void append(const T *);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index de4cd73..f560204 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -26,4 +26,15 @@
#ifndef QOBJECT_H_
#define QOBJECT_H_
+// FIXME: should these macros be in "kwq.h" or other header file?
+#define slots
+#define SLOT(x) x
+#define signals protected
+#define SIGNAL(x) x
+#define emit
+#define Q_OBJECT
+
+class QObject {
+};
+
#endif
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
index 4bf8cd4..4523216 100644
--- a/WebCore/kwq/qt/qpixmap.h
+++ b/WebCore/kwq/qt/qpixmap.h
@@ -26,4 +26,6 @@
#ifndef QPIXMAP_H_
#define QPIXMAP_H_
+class QPixmap;
+
#endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 8f5bec5..6b80e59 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -26,4 +26,7 @@
#ifndef QRECT_H_
#define QRECT_H_
+class QRect {
+};
+
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 6330034..b7acef6 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -26,4 +26,40 @@
#ifndef QSTRING_H_
#define QSTRING_H_
+#include <kwq.h>
+#include <string.h>
+
+class QChar {
+public:
+ QChar(char);
+ QChar(const QChar &);
+ QChar lower() const;
+ char latin1() const;
+ bool isDigit();
+ friend inline int operator==(QChar, QChar);
+ friend inline int operator!=(QChar, QChar);
+};
+
+class QString {
+public:
+ QString();
+ int toInt() const;
+ int toInt(bool *) const;
+ bool isNull() const;
+ const QChar *unicode() const;
+ uint length() const;
+
+ static const QString null;
+
+ // FIXME: bogus constructor hack for "conversion from int to non-scalar
+ // type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
+ QString(int);
+};
+
+class QConstString {
+public:
+ QConstString(QChar *, uint);
+ const QString string() const;
+};
+
#endif
diff --git a/WebCore/kwq/qt/qstringlist.h b/WebCore/kwq/qt/qstringlist.h
index a56ae78..724ec01 100644
--- a/WebCore/kwq/qt/qstringlist.h
+++ b/WebCore/kwq/qt/qstringlist.h
@@ -26,4 +26,7 @@
#ifndef QSTRINGLIST_H_
#define QSTRINGLIST_H_
+class QStringList {
+};
+
#endif
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index eaf88e9..e60c3ad 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -26,4 +26,6 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
+class QTextCodec;
+
#endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index 93e6253..d108e40 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -26,4 +26,7 @@
#ifndef QVALUELIST_H_
#define QVALUELIST_H_
+template <class T> class QValueList {
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qbuffer.h b/WebCore/src/kwq/qt/qbuffer.h
index 3193a7b..489a9b7 100644
--- a/WebCore/src/kwq/qt/qbuffer.h
+++ b/WebCore/src/kwq/qt/qbuffer.h
@@ -26,4 +26,6 @@
#ifndef QBUFFER_H_
#define QBUFFER_H_
+class QBuffer;
+
#endif
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index cc07df6..674ea5c 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -26,4 +26,11 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
+class QColor {
+public:
+ int red() const;
+ int green() const;
+ int blue() const;
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qdatetime.h b/WebCore/src/kwq/qt/qdatetime.h
index ad572e4..a555917 100644
--- a/WebCore/src/kwq/qt/qdatetime.h
+++ b/WebCore/src/kwq/qt/qdatetime.h
@@ -26,4 +26,7 @@
#ifndef QDATETIME_H_
#define QDATETIME_H_
+class QTime {
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 989f23a..6acccf2 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -26,4 +26,13 @@
#ifndef QLIST_H_
#define QLIST_H_
+#include <kwq.h>
+
+template <class T> class QList {
+public:
+ uint count() const;
+ T *at(uint);
+ void append(const T *);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index de4cd73..f560204 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -26,4 +26,15 @@
#ifndef QOBJECT_H_
#define QOBJECT_H_
+// FIXME: should these macros be in "kwq.h" or other header file?
+#define slots
+#define SLOT(x) x
+#define signals protected
+#define SIGNAL(x) x
+#define emit
+#define Q_OBJECT
+
+class QObject {
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qpixmap.h b/WebCore/src/kwq/qt/qpixmap.h
index 4bf8cd4..4523216 100644
--- a/WebCore/src/kwq/qt/qpixmap.h
+++ b/WebCore/src/kwq/qt/qpixmap.h
@@ -26,4 +26,6 @@
#ifndef QPIXMAP_H_
#define QPIXMAP_H_
+class QPixmap;
+
#endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 8f5bec5..6b80e59 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -26,4 +26,7 @@
#ifndef QRECT_H_
#define QRECT_H_
+class QRect {
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 6330034..b7acef6 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -26,4 +26,40 @@
#ifndef QSTRING_H_
#define QSTRING_H_
+#include <kwq.h>
+#include <string.h>
+
+class QChar {
+public:
+ QChar(char);
+ QChar(const QChar &);
+ QChar lower() const;
+ char latin1() const;
+ bool isDigit();
+ friend inline int operator==(QChar, QChar);
+ friend inline int operator!=(QChar, QChar);
+};
+
+class QString {
+public:
+ QString();
+ int toInt() const;
+ int toInt(bool *) const;
+ bool isNull() const;
+ const QChar *unicode() const;
+ uint length() const;
+
+ static const QString null;
+
+ // FIXME: bogus constructor hack for "conversion from int to non-scalar
+ // type" error in "Node::toHTML()" function in "dom/dom_node.cpp"
+ QString(int);
+};
+
+class QConstString {
+public:
+ QConstString(QChar *, uint);
+ const QString string() const;
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qstringlist.h b/WebCore/src/kwq/qt/qstringlist.h
index a56ae78..724ec01 100644
--- a/WebCore/src/kwq/qt/qstringlist.h
+++ b/WebCore/src/kwq/qt/qstringlist.h
@@ -26,4 +26,7 @@
#ifndef QSTRINGLIST_H_
#define QSTRINGLIST_H_
+class QStringList {
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index eaf88e9..e60c3ad 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -26,4 +26,6 @@
#ifndef QTEXTCODEC_H_
#define QTEXTCODEC_H_
+class QTextCodec;
+
#endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index 93e6253..d108e40 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -26,4 +26,7 @@
#ifndef QVALUELIST_H_
#define QVALUELIST_H_
+template <class T> class QValueList {
+};
+
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list