[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:40:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6d3fa57725e13f5681e29a5a2f19e4d85177d76f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 28 18:21:23 2001 +0000
Another batch of changes for moving forward in khtml/dom
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@29 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQCString.h b/WebCore/kwq/KWQCString.h
index 145726f..ce87693 100644
--- a/WebCore/kwq/KWQCString.h
+++ b/WebCore/kwq/KWQCString.h
@@ -33,4 +33,7 @@
class QCString {
};
+inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
+inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
+
#endif
diff --git a/WebCore/kwq/KWQDCOPClient.h b/WebCore/kwq/KWQDCOPClient.h
index 19878ad..67d9978 100644
--- a/WebCore/kwq/KWQDCOPClient.h
+++ b/WebCore/kwq/KWQDCOPClient.h
@@ -32,8 +32,16 @@ class QByteArray;
// KApplication needs this
class DCOPClient {
public:
+ bool call(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data,
+ QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
+
+ bool send(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data, bool fast=false);
+ bool send(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
+ bool fast=false);
+
+
};
#endif
diff --git a/WebCore/kwq/KWQKDebug.h b/WebCore/kwq/KWQKDebug.h
index 9646045..ac11a99 100644
--- a/WebCore/kwq/KWQKDebug.h
+++ b/WebCore/kwq/KWQKDebug.h
@@ -26,4 +26,26 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
+#include <qstring.h>
+
+class kdbgstream;
+typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
+
+class kdbgstream {
+public:
+ kdbgstream &operator<<(const char *string);
+ kdbgstream &operator<<(const QString& string);
+ kdbgstream &operator<<(const QCString& string);
+ kdbgstream &operator<<(KDBGFUNC f);
+};
+
+inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
+
+kdbgstream kdWarning(int area = 0);
+kdbgstream kdWarning(bool cond, int area = 0);
+kdbgstream kdError(int area = 0);
+kdbgstream kdError(bool cond, int area = 0);
+kdbgstream kdFatal(int area = 0);
+kdbgstream kdFatal(bool cond, int area = 0);
+
#endif
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index e5a3007..058ee85 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -26,7 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
-class QScrollView {
+#include "qwidget.h"
+
+class QScrollView : public QWidget {
typedef int ScrollBarMode;
};
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index f2b91d1..505aea5 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -47,6 +47,7 @@ class QString {
public:
QString();
QString(const QChar *, uint);
+ QString(const char *s);
int toInt() const;
int toInt(bool *) const;
bool isNull() const;
@@ -58,6 +59,11 @@ public:
bool isEmpty() const;
int contains(const char *) const;
+ QString &append(const char *s);
+ QString &append(const QString &s);
+
+ QCString utf8() const;
+
static const QString null;
// FIXME: bogus constructor hack for "conversion from int to non-scalar
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index e65da34..ffd761e 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -27,6 +27,8 @@
#define QWIDGET_H_
class QWidget {
+public:
+ int winId() const;
};
#endif
diff --git a/WebCore/kwq/dcop/dcopclient.h b/WebCore/kwq/dcop/dcopclient.h
index 19878ad..67d9978 100644
--- a/WebCore/kwq/dcop/dcopclient.h
+++ b/WebCore/kwq/dcop/dcopclient.h
@@ -32,8 +32,16 @@ class QByteArray;
// KApplication needs this
class DCOPClient {
public:
+ bool call(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data,
+ QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
+
+ bool send(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data, bool fast=false);
+ bool send(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
+ bool fast=false);
+
+
};
#endif
diff --git a/WebCore/kwq/kdecore/kdebug.h b/WebCore/kwq/kdecore/kdebug.h
index 9646045..ac11a99 100644
--- a/WebCore/kwq/kdecore/kdebug.h
+++ b/WebCore/kwq/kdecore/kdebug.h
@@ -26,4 +26,26 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
+#include <qstring.h>
+
+class kdbgstream;
+typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
+
+class kdbgstream {
+public:
+ kdbgstream &operator<<(const char *string);
+ kdbgstream &operator<<(const QString& string);
+ kdbgstream &operator<<(const QCString& string);
+ kdbgstream &operator<<(KDBGFUNC f);
+};
+
+inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
+
+kdbgstream kdWarning(int area = 0);
+kdbgstream kdWarning(bool cond, int area = 0);
+kdbgstream kdError(int area = 0);
+kdbgstream kdError(bool cond, int area = 0);
+kdbgstream kdFatal(int area = 0);
+kdbgstream kdFatal(bool cond, int area = 0);
+
#endif
diff --git a/WebCore/kwq/qt/qcstring.h b/WebCore/kwq/qt/qcstring.h
index 145726f..ce87693 100644
--- a/WebCore/kwq/qt/qcstring.h
+++ b/WebCore/kwq/qt/qcstring.h
@@ -33,4 +33,7 @@
class QCString {
};
+inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
+inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
+
#endif
diff --git a/WebCore/kwq/qt/qdatastream.h b/WebCore/kwq/qt/qdatastream.h
index 9033198..831fc4a 100644
--- a/WebCore/kwq/qt/qdatastream.h
+++ b/WebCore/kwq/qt/qdatastream.h
@@ -36,6 +36,8 @@ public:
QDataStream &operator<<( const char *str );
QDataStream &operator<<( const QString &str );
+ QDataStream &operator<<( const QCString &str );
+ QDataStream &operator>>( const QString &str );
};
#endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index e5a3007..058ee85 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -26,7 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
-class QScrollView {
+#include "qwidget.h"
+
+class QScrollView : public QWidget {
typedef int ScrollBarMode;
};
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index f2b91d1..505aea5 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -47,6 +47,7 @@ class QString {
public:
QString();
QString(const QChar *, uint);
+ QString(const char *s);
int toInt() const;
int toInt(bool *) const;
bool isNull() const;
@@ -58,6 +59,11 @@ public:
bool isEmpty() const;
int contains(const char *) const;
+ QString &append(const char *s);
+ QString &append(const QString &s);
+
+ QCString utf8() const;
+
static const QString null;
// FIXME: bogus constructor hack for "conversion from int to non-scalar
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index e65da34..ffd761e 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -27,6 +27,8 @@
#define QWIDGET_H_
class QWidget {
+public:
+ int winId() const;
};
#endif
diff --git a/WebCore/src/kwq/dcop/dcopclient.h b/WebCore/src/kwq/dcop/dcopclient.h
index 19878ad..67d9978 100644
--- a/WebCore/src/kwq/dcop/dcopclient.h
+++ b/WebCore/src/kwq/dcop/dcopclient.h
@@ -32,8 +32,16 @@ class QByteArray;
// KApplication needs this
class DCOPClient {
public:
+ bool call(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data,
+ QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
+
+ bool send(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data, bool fast=false);
+ bool send(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
+ bool fast=false);
+
+
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kdebug.h b/WebCore/src/kwq/kdecore/kdebug.h
index 9646045..ac11a99 100644
--- a/WebCore/src/kwq/kdecore/kdebug.h
+++ b/WebCore/src/kwq/kdecore/kdebug.h
@@ -26,4 +26,26 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
+#include <qstring.h>
+
+class kdbgstream;
+typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
+
+class kdbgstream {
+public:
+ kdbgstream &operator<<(const char *string);
+ kdbgstream &operator<<(const QString& string);
+ kdbgstream &operator<<(const QCString& string);
+ kdbgstream &operator<<(KDBGFUNC f);
+};
+
+inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
+
+kdbgstream kdWarning(int area = 0);
+kdbgstream kdWarning(bool cond, int area = 0);
+kdbgstream kdError(int area = 0);
+kdbgstream kdError(bool cond, int area = 0);
+kdbgstream kdFatal(int area = 0);
+kdbgstream kdFatal(bool cond, int area = 0);
+
#endif
diff --git a/WebCore/src/kwq/qt/qcstring.h b/WebCore/src/kwq/qt/qcstring.h
index 145726f..ce87693 100644
--- a/WebCore/src/kwq/qt/qcstring.h
+++ b/WebCore/src/kwq/qt/qcstring.h
@@ -33,4 +33,7 @@
class QCString {
};
+inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
+inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
+
#endif
diff --git a/WebCore/src/kwq/qt/qdatastream.h b/WebCore/src/kwq/qt/qdatastream.h
index 9033198..831fc4a 100644
--- a/WebCore/src/kwq/qt/qdatastream.h
+++ b/WebCore/src/kwq/qt/qdatastream.h
@@ -36,6 +36,8 @@ public:
QDataStream &operator<<( const char *str );
QDataStream &operator<<( const QString &str );
+ QDataStream &operator<<( const QCString &str );
+ QDataStream &operator>>( const QString &str );
};
#endif
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index e5a3007..058ee85 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -26,7 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
-class QScrollView {
+#include "qwidget.h"
+
+class QScrollView : public QWidget {
typedef int ScrollBarMode;
};
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index f2b91d1..505aea5 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -47,6 +47,7 @@ class QString {
public:
QString();
QString(const QChar *, uint);
+ QString(const char *s);
int toInt() const;
int toInt(bool *) const;
bool isNull() const;
@@ -58,6 +59,11 @@ public:
bool isEmpty() const;
int contains(const char *) const;
+ QString &append(const char *s);
+ QString &append(const QString &s);
+
+ QCString utf8() const;
+
static const QString null;
// FIXME: bogus constructor hack for "conversion from int to non-scalar
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index e65da34..ffd761e 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -27,6 +27,8 @@
#define QWIDGET_H_
class QWidget {
+public:
+ int winId() const;
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list