[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:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6ce2434e06dc7c143ae9a7411000b826e688c9bf
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 30 00:04:54 2001 +0000
In process of working on khtml/ecma....
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index f12533f..c8aa841 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -26,12 +26,13 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include "qpalette.h"
-#include "qwidget.h"
+class QPalette;
+class QWidget;
class QApplication {
public:
static QPalette palette(const QWidget* = 0);
+ static QWidget *desktop();
};
#endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index 2a2099f..c7bdad9 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -55,6 +55,7 @@ class QHideEvent : public QEvent {};
class QKeyEvent : public QEvent {};
class QResizeEvent : public QEvent {};
class QShowEvent : public QEvent {};
+class QTimerEvent : public QEvent {};
class QWheelEvent : public QEvent {};
#endif
diff --git a/WebCore/kwq/KWQGuardedPtr.h b/WebCore/kwq/KWQGuardedPtr.h
index 6f47367..4a5938d 100644
--- a/WebCore/kwq/KWQGuardedPtr.h
+++ b/WebCore/kwq/KWQGuardedPtr.h
@@ -26,4 +26,18 @@
#ifndef QGUARDEDPTR_H_
#define QGUARDEDPTR_H_
+#include "qobject.h"
+
+template <class T> class QGuardedPtr {
+public:
+ QGuardedPtr();
+ QGuardedPtr(T* o);
+ QGuardedPtr(const QGuardedPtr<T> &p);
+
+ bool isNull() const;
+
+ operator T*() const;
+ T* operator->() const;
+};
+
#endif
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index e855ab1..d954022 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -27,6 +27,9 @@
#define QMAP_H_
template <class K, class T> class QMap {
+public:
+ void remove(const K&);
+ void clear();
};
#endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index 90d9e78..9c4d172 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -40,6 +40,10 @@
#define connect(arg1,arg2,arg3,arg4)
class QObject {
+public:
+ QObject(QObject *parent=0, const char *name=0);
+ const char *name() const;
+ virtual void setName(const char *);
};
#endif
diff --git a/WebCore/kwq/KWQPaintDeviceMetrics.h b/WebCore/kwq/KWQPaintDeviceMetrics.h
index 3650453..d61dbd9 100644
--- a/WebCore/kwq/KWQPaintDeviceMetrics.h
+++ b/WebCore/kwq/KWQPaintDeviceMetrics.h
@@ -32,6 +32,7 @@ class QPaintDeviceMetrics {
public:
QPaintDeviceMetrics(const QPaintDevice *);
int logicalDpiY() const;
+ int depth() const;
};
#endif
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 338e962..2faba76 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -26,4 +26,7 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+class QPainter {
+};
+
#endif
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index cd616b6..6d17d38 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -26,4 +26,16 @@
#ifndef QPOINT_H_
#define QPOINT_H_
+class QPoint {
+public:
+ QPoint();
+ QPoint(int,int);
+ QPoint(const QPoint &);
+
+ int x() const;
+ int y() const;
+
+ friend inline QPoint operator+(const QPoint &, const QPoint &);
+};
+
#endif
diff --git a/WebCore/kwq/KWQPtrDict.h b/WebCore/kwq/KWQPtrDict.h
index fc1bca7..241d8d8 100644
--- a/WebCore/kwq/KWQPtrDict.h
+++ b/WebCore/kwq/KWQPtrDict.h
@@ -26,11 +26,17 @@
#ifndef QPTRDICT_H_
#define QPTRDICT_H_
+#include <kwq.h>
+
template <class T> class QPtrDict {
public:
+ QPtrDict(int size=13);
uint count() const;
T *at(uint);
void append(const T *);
+ void insert(void *, const T *);
+ void remove(void *);
+ T *operator[](void *) const;
};
#endif
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 83fd621..903ed06 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -31,6 +31,9 @@ public:
QRect();
QRect(int l, int t, int w, int h);
+ int left() const;
+ int top() const;
+ int width() const;
int height() const;
};
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index d97ae3d..2e5f285 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -29,7 +29,12 @@
#include "qwidget.h"
class QScrollView : public QWidget {
+public:
typedef int ScrollBarMode;
+ int visibleWidth() const;
+ int visibleHeight() const;
+ int contentsX() const;
+ int contentsY() const;
};
#endif
diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 10ab628..002fd23 100644
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -27,6 +27,14 @@
#define QSIZE_H_
class QSize {
+public:
+ QSize();
+ QSize(int,int);
+
+ int width() const;
+ int height() const;
+
+ friend inline QSize operator+(const QSize &, const QSize &);
};
#endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index c452e53..a330f45 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -73,6 +73,7 @@ public:
QString(const char *s);
int toInt() const;
int toInt(bool *) const;
+ uint toUInt(bool *ok=0, int base=10) const;
bool isNull() const;
const QChar *unicode() const;
bool contains(const char *s, bool b) const;
@@ -91,6 +92,7 @@ public:
QString left(uint len) const;
QString &remove(uint index, uint len);
QString &replace(const QRegExp &, const QString &);
+ QString &insert(uint, char);
void truncate(uint pos);
QString arg(const QString& a, int fieldwidth=0) const;
@@ -110,10 +112,12 @@ public:
QString &operator+=(QChar);
QString &operator+=(const QString &);
+ QString &prepend(const QString &);
QString &append(const char *);
QString &append(const QString &);
QCString utf8() const;
+ QCString local8Bit() const;
static const QString null;
diff --git a/WebCore/kwq/KWQTimer.h b/WebCore/kwq/KWQTimer.h
index 5ed1421..aa069b9 100644
--- a/WebCore/kwq/KWQTimer.h
+++ b/WebCore/kwq/KWQTimer.h
@@ -26,4 +26,11 @@
#ifndef QTIMER_H_
#define QTIMER_H_
+#include "qobject.h"
+
+class QTimer : public QObject {
+public:
+ static void singleShot(int msec, QObject *receiver, const char *member);
+};
+
#endif
diff --git a/WebCore/kwq/KWQValueList.h b/WebCore/kwq/KWQValueList.h
index c91a737..b09b079 100644
--- a/WebCore/kwq/KWQValueList.h
+++ b/WebCore/kwq/KWQValueList.h
@@ -35,7 +35,10 @@ public:
template<class T> class QValueListConstIterator {
public:
+ QValueListConstIterator();
+ QValueListConstIterator(const QValueListIterator<T>& it);
QValueListConstIterator operator++();
+ QValueListConstIterator operator++(int);
bool operator!=(const QValueListConstIterator<T>& it);
T& operator*();
};
diff --git a/WebCore/kwq/KWQVariant.h b/WebCore/kwq/KWQVariant.h
index d4ebd51..f9208c3 100644
--- a/WebCore/kwq/KWQVariant.h
+++ b/WebCore/kwq/KWQVariant.h
@@ -26,7 +26,21 @@
#ifndef QVARIANT_H_
#define QVARIANT_H_
+class QString;
+
class QVariant {
+public:
+ enum Type {
+ Bool
+ };
+
+ QVariant();
+ QVariant(bool, int);
+ QVariant(double);
+ QVariant(const QString&);
+
+ Type type() const;
+ bool toBool() const;
};
#endif
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 3796845..535790a 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -27,10 +27,24 @@
#define QWIDGET_H_
#include "qpaintdevice.h"
+#include "qpoint.h"
+#include "qsize.h"
+#include "qobject.h"
-class QWidget : public QPaintDevice {
+class QWidget : public QObject, public QPaintDevice {
public:
int winId() const;
+ int x() const;
+ int y() const;
+ int width() const;
+ int height() const;
+ QSize size() const;
+ void resize(const QSize &);
+ QPoint pos() const;
+ virtual void move(const QPoint&);
+ void move(int, int);
+ QWidget *topLevelWidget() const;
+ QPoint mapToGlobal(const QPoint &) const;
};
#endif
diff --git a/WebCore/kwq/qt/qapplication.h b/WebCore/kwq/qt/qapplication.h
index f12533f..c8aa841 100644
--- a/WebCore/kwq/qt/qapplication.h
+++ b/WebCore/kwq/qt/qapplication.h
@@ -26,12 +26,13 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include "qpalette.h"
-#include "qwidget.h"
+class QPalette;
+class QWidget;
class QApplication {
public:
static QPalette palette(const QWidget* = 0);
+ static QWidget *desktop();
};
#endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index 2a2099f..c7bdad9 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -55,6 +55,7 @@ class QHideEvent : public QEvent {};
class QKeyEvent : public QEvent {};
class QResizeEvent : public QEvent {};
class QShowEvent : public QEvent {};
+class QTimerEvent : public QEvent {};
class QWheelEvent : public QEvent {};
#endif
diff --git a/WebCore/kwq/qt/qguardedptr.h b/WebCore/kwq/qt/qguardedptr.h
index 6f47367..4a5938d 100644
--- a/WebCore/kwq/qt/qguardedptr.h
+++ b/WebCore/kwq/qt/qguardedptr.h
@@ -26,4 +26,18 @@
#ifndef QGUARDEDPTR_H_
#define QGUARDEDPTR_H_
+#include "qobject.h"
+
+template <class T> class QGuardedPtr {
+public:
+ QGuardedPtr();
+ QGuardedPtr(T* o);
+ QGuardedPtr(const QGuardedPtr<T> &p);
+
+ bool isNull() const;
+
+ operator T*() const;
+ T* operator->() const;
+};
+
#endif
diff --git a/WebCore/kwq/qt/qinputdialog.h b/WebCore/kwq/qt/qinputdialog.h
index a03a91c..d7c5140 100644
--- a/WebCore/kwq/qt/qinputdialog.h
+++ b/WebCore/kwq/qt/qinputdialog.h
@@ -26,4 +26,13 @@
#ifndef QINPUTDIALOG_H_
#define QINPUTDIALOG_H_
+#include "qstring.h"
+class QWidget;
+
+class QInputDialog {
+public:
+ static QString getText( const QString &caption, const QString &label, const QString &text = QString::null,
+ bool *ok = 0, QWidget *parent = 0, const char *name = 0 );
+};
+
#endif
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index e855ab1..d954022 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -27,6 +27,9 @@
#define QMAP_H_
template <class K, class T> class QMap {
+public:
+ void remove(const K&);
+ void clear();
};
#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index 90d9e78..9c4d172 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -40,6 +40,10 @@
#define connect(arg1,arg2,arg3,arg4)
class QObject {
+public:
+ QObject(QObject *parent=0, const char *name=0);
+ const char *name() const;
+ virtual void setName(const char *);
};
#endif
diff --git a/WebCore/kwq/qt/qpaintdevicemetrics.h b/WebCore/kwq/qt/qpaintdevicemetrics.h
index 3650453..d61dbd9 100644
--- a/WebCore/kwq/qt/qpaintdevicemetrics.h
+++ b/WebCore/kwq/qt/qpaintdevicemetrics.h
@@ -32,6 +32,7 @@ class QPaintDeviceMetrics {
public:
QPaintDeviceMetrics(const QPaintDevice *);
int logicalDpiY() const;
+ int depth() const;
};
#endif
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index 338e962..2faba76 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -26,4 +26,7 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+class QPainter {
+};
+
#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index cd616b6..6d17d38 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -26,4 +26,16 @@
#ifndef QPOINT_H_
#define QPOINT_H_
+class QPoint {
+public:
+ QPoint();
+ QPoint(int,int);
+ QPoint(const QPoint &);
+
+ int x() const;
+ int y() const;
+
+ friend inline QPoint operator+(const QPoint &, const QPoint &);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qptrdict.h b/WebCore/kwq/qt/qptrdict.h
index fc1bca7..241d8d8 100644
--- a/WebCore/kwq/qt/qptrdict.h
+++ b/WebCore/kwq/qt/qptrdict.h
@@ -26,11 +26,17 @@
#ifndef QPTRDICT_H_
#define QPTRDICT_H_
+#include <kwq.h>
+
template <class T> class QPtrDict {
public:
+ QPtrDict(int size=13);
uint count() const;
T *at(uint);
void append(const T *);
+ void insert(void *, const T *);
+ void remove(void *);
+ T *operator[](void *) const;
};
#endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 83fd621..903ed06 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -31,6 +31,9 @@ public:
QRect();
QRect(int l, int t, int w, int h);
+ int left() const;
+ int top() const;
+ int width() const;
int height() const;
};
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index d97ae3d..2e5f285 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -29,7 +29,12 @@
#include "qwidget.h"
class QScrollView : public QWidget {
+public:
typedef int ScrollBarMode;
+ int visibleWidth() const;
+ int visibleHeight() const;
+ int contentsX() const;
+ int contentsY() const;
};
#endif
diff --git a/WebCore/kwq/qt/qsize.h b/WebCore/kwq/qt/qsize.h
index 10ab628..002fd23 100644
--- a/WebCore/kwq/qt/qsize.h
+++ b/WebCore/kwq/qt/qsize.h
@@ -27,6 +27,14 @@
#define QSIZE_H_
class QSize {
+public:
+ QSize();
+ QSize(int,int);
+
+ int width() const;
+ int height() const;
+
+ friend inline QSize operator+(const QSize &, const QSize &);
};
#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index c452e53..a330f45 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -73,6 +73,7 @@ public:
QString(const char *s);
int toInt() const;
int toInt(bool *) const;
+ uint toUInt(bool *ok=0, int base=10) const;
bool isNull() const;
const QChar *unicode() const;
bool contains(const char *s, bool b) const;
@@ -91,6 +92,7 @@ public:
QString left(uint len) const;
QString &remove(uint index, uint len);
QString &replace(const QRegExp &, const QString &);
+ QString &insert(uint, char);
void truncate(uint pos);
QString arg(const QString& a, int fieldwidth=0) const;
@@ -110,10 +112,12 @@ public:
QString &operator+=(QChar);
QString &operator+=(const QString &);
+ QString &prepend(const QString &);
QString &append(const char *);
QString &append(const QString &);
QCString utf8() const;
+ QCString local8Bit() const;
static const QString null;
diff --git a/WebCore/kwq/qt/qtimer.h b/WebCore/kwq/qt/qtimer.h
index 5ed1421..aa069b9 100644
--- a/WebCore/kwq/qt/qtimer.h
+++ b/WebCore/kwq/qt/qtimer.h
@@ -26,4 +26,11 @@
#ifndef QTIMER_H_
#define QTIMER_H_
+#include "qobject.h"
+
+class QTimer : public QObject {
+public:
+ static void singleShot(int msec, QObject *receiver, const char *member);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qvaluelist.h b/WebCore/kwq/qt/qvaluelist.h
index c91a737..b09b079 100644
--- a/WebCore/kwq/qt/qvaluelist.h
+++ b/WebCore/kwq/qt/qvaluelist.h
@@ -35,7 +35,10 @@ public:
template<class T> class QValueListConstIterator {
public:
+ QValueListConstIterator();
+ QValueListConstIterator(const QValueListIterator<T>& it);
QValueListConstIterator operator++();
+ QValueListConstIterator operator++(int);
bool operator!=(const QValueListConstIterator<T>& it);
T& operator*();
};
diff --git a/WebCore/kwq/qt/qvariant.h b/WebCore/kwq/qt/qvariant.h
index d4ebd51..f9208c3 100644
--- a/WebCore/kwq/qt/qvariant.h
+++ b/WebCore/kwq/qt/qvariant.h
@@ -26,7 +26,21 @@
#ifndef QVARIANT_H_
#define QVARIANT_H_
+class QString;
+
class QVariant {
+public:
+ enum Type {
+ Bool
+ };
+
+ QVariant();
+ QVariant(bool, int);
+ QVariant(double);
+ QVariant(const QString&);
+
+ Type type() const;
+ bool toBool() const;
};
#endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 3796845..535790a 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -27,10 +27,24 @@
#define QWIDGET_H_
#include "qpaintdevice.h"
+#include "qpoint.h"
+#include "qsize.h"
+#include "qobject.h"
-class QWidget : public QPaintDevice {
+class QWidget : public QObject, public QPaintDevice {
public:
int winId() const;
+ int x() const;
+ int y() const;
+ int width() const;
+ int height() const;
+ QSize size() const;
+ void resize(const QSize &);
+ QPoint pos() const;
+ virtual void move(const QPoint&);
+ void move(int, int);
+ QWidget *topLevelWidget() const;
+ QPoint mapToGlobal(const QPoint &) const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qapplication.h b/WebCore/src/kwq/qt/qapplication.h
index f12533f..c8aa841 100644
--- a/WebCore/src/kwq/qt/qapplication.h
+++ b/WebCore/src/kwq/qt/qapplication.h
@@ -26,12 +26,13 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-#include "qpalette.h"
-#include "qwidget.h"
+class QPalette;
+class QWidget;
class QApplication {
public:
static QPalette palette(const QWidget* = 0);
+ static QWidget *desktop();
};
#endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index 2a2099f..c7bdad9 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -55,6 +55,7 @@ class QHideEvent : public QEvent {};
class QKeyEvent : public QEvent {};
class QResizeEvent : public QEvent {};
class QShowEvent : public QEvent {};
+class QTimerEvent : public QEvent {};
class QWheelEvent : public QEvent {};
#endif
diff --git a/WebCore/src/kwq/qt/qguardedptr.h b/WebCore/src/kwq/qt/qguardedptr.h
index 6f47367..4a5938d 100644
--- a/WebCore/src/kwq/qt/qguardedptr.h
+++ b/WebCore/src/kwq/qt/qguardedptr.h
@@ -26,4 +26,18 @@
#ifndef QGUARDEDPTR_H_
#define QGUARDEDPTR_H_
+#include "qobject.h"
+
+template <class T> class QGuardedPtr {
+public:
+ QGuardedPtr();
+ QGuardedPtr(T* o);
+ QGuardedPtr(const QGuardedPtr<T> &p);
+
+ bool isNull() const;
+
+ operator T*() const;
+ T* operator->() const;
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qinputdialog.h b/WebCore/src/kwq/qt/qinputdialog.h
index a03a91c..d7c5140 100644
--- a/WebCore/src/kwq/qt/qinputdialog.h
+++ b/WebCore/src/kwq/qt/qinputdialog.h
@@ -26,4 +26,13 @@
#ifndef QINPUTDIALOG_H_
#define QINPUTDIALOG_H_
+#include "qstring.h"
+class QWidget;
+
+class QInputDialog {
+public:
+ static QString getText( const QString &caption, const QString &label, const QString &text = QString::null,
+ bool *ok = 0, QWidget *parent = 0, const char *name = 0 );
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index e855ab1..d954022 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -27,6 +27,9 @@
#define QMAP_H_
template <class K, class T> class QMap {
+public:
+ void remove(const K&);
+ void clear();
};
#endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index 90d9e78..9c4d172 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -40,6 +40,10 @@
#define connect(arg1,arg2,arg3,arg4)
class QObject {
+public:
+ QObject(QObject *parent=0, const char *name=0);
+ const char *name() const;
+ virtual void setName(const char *);
};
#endif
diff --git a/WebCore/src/kwq/qt/qpaintdevicemetrics.h b/WebCore/src/kwq/qt/qpaintdevicemetrics.h
index 3650453..d61dbd9 100644
--- a/WebCore/src/kwq/qt/qpaintdevicemetrics.h
+++ b/WebCore/src/kwq/qt/qpaintdevicemetrics.h
@@ -32,6 +32,7 @@ class QPaintDeviceMetrics {
public:
QPaintDeviceMetrics(const QPaintDevice *);
int logicalDpiY() const;
+ int depth() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index 338e962..2faba76 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -26,4 +26,7 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+class QPainter {
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index cd616b6..6d17d38 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -26,4 +26,16 @@
#ifndef QPOINT_H_
#define QPOINT_H_
+class QPoint {
+public:
+ QPoint();
+ QPoint(int,int);
+ QPoint(const QPoint &);
+
+ int x() const;
+ int y() const;
+
+ friend inline QPoint operator+(const QPoint &, const QPoint &);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qptrdict.h b/WebCore/src/kwq/qt/qptrdict.h
index fc1bca7..241d8d8 100644
--- a/WebCore/src/kwq/qt/qptrdict.h
+++ b/WebCore/src/kwq/qt/qptrdict.h
@@ -26,11 +26,17 @@
#ifndef QPTRDICT_H_
#define QPTRDICT_H_
+#include <kwq.h>
+
template <class T> class QPtrDict {
public:
+ QPtrDict(int size=13);
uint count() const;
T *at(uint);
void append(const T *);
+ void insert(void *, const T *);
+ void remove(void *);
+ T *operator[](void *) const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 83fd621..903ed06 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -31,6 +31,9 @@ public:
QRect();
QRect(int l, int t, int w, int h);
+ int left() const;
+ int top() const;
+ int width() const;
int height() const;
};
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index d97ae3d..2e5f285 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -29,7 +29,12 @@
#include "qwidget.h"
class QScrollView : public QWidget {
+public:
typedef int ScrollBarMode;
+ int visibleWidth() const;
+ int visibleHeight() const;
+ int contentsX() const;
+ int contentsY() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/src/kwq/qt/qsize.h
index 10ab628..002fd23 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/src/kwq/qt/qsize.h
@@ -27,6 +27,14 @@
#define QSIZE_H_
class QSize {
+public:
+ QSize();
+ QSize(int,int);
+
+ int width() const;
+ int height() const;
+
+ friend inline QSize operator+(const QSize &, const QSize &);
};
#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index c452e53..a330f45 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -73,6 +73,7 @@ public:
QString(const char *s);
int toInt() const;
int toInt(bool *) const;
+ uint toUInt(bool *ok=0, int base=10) const;
bool isNull() const;
const QChar *unicode() const;
bool contains(const char *s, bool b) const;
@@ -91,6 +92,7 @@ public:
QString left(uint len) const;
QString &remove(uint index, uint len);
QString &replace(const QRegExp &, const QString &);
+ QString &insert(uint, char);
void truncate(uint pos);
QString arg(const QString& a, int fieldwidth=0) const;
@@ -110,10 +112,12 @@ public:
QString &operator+=(QChar);
QString &operator+=(const QString &);
+ QString &prepend(const QString &);
QString &append(const char *);
QString &append(const QString &);
QCString utf8() const;
+ QCString local8Bit() const;
static const QString null;
diff --git a/WebCore/src/kwq/qt/qtimer.h b/WebCore/src/kwq/qt/qtimer.h
index 5ed1421..aa069b9 100644
--- a/WebCore/src/kwq/qt/qtimer.h
+++ b/WebCore/src/kwq/qt/qtimer.h
@@ -26,4 +26,11 @@
#ifndef QTIMER_H_
#define QTIMER_H_
+#include "qobject.h"
+
+class QTimer : public QObject {
+public:
+ static void singleShot(int msec, QObject *receiver, const char *member);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qvaluelist.h b/WebCore/src/kwq/qt/qvaluelist.h
index c91a737..b09b079 100644
--- a/WebCore/src/kwq/qt/qvaluelist.h
+++ b/WebCore/src/kwq/qt/qvaluelist.h
@@ -35,7 +35,10 @@ public:
template<class T> class QValueListConstIterator {
public:
+ QValueListConstIterator();
+ QValueListConstIterator(const QValueListIterator<T>& it);
QValueListConstIterator operator++();
+ QValueListConstIterator operator++(int);
bool operator!=(const QValueListConstIterator<T>& it);
T& operator*();
};
diff --git a/WebCore/src/kwq/qt/qvariant.h b/WebCore/src/kwq/qt/qvariant.h
index d4ebd51..f9208c3 100644
--- a/WebCore/src/kwq/qt/qvariant.h
+++ b/WebCore/src/kwq/qt/qvariant.h
@@ -26,7 +26,21 @@
#ifndef QVARIANT_H_
#define QVARIANT_H_
+class QString;
+
class QVariant {
+public:
+ enum Type {
+ Bool
+ };
+
+ QVariant();
+ QVariant(bool, int);
+ QVariant(double);
+ QVariant(const QString&);
+
+ Type type() const;
+ bool toBool() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 3796845..535790a 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -27,10 +27,24 @@
#define QWIDGET_H_
#include "qpaintdevice.h"
+#include "qpoint.h"
+#include "qsize.h"
+#include "qobject.h"
-class QWidget : public QPaintDevice {
+class QWidget : public QObject, public QPaintDevice {
public:
int winId() const;
+ int x() const;
+ int y() const;
+ int width() const;
+ int height() const;
+ QSize size() const;
+ void resize(const QSize &);
+ QPoint pos() const;
+ virtual void move(const QPoint&);
+ void move(int, int);
+ QWidget *topLevelWidget() const;
+ QPoint mapToGlobal(const QPoint &) const;
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list