[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:43:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a46af12527bd6e18f3111a40d0e274dc9131e28b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 22:53:56 2001 +0000
Many changes as I progress through khtml/rendering
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@82 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index c8aa841..735358e 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -26,13 +26,16 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-class QPalette;
-class QWidget;
+#include "qpalette.h"
+#include "qwidget.h"
+#include "qsize.h"
class QApplication {
public:
static QPalette palette(const QWidget* = 0);
static QWidget *desktop();
+ static int startDragDistance();
+ static QSize globalStrut();
};
#endif
diff --git a/WebCore/kwq/KWQBrush.h b/WebCore/kwq/KWQBrush.h
index c757d04..10b9de4 100644
--- a/WebCore/kwq/KWQBrush.h
+++ b/WebCore/kwq/KWQBrush.h
@@ -27,8 +27,9 @@
#define QBRUSH_H_
#include "qcolor.h"
+#include "qnamespace.h"
-class QBrush {
+class QBrush : public Qt {
friend class QPainter;
public:
QBrush();
diff --git a/WebCore/kwq/KWQCheckBox.h b/WebCore/kwq/KWQCheckBox.h
index ea7928e..41c34bc 100644
--- a/WebCore/kwq/KWQCheckBox.h
+++ b/WebCore/kwq/KWQCheckBox.h
@@ -26,4 +26,14 @@
#ifndef QCHECKBOX_H_
#define QCHECKBOX_H_
+#include "qbutton.h"
+
+class QCheckBox : public QButton {
+public:
+ QCheckBox();
+ QCheckBox(QWidget *parent);
+
+ void setChecked(bool);
+};
+
#endif
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index 21b1a0d..7ee0284 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -42,7 +42,10 @@ public:
void setRgb(int,int,int);
void setRgb(int);
+ void hsv(int *, int *, int *) const;
+
QColor light(int f = 150) const;
+ QColor dark(int f = 200) const;
QColor &operator=(const QColor &);
bool operator==(const QColor &x) const;
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index c4dc9ff..a0f2a4c 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -28,6 +28,7 @@
#include "qnamespace.h"
#include "qregion.h"
+#include "qpoint.h"
class QEvent : public Qt {
public:
@@ -36,16 +37,22 @@ public:
MouseButtonRelease,
MouseButtonDblClick,
MouseMove,
+ FocusIn,
+ FocusOut,
+ AccelAvailable,
};
Type type() const;
};
class QMouseEvent : public QEvent {
public:
+ QMouseEvent(Type type, const QPoint &pos, int button, int state);
+
int x();
int y();
int globalX();
int globalY();
+ const QPoint &pos() const;
ButtonState button();
ButtonState state();
};
@@ -55,9 +62,15 @@ public:
int timerId() const;
};
+class QKeyEvent : public QEvent {
+public:
+ int key() const;
+ ButtonState state() const;
+};
+
+
class QFocusEvent : public QEvent {};
class QHideEvent : public QEvent {};
-class QKeyEvent : public QEvent {};
class QResizeEvent : public QEvent {};
class QShowEvent : public QEvent {};
class QWheelEvent : public QEvent {};
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 90cbe49..049bc9e 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -29,12 +29,19 @@
class QRect;
class QChar;
class QFont;
+class QSize;
+class QString;
class QFontMetrics {
public:
QFontMetrics();
QFontMetrics(const QFont&);
+
+ int width() const;
+ int width(char) const;
+ int descent() const;
QRect boundingRect(QChar) const;
+ QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
};
#endif
diff --git a/WebCore/kwq/KWQKFileDialog.h b/WebCore/kwq/KWQKFileDialog.h
index a293521..8751de3 100644
--- a/WebCore/kwq/KWQKFileDialog.h
+++ b/WebCore/kwq/KWQKFileDialog.h
@@ -26,4 +26,7 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
+class KFileDialog {
+};
+
#endif
diff --git a/WebCore/kwq/KWQKGlobalSettings.h b/WebCore/kwq/KWQKGlobalSettings.h
index 868fc40..34b3626 100644
--- a/WebCore/kwq/KWQKGlobalSettings.h
+++ b/WebCore/kwq/KWQKGlobalSettings.h
@@ -30,9 +30,11 @@ class QFont;
class KGlobalSettings {
public:
- static QFont generalFont();
- static QFont windowTitleFont();
- static QFont menuFont();
+ static QFont generalFont();
+ static QFont windowTitleFont();
+ static QFont menuFont();
+
+ static int contrast();
};
#endif
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index af7c138..bb7e6ed 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -26,7 +26,13 @@
#ifndef KLINEEDIT_H_
#define KLINEEDIT_H_
-class KLineEdit {
+#include <qlineedit.h>
+
+class KLineEdit : public QLineEdit {
+public:
+ KLineEdit(QWidget *parent=0, const char *name=0);
+
+ void setMouseTracking(bool);
};
#endif
diff --git a/WebCore/kwq/KWQKPartsBrowserExtension.h b/WebCore/kwq/KWQKPartsBrowserExtension.h
index cc93948..4db7a95 100644
--- a/WebCore/kwq/KWQKPartsBrowserExtension.h
+++ b/WebCore/kwq/KWQKPartsBrowserExtension.h
@@ -29,6 +29,9 @@
// Added for compilation of khtml/dom/html_document.cpp:184
#include <qdatastream.h>
+// This is a bad hack to get some rendering code to work
+#include <kxmlguiclient.h>
+
// classes and includes added for ecma directory
#include "part.h"
#include "browserinterface.h"
@@ -67,6 +70,9 @@ public:
void createNewWindow(const KURL &url, const KParts::URLArgs &args, const KParts::WindowArgs &windowArgs, KParts::ReadOnlyPart *&part);
};
+class BrowserHostExtension {
+};
+
}; // namespace KParts
#endif
diff --git a/WebCore/kwq/KWQLabel.h b/WebCore/kwq/KWQLabel.h
index a0ece88..c98a515 100644
--- a/WebCore/kwq/KWQLabel.h
+++ b/WebCore/kwq/KWQLabel.h
@@ -31,6 +31,7 @@
class QLabel : public QFrame {
public:
QLabel(QWidget *parent);
+ QLabel(const QString &, QWidget *);
virtual void setText(const QString &);
virtual void setAlignment(int);
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index ca3a03b..cdcda8e 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -42,9 +42,36 @@ public:
enum AlignmentFlags {
AlignCenter,
WordBreak,
+ ShowPrefix,
+ };
+
+ enum PenStyle {
+ NoPen,
+ SolidLine,
+ DotLine,
+ };
+
+ enum BrushStyle {
+ NoBrush,
+ SolidPattern,
+ };
+
+ enum GUIStyle {
+ MacStyle,
+ WindowsStyle,
+ };
+
+ enum Key {
+ Key_Home = 0x1010, // cursor movement
+ Key_End = 0x1011,
+ Key_Left = 0x1012,
+ Key_Up = 0x1013,
+ Key_Right = 0x1014,
+ Key_Down = 0x1015,
};
static const QColor &black;
+ static const QColor &darkGray;
};
#endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index b83ea81..c4a3a3d 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -28,8 +28,8 @@
#include <kwqdef.h>
-// includes added to help in compilation of khtml/khtmlview.h
#include "qobjectdefs.h"
+#include "qnamespace.h"
#include "qstring.h"
#include "qevent.h"
#include "qstringlist.h"
@@ -44,7 +44,7 @@
class QVariant;
-class QObject {
+class QObject : public Qt {
public:
QObject(QObject *parent=0, const char *name=0);
const char *name() const;
@@ -57,6 +57,7 @@ public:
int startTimer(int);
void killTimer(int);
void killTimers();
+ void installEventFilter(const QObject *);
};
#endif
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 0542b16..1d682a4 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -26,24 +26,38 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "qnamespace.h"
#include "qpaintdevice.h"
#include "qcolor.h"
#include "qbrush.h"
+#include "qpen.h"
+#include "qregion.h"
class QFont;
class QFontMetrics;
class QPixmap;
-class QPainter {
+class QPainter : public Qt {
public:
QPainter();
QPainter(const QPaintDevice *);
void setFont(const QFont &);
QFontMetrics fontMetrics() const;
+ const QPen &pen() const;
+ void setPen(const QPen &);
+ void setBrush(BrushStyle);
+ QRect xForm(const QRect &) const;
+
+ void drawRect( int x, int y, int w, int h );
void fillRect(int x, int y, int w, int h, const QBrush &);
- void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &);
+ void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &, int sx=0, int sy=0);
+ void setClipping(bool);
+ void setClipRegion(const QRegion &);
+ const QRegion &clipRegion() const;
+ bool hasClipping() const;
+
};
#endif
diff --git a/WebCore/kwq/KWQPalette.h b/WebCore/kwq/KWQPalette.h
index 079ad89..3dbbeb2 100644
--- a/WebCore/kwq/KWQPalette.h
+++ b/WebCore/kwq/KWQPalette.h
@@ -30,7 +30,7 @@ class QColor;
class QColorGroup {
public:
- enum ColorRole { Foreground, Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+ enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
void setColor(ColorRole role, const QColor &color);
const QColor &foreground() const;
@@ -47,7 +47,7 @@ public:
class QPalette {
public:
- enum ColorGroup { Active, Inactive };
+ enum ColorGroup { Active, Inactive, Disabled };
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
diff --git a/WebCore/kwq/KWQPen.h b/WebCore/kwq/KWQPen.h
index 1da5906..bc1a666 100644
--- a/WebCore/kwq/KWQPen.h
+++ b/WebCore/kwq/KWQPen.h
@@ -26,4 +26,12 @@
#ifndef QPEN_H_
#define QPEN_H_
+#include "qnamespace.h"
+
+class QPen : public Qt {
+public:
+ QPen();
+ QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+};
+
#endif
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index f457611..e10099e 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -37,7 +37,10 @@ public:
int x() const;
int y() const;
+ int manhattanLength() const;
+
friend inline QPoint operator+(const QPoint &, const QPoint &);
+ friend inline QPoint operator-(const QPoint &, const QPoint &);
};
// FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
diff --git a/WebCore/kwq/KWQPtrList.h b/WebCore/kwq/KWQPtrList.h
index 1c3c40c..759ac5a 100644
--- a/WebCore/kwq/KWQPtrList.h
+++ b/WebCore/kwq/KWQPtrList.h
@@ -38,9 +38,13 @@ public:
void append(const T *);
void setAutoDelete(bool);
bool insert(uint i, const T *);
+ bool remove();
bool remove(const T *);
bool removeFirst();
bool removeLast();
+ T *getLast() const;
+ T *current() const;
+ T *prev() const;
void prepend(const T *);
T *take(uint i);
T *first();
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index 6a6d4c8..e9e1dbc 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -26,6 +26,13 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
-class QPushButton;
+#include "qwidget.h"
+#include "qbutton.h"
+
+class QPushButton : public QButton {
+public:
+ QPushButton();
+ QPushButton(QWidget *);
+};
#endif
diff --git a/WebCore/kwq/KWQRadioButton.h b/WebCore/kwq/KWQRadioButton.h
index 8e1b19b..206ccf5 100644
--- a/WebCore/kwq/KWQRadioButton.h
+++ b/WebCore/kwq/KWQRadioButton.h
@@ -26,4 +26,15 @@
#ifndef QRADIOBUTTON_H_
#define QRADIOBUTTON_H_
+#include "qwidget.h"
+#include "qbutton.h"
+
+class QRadioButton : public QButton {
+public:
+ QRadioButton();
+ QRadioButton(QWidget *);
+
+ void setChecked(bool);
+};
+
#endif
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 25393b0..f5b4256 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -33,6 +33,8 @@ public:
QRect();
QRect(int l, int t, int w, int h);
+ int x() const;
+ int y() const;
int left() const;
int top() const;
int width() const;
@@ -40,6 +42,7 @@ public:
bool isNull() const;
QSize size() const;
+ QRect intersect(const QRect &) const;
};
#endif
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index 4d4998f..35d02ab 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -31,7 +31,6 @@
// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
#include "qimage.h"
-// FIXME: workaround for error on line 62 of khtml/java/kjavaappletcontext.cpp
#include "qrect.h"
class QRegion {
@@ -40,9 +39,13 @@ public:
enum RegionType { Ellipse, Rectangle };
QRegion();
+ QRegion(const QRect &);
QRegion(int, int, int, int, RegionType = Rectangle);
QRegion(const QPointArray &);
+
+ QRegion intersect(const QRegion &) const;
bool contains(const QPoint &) const;
+ bool isNull() const;
};
#endif
diff --git a/WebCore/kwq/KWQScrollView.h b/WebCore/kwq/KWQScrollView.h
index 2370da3..b89b035 100644
--- a/WebCore/kwq/KWQScrollView.h
+++ b/WebCore/kwq/KWQScrollView.h
@@ -27,9 +27,11 @@
#define QSCROLLVIEW_H_
#include "qwidget.h"
+#include "qscrollbar.h"
class QScrollView : public QWidget {
public:
+ QWidget* viewport() const;
int visibleWidth() const;
int visibleHeight() const;
int contentsX() const;
@@ -38,6 +40,8 @@ public:
virtual void setContentsPos(int x, int y);
// NOTE: alphabetical order
enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+ QScrollBar *horizontalScrollBar() const;
+ QScrollBar *verticalScrollBar() const;
};
#endif
diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 25c6987..b4c912b 100644
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -34,8 +34,10 @@ public:
bool isValid() const;
int width() const;
int height() const;
+ QSize expandedTo(const QSize &) const;
friend inline QSize operator+(const QSize &, const QSize &);
+ friend inline bool operator==(const QSize &, const QSize &);
friend inline bool operator!=(const QSize &, const QSize &);
};
diff --git a/WebCore/kwq/KWQSortedList.h b/WebCore/kwq/KWQSortedList.h
index 8c2926b..1e5f26e 100644
--- a/WebCore/kwq/KWQSortedList.h
+++ b/WebCore/kwq/KWQSortedList.h
@@ -26,6 +26,8 @@
#ifndef QSORTEDLIST_H_
#define QSORTEDLIST_H_
+#include "qlist.h"
+
template<class T> class QSortedList : public QList<T> {
};
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 1355e40..fd431a1 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -33,6 +33,12 @@ class QRegExp;
class QChar {
public:
+ enum Direction {
+ // NOTE: alphabetical order
+ DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+ DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+ };
+
QChar();
QChar(char);
QChar(uchar);
@@ -50,8 +56,11 @@ public:
bool isSpace() const;
bool isLetter() const;
bool isLetterOrNumber() const;
+ bool isPunct() const;
uchar cell() const;
uchar row() const;
+ Direction direction() const;
+
friend inline int operator==(char, QChar);
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
@@ -63,11 +72,6 @@ public:
static const QChar null;
- enum Direction {
- // NOTE: alphabetical order
- DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
- DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
- };
};
class QString {
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index e8c1b9a..5ad3d5f 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -26,10 +26,13 @@
#ifndef QWIDGET_H_
#define QWIDGET_H_
+#include "qobject.h"
#include "qpaintdevice.h"
#include "qpoint.h"
#include "qsize.h"
-#include "qobject.h"
+#include "qpalette.h"
+#include "qstyle.h"
+#include "qfont.h"
class QWidget : public QObject, public QPaintDevice {
public:
@@ -40,6 +43,7 @@ public:
int width() const;
int height() const;
QSize size() const;
+ virtual QSize sizeHint() const;
virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
@@ -51,6 +55,18 @@ public:
void setFocus();
void clearFocus();
virtual void setActiveWindow();
+ virtual void setEnabled(bool);
+ const QPalette& palette() const;
+ virtual void setPalette(const QPalette &);
+ void unsetPalette();
+ virtual void setAutoMask(bool);
+ virtual void setMouseTracking(bool);
+ QStyle &style() const;
+ void setStyle(QStyle *);
+ QFont font() const;
+ virtual void setFont(const QFont &);
+ void constPolish() const;
+ virtual QSize minimumSizeHint() const;
};
#endif
diff --git a/WebCore/kwq/kdecore/kglobalsettings.h b/WebCore/kwq/kdecore/kglobalsettings.h
index 868fc40..34b3626 100644
--- a/WebCore/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/kwq/kdecore/kglobalsettings.h
@@ -30,9 +30,11 @@ class QFont;
class KGlobalSettings {
public:
- static QFont generalFont();
- static QFont windowTitleFont();
- static QFont menuFont();
+ static QFont generalFont();
+ static QFont windowTitleFont();
+ static QFont menuFont();
+
+ static int contrast();
};
#endif
diff --git a/WebCore/kwq/kdeui/klineedit.h b/WebCore/kwq/kdeui/klineedit.h
index af7c138..bb7e6ed 100644
--- a/WebCore/kwq/kdeui/klineedit.h
+++ b/WebCore/kwq/kdeui/klineedit.h
@@ -26,7 +26,13 @@
#ifndef KLINEEDIT_H_
#define KLINEEDIT_H_
-class KLineEdit {
+#include <qlineedit.h>
+
+class KLineEdit : public QLineEdit {
+public:
+ KLineEdit(QWidget *parent=0, const char *name=0);
+
+ void setMouseTracking(bool);
};
#endif
diff --git a/WebCore/kwq/kfile/kfiledialog.h b/WebCore/kwq/kfile/kfiledialog.h
index a293521..8751de3 100644
--- a/WebCore/kwq/kfile/kfiledialog.h
+++ b/WebCore/kwq/kfile/kfiledialog.h
@@ -26,4 +26,7 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
+class KFileDialog {
+};
+
#endif
diff --git a/WebCore/kwq/kparts/browserextension.h b/WebCore/kwq/kparts/browserextension.h
index cc93948..4db7a95 100644
--- a/WebCore/kwq/kparts/browserextension.h
+++ b/WebCore/kwq/kparts/browserextension.h
@@ -29,6 +29,9 @@
// Added for compilation of khtml/dom/html_document.cpp:184
#include <qdatastream.h>
+// This is a bad hack to get some rendering code to work
+#include <kxmlguiclient.h>
+
// classes and includes added for ecma directory
#include "part.h"
#include "browserinterface.h"
@@ -67,6 +70,9 @@ public:
void createNewWindow(const KURL &url, const KParts::URLArgs &args, const KParts::WindowArgs &windowArgs, KParts::ReadOnlyPart *&part);
};
+class BrowserHostExtension {
+};
+
}; // namespace KParts
#endif
diff --git a/WebCore/kwq/qt/qapplication.h b/WebCore/kwq/qt/qapplication.h
index c8aa841..735358e 100644
--- a/WebCore/kwq/qt/qapplication.h
+++ b/WebCore/kwq/qt/qapplication.h
@@ -26,13 +26,16 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-class QPalette;
-class QWidget;
+#include "qpalette.h"
+#include "qwidget.h"
+#include "qsize.h"
class QApplication {
public:
static QPalette palette(const QWidget* = 0);
static QWidget *desktop();
+ static int startDragDistance();
+ static QSize globalStrut();
};
#endif
diff --git a/WebCore/kwq/qt/qbrush.h b/WebCore/kwq/qt/qbrush.h
index c757d04..10b9de4 100644
--- a/WebCore/kwq/qt/qbrush.h
+++ b/WebCore/kwq/qt/qbrush.h
@@ -27,8 +27,9 @@
#define QBRUSH_H_
#include "qcolor.h"
+#include "qnamespace.h"
-class QBrush {
+class QBrush : public Qt {
friend class QPainter;
public:
QBrush();
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/qt/qcheckbox.h
index ea7928e..41c34bc 100644
--- a/WebCore/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/qt/qcheckbox.h
@@ -26,4 +26,14 @@
#ifndef QCHECKBOX_H_
#define QCHECKBOX_H_
+#include "qbutton.h"
+
+class QCheckBox : public QButton {
+public:
+ QCheckBox();
+ QCheckBox(QWidget *parent);
+
+ void setChecked(bool);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index 21b1a0d..7ee0284 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -42,7 +42,10 @@ public:
void setRgb(int,int,int);
void setRgb(int);
+ void hsv(int *, int *, int *) const;
+
QColor light(int f = 150) const;
+ QColor dark(int f = 200) const;
QColor &operator=(const QColor &);
bool operator==(const QColor &x) const;
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index c4dc9ff..a0f2a4c 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -28,6 +28,7 @@
#include "qnamespace.h"
#include "qregion.h"
+#include "qpoint.h"
class QEvent : public Qt {
public:
@@ -36,16 +37,22 @@ public:
MouseButtonRelease,
MouseButtonDblClick,
MouseMove,
+ FocusIn,
+ FocusOut,
+ AccelAvailable,
};
Type type() const;
};
class QMouseEvent : public QEvent {
public:
+ QMouseEvent(Type type, const QPoint &pos, int button, int state);
+
int x();
int y();
int globalX();
int globalY();
+ const QPoint &pos() const;
ButtonState button();
ButtonState state();
};
@@ -55,9 +62,15 @@ public:
int timerId() const;
};
+class QKeyEvent : public QEvent {
+public:
+ int key() const;
+ ButtonState state() const;
+};
+
+
class QFocusEvent : public QEvent {};
class QHideEvent : public QEvent {};
-class QKeyEvent : public QEvent {};
class QResizeEvent : public QEvent {};
class QShowEvent : public QEvent {};
class QWheelEvent : public QEvent {};
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 90cbe49..049bc9e 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -29,12 +29,19 @@
class QRect;
class QChar;
class QFont;
+class QSize;
+class QString;
class QFontMetrics {
public:
QFontMetrics();
QFontMetrics(const QFont&);
+
+ int width() const;
+ int width(char) const;
+ int descent() const;
QRect boundingRect(QChar) const;
+ QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
};
#endif
diff --git a/WebCore/kwq/qt/qlabel.h b/WebCore/kwq/qt/qlabel.h
index a0ece88..c98a515 100644
--- a/WebCore/kwq/qt/qlabel.h
+++ b/WebCore/kwq/qt/qlabel.h
@@ -31,6 +31,7 @@
class QLabel : public QFrame {
public:
QLabel(QWidget *parent);
+ QLabel(const QString &, QWidget *);
virtual void setText(const QString &);
virtual void setAlignment(int);
diff --git a/WebCore/kwq/qt/qlist.h b/WebCore/kwq/qt/qlist.h
index 1c3c40c..759ac5a 100644
--- a/WebCore/kwq/qt/qlist.h
+++ b/WebCore/kwq/qt/qlist.h
@@ -38,9 +38,13 @@ public:
void append(const T *);
void setAutoDelete(bool);
bool insert(uint i, const T *);
+ bool remove();
bool remove(const T *);
bool removeFirst();
bool removeLast();
+ T *getLast() const;
+ T *current() const;
+ T *prev() const;
void prepend(const T *);
T *take(uint i);
T *first();
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index ca3a03b..cdcda8e 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -42,9 +42,36 @@ public:
enum AlignmentFlags {
AlignCenter,
WordBreak,
+ ShowPrefix,
+ };
+
+ enum PenStyle {
+ NoPen,
+ SolidLine,
+ DotLine,
+ };
+
+ enum BrushStyle {
+ NoBrush,
+ SolidPattern,
+ };
+
+ enum GUIStyle {
+ MacStyle,
+ WindowsStyle,
+ };
+
+ enum Key {
+ Key_Home = 0x1010, // cursor movement
+ Key_End = 0x1011,
+ Key_Left = 0x1012,
+ Key_Up = 0x1013,
+ Key_Right = 0x1014,
+ Key_Down = 0x1015,
};
static const QColor &black;
+ static const QColor &darkGray;
};
#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index b83ea81..c4a3a3d 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -28,8 +28,8 @@
#include <kwqdef.h>
-// includes added to help in compilation of khtml/khtmlview.h
#include "qobjectdefs.h"
+#include "qnamespace.h"
#include "qstring.h"
#include "qevent.h"
#include "qstringlist.h"
@@ -44,7 +44,7 @@
class QVariant;
-class QObject {
+class QObject : public Qt {
public:
QObject(QObject *parent=0, const char *name=0);
const char *name() const;
@@ -57,6 +57,7 @@ public:
int startTimer(int);
void killTimer(int);
void killTimers();
+ void installEventFilter(const QObject *);
};
#endif
diff --git a/WebCore/kwq/qt/qobjectdefs.h b/WebCore/kwq/qt/qobjectdefs.h
index a579215..4ce32ec 100644
--- a/WebCore/kwq/qt/qobjectdefs.h
+++ b/WebCore/kwq/qt/qobjectdefs.h
@@ -26,7 +26,7 @@
#ifndef QOBJECTDEFS_H_
#define QOBJECTDEFS_H_
-// FIXME: should these macros be in "kwq.h" or other header file?
+#include <kglobalsettings.h>
#define Q_PROPERTY(text)
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index 0542b16..1d682a4 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -26,24 +26,38 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "qnamespace.h"
#include "qpaintdevice.h"
#include "qcolor.h"
#include "qbrush.h"
+#include "qpen.h"
+#include "qregion.h"
class QFont;
class QFontMetrics;
class QPixmap;
-class QPainter {
+class QPainter : public Qt {
public:
QPainter();
QPainter(const QPaintDevice *);
void setFont(const QFont &);
QFontMetrics fontMetrics() const;
+ const QPen &pen() const;
+ void setPen(const QPen &);
+ void setBrush(BrushStyle);
+ QRect xForm(const QRect &) const;
+
+ void drawRect( int x, int y, int w, int h );
void fillRect(int x, int y, int w, int h, const QBrush &);
- void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &);
+ void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &, int sx=0, int sy=0);
+ void setClipping(bool);
+ void setClipRegion(const QRegion &);
+ const QRegion &clipRegion() const;
+ bool hasClipping() const;
+
};
#endif
diff --git a/WebCore/kwq/qt/qpalette.h b/WebCore/kwq/qt/qpalette.h
index 079ad89..3dbbeb2 100644
--- a/WebCore/kwq/qt/qpalette.h
+++ b/WebCore/kwq/qt/qpalette.h
@@ -30,7 +30,7 @@ class QColor;
class QColorGroup {
public:
- enum ColorRole { Foreground, Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+ enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
void setColor(ColorRole role, const QColor &color);
const QColor &foreground() const;
@@ -47,7 +47,7 @@ public:
class QPalette {
public:
- enum ColorGroup { Active, Inactive };
+ enum ColorGroup { Active, Inactive, Disabled };
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
diff --git a/WebCore/kwq/qt/qpen.h b/WebCore/kwq/qt/qpen.h
index 1da5906..bc1a666 100644
--- a/WebCore/kwq/qt/qpen.h
+++ b/WebCore/kwq/qt/qpen.h
@@ -26,4 +26,12 @@
#ifndef QPEN_H_
#define QPEN_H_
+#include "qnamespace.h"
+
+class QPen : public Qt {
+public:
+ QPen();
+ QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index f457611..e10099e 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -37,7 +37,10 @@ public:
int x() const;
int y() const;
+ int manhattanLength() const;
+
friend inline QPoint operator+(const QPoint &, const QPoint &);
+ friend inline QPoint operator-(const QPoint &, const QPoint &);
};
// FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
index 6a6d4c8..e9e1dbc 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qpushbutton.h
@@ -26,6 +26,13 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
-class QPushButton;
+#include "qwidget.h"
+#include "qbutton.h"
+
+class QPushButton : public QButton {
+public:
+ QPushButton();
+ QPushButton(QWidget *);
+};
#endif
diff --git a/WebCore/kwq/qt/qradiobutton.h b/WebCore/kwq/qt/qradiobutton.h
index 8e1b19b..206ccf5 100644
--- a/WebCore/kwq/qt/qradiobutton.h
+++ b/WebCore/kwq/qt/qradiobutton.h
@@ -26,4 +26,15 @@
#ifndef QRADIOBUTTON_H_
#define QRADIOBUTTON_H_
+#include "qwidget.h"
+#include "qbutton.h"
+
+class QRadioButton : public QButton {
+public:
+ QRadioButton();
+ QRadioButton(QWidget *);
+
+ void setChecked(bool);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index 25393b0..f5b4256 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -33,6 +33,8 @@ public:
QRect();
QRect(int l, int t, int w, int h);
+ int x() const;
+ int y() const;
int left() const;
int top() const;
int width() const;
@@ -40,6 +42,7 @@ public:
bool isNull() const;
QSize size() const;
+ QRect intersect(const QRect &) const;
};
#endif
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index 4d4998f..35d02ab 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -31,7 +31,6 @@
// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
#include "qimage.h"
-// FIXME: workaround for error on line 62 of khtml/java/kjavaappletcontext.cpp
#include "qrect.h"
class QRegion {
@@ -40,9 +39,13 @@ public:
enum RegionType { Ellipse, Rectangle };
QRegion();
+ QRegion(const QRect &);
QRegion(int, int, int, int, RegionType = Rectangle);
QRegion(const QPointArray &);
+
+ QRegion intersect(const QRegion &) const;
bool contains(const QPoint &) const;
+ bool isNull() const;
};
#endif
diff --git a/WebCore/kwq/KWQKInstance.h b/WebCore/kwq/qt/qscrollbar.h
similarity index 90%
copy from WebCore/kwq/KWQKInstance.h
copy to WebCore/kwq/qt/qscrollbar.h
index 5e93d92..d36a730 100644
--- a/WebCore/kwq/KWQKInstance.h
+++ b/WebCore/kwq/qt/qscrollbar.h
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KINSTANCE_H_
-#define KINSTANCE_H_
+#ifndef QSCROLLBAR_H_
+#define QSCROLLBAR_H_
-class KIconLoader;
+#include "qwidget.h"
-class KInstance {
+class QScrollBar : public QWidget {
public:
- KIconLoader *iconLoader() const;
+ virtual void setPalette(const QPalette &);
};
#endif
diff --git a/WebCore/kwq/qt/qscrollview.h b/WebCore/kwq/qt/qscrollview.h
index 2370da3..b89b035 100644
--- a/WebCore/kwq/qt/qscrollview.h
+++ b/WebCore/kwq/qt/qscrollview.h
@@ -27,9 +27,11 @@
#define QSCROLLVIEW_H_
#include "qwidget.h"
+#include "qscrollbar.h"
class QScrollView : public QWidget {
public:
+ QWidget* viewport() const;
int visibleWidth() const;
int visibleHeight() const;
int contentsX() const;
@@ -38,6 +40,8 @@ public:
virtual void setContentsPos(int x, int y);
// NOTE: alphabetical order
enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+ QScrollBar *horizontalScrollBar() const;
+ QScrollBar *verticalScrollBar() const;
};
#endif
diff --git a/WebCore/kwq/qt/qsize.h b/WebCore/kwq/qt/qsize.h
index 25c6987..b4c912b 100644
--- a/WebCore/kwq/qt/qsize.h
+++ b/WebCore/kwq/qt/qsize.h
@@ -34,8 +34,10 @@ public:
bool isValid() const;
int width() const;
int height() const;
+ QSize expandedTo(const QSize &) const;
friend inline QSize operator+(const QSize &, const QSize &);
+ friend inline bool operator==(const QSize &, const QSize &);
friend inline bool operator!=(const QSize &, const QSize &);
};
diff --git a/WebCore/kwq/qt/qsortedlist.h b/WebCore/kwq/qt/qsortedlist.h
index 8c2926b..1e5f26e 100644
--- a/WebCore/kwq/qt/qsortedlist.h
+++ b/WebCore/kwq/qt/qsortedlist.h
@@ -26,6 +26,8 @@
#ifndef QSORTEDLIST_H_
#define QSORTEDLIST_H_
+#include "qlist.h"
+
template<class T> class QSortedList : public QList<T> {
};
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 1355e40..fd431a1 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -33,6 +33,12 @@ class QRegExp;
class QChar {
public:
+ enum Direction {
+ // NOTE: alphabetical order
+ DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+ DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+ };
+
QChar();
QChar(char);
QChar(uchar);
@@ -50,8 +56,11 @@ public:
bool isSpace() const;
bool isLetter() const;
bool isLetterOrNumber() const;
+ bool isPunct() const;
uchar cell() const;
uchar row() const;
+ Direction direction() const;
+
friend inline int operator==(char, QChar);
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
@@ -63,11 +72,6 @@ public:
static const QChar null;
- enum Direction {
- // NOTE: alphabetical order
- DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
- DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
- };
};
class QString {
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index e8c1b9a..5ad3d5f 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -26,10 +26,13 @@
#ifndef QWIDGET_H_
#define QWIDGET_H_
+#include "qobject.h"
#include "qpaintdevice.h"
#include "qpoint.h"
#include "qsize.h"
-#include "qobject.h"
+#include "qpalette.h"
+#include "qstyle.h"
+#include "qfont.h"
class QWidget : public QObject, public QPaintDevice {
public:
@@ -40,6 +43,7 @@ public:
int width() const;
int height() const;
QSize size() const;
+ virtual QSize sizeHint() const;
virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
@@ -51,6 +55,18 @@ public:
void setFocus();
void clearFocus();
virtual void setActiveWindow();
+ virtual void setEnabled(bool);
+ const QPalette& palette() const;
+ virtual void setPalette(const QPalette &);
+ void unsetPalette();
+ virtual void setAutoMask(bool);
+ virtual void setMouseTracking(bool);
+ QStyle &style() const;
+ void setStyle(QStyle *);
+ QFont font() const;
+ virtual void setFont(const QFont &);
+ void constPolish() const;
+ virtual QSize minimumSizeHint() const;
};
#endif
diff --git a/WebCore/src/kwq/kdecore/kglobalsettings.h b/WebCore/src/kwq/kdecore/kglobalsettings.h
index 868fc40..34b3626 100644
--- a/WebCore/src/kwq/kdecore/kglobalsettings.h
+++ b/WebCore/src/kwq/kdecore/kglobalsettings.h
@@ -30,9 +30,11 @@ class QFont;
class KGlobalSettings {
public:
- static QFont generalFont();
- static QFont windowTitleFont();
- static QFont menuFont();
+ static QFont generalFont();
+ static QFont windowTitleFont();
+ static QFont menuFont();
+
+ static int contrast();
};
#endif
diff --git a/WebCore/src/kwq/kdeui/klineedit.h b/WebCore/src/kwq/kdeui/klineedit.h
index af7c138..bb7e6ed 100644
--- a/WebCore/src/kwq/kdeui/klineedit.h
+++ b/WebCore/src/kwq/kdeui/klineedit.h
@@ -26,7 +26,13 @@
#ifndef KLINEEDIT_H_
#define KLINEEDIT_H_
-class KLineEdit {
+#include <qlineedit.h>
+
+class KLineEdit : public QLineEdit {
+public:
+ KLineEdit(QWidget *parent=0, const char *name=0);
+
+ void setMouseTracking(bool);
};
#endif
diff --git a/WebCore/src/kwq/kfile/kfiledialog.h b/WebCore/src/kwq/kfile/kfiledialog.h
index a293521..8751de3 100644
--- a/WebCore/src/kwq/kfile/kfiledialog.h
+++ b/WebCore/src/kwq/kfile/kfiledialog.h
@@ -26,4 +26,7 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
+class KFileDialog {
+};
+
#endif
diff --git a/WebCore/src/kwq/kparts/browserextension.h b/WebCore/src/kwq/kparts/browserextension.h
index cc93948..4db7a95 100644
--- a/WebCore/src/kwq/kparts/browserextension.h
+++ b/WebCore/src/kwq/kparts/browserextension.h
@@ -29,6 +29,9 @@
// Added for compilation of khtml/dom/html_document.cpp:184
#include <qdatastream.h>
+// This is a bad hack to get some rendering code to work
+#include <kxmlguiclient.h>
+
// classes and includes added for ecma directory
#include "part.h"
#include "browserinterface.h"
@@ -67,6 +70,9 @@ public:
void createNewWindow(const KURL &url, const KParts::URLArgs &args, const KParts::WindowArgs &windowArgs, KParts::ReadOnlyPart *&part);
};
+class BrowserHostExtension {
+};
+
}; // namespace KParts
#endif
diff --git a/WebCore/src/kwq/qt/qapplication.h b/WebCore/src/kwq/qt/qapplication.h
index c8aa841..735358e 100644
--- a/WebCore/src/kwq/qt/qapplication.h
+++ b/WebCore/src/kwq/qt/qapplication.h
@@ -26,13 +26,16 @@
#ifndef QAPPLICATION_H_
#define QAPPLICATION_H_
-class QPalette;
-class QWidget;
+#include "qpalette.h"
+#include "qwidget.h"
+#include "qsize.h"
class QApplication {
public:
static QPalette palette(const QWidget* = 0);
static QWidget *desktop();
+ static int startDragDistance();
+ static QSize globalStrut();
};
#endif
diff --git a/WebCore/src/kwq/qt/qbrush.h b/WebCore/src/kwq/qt/qbrush.h
index c757d04..10b9de4 100644
--- a/WebCore/src/kwq/qt/qbrush.h
+++ b/WebCore/src/kwq/qt/qbrush.h
@@ -27,8 +27,9 @@
#define QBRUSH_H_
#include "qcolor.h"
+#include "qnamespace.h"
-class QBrush {
+class QBrush : public Qt {
friend class QPainter;
public:
QBrush();
diff --git a/WebCore/src/kwq/qt/qcheckbox.h b/WebCore/src/kwq/qt/qcheckbox.h
index ea7928e..41c34bc 100644
--- a/WebCore/src/kwq/qt/qcheckbox.h
+++ b/WebCore/src/kwq/qt/qcheckbox.h
@@ -26,4 +26,14 @@
#ifndef QCHECKBOX_H_
#define QCHECKBOX_H_
+#include "qbutton.h"
+
+class QCheckBox : public QButton {
+public:
+ QCheckBox();
+ QCheckBox(QWidget *parent);
+
+ void setChecked(bool);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index 21b1a0d..7ee0284 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -42,7 +42,10 @@ public:
void setRgb(int,int,int);
void setRgb(int);
+ void hsv(int *, int *, int *) const;
+
QColor light(int f = 150) const;
+ QColor dark(int f = 200) const;
QColor &operator=(const QColor &);
bool operator==(const QColor &x) const;
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index c4dc9ff..a0f2a4c 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -28,6 +28,7 @@
#include "qnamespace.h"
#include "qregion.h"
+#include "qpoint.h"
class QEvent : public Qt {
public:
@@ -36,16 +37,22 @@ public:
MouseButtonRelease,
MouseButtonDblClick,
MouseMove,
+ FocusIn,
+ FocusOut,
+ AccelAvailable,
};
Type type() const;
};
class QMouseEvent : public QEvent {
public:
+ QMouseEvent(Type type, const QPoint &pos, int button, int state);
+
int x();
int y();
int globalX();
int globalY();
+ const QPoint &pos() const;
ButtonState button();
ButtonState state();
};
@@ -55,9 +62,15 @@ public:
int timerId() const;
};
+class QKeyEvent : public QEvent {
+public:
+ int key() const;
+ ButtonState state() const;
+};
+
+
class QFocusEvent : public QEvent {};
class QHideEvent : public QEvent {};
-class QKeyEvent : public QEvent {};
class QResizeEvent : public QEvent {};
class QShowEvent : public QEvent {};
class QWheelEvent : public QEvent {};
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 90cbe49..049bc9e 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -29,12 +29,19 @@
class QRect;
class QChar;
class QFont;
+class QSize;
+class QString;
class QFontMetrics {
public:
QFontMetrics();
QFontMetrics(const QFont&);
+
+ int width() const;
+ int width(char) const;
+ int descent() const;
QRect boundingRect(QChar) const;
+ QSize size(int flags, const QString& str, int len=-1, int tabstops=0, int *tabarray=0, char **intern=0 ) const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qlabel.h b/WebCore/src/kwq/qt/qlabel.h
index a0ece88..c98a515 100644
--- a/WebCore/src/kwq/qt/qlabel.h
+++ b/WebCore/src/kwq/qt/qlabel.h
@@ -31,6 +31,7 @@
class QLabel : public QFrame {
public:
QLabel(QWidget *parent);
+ QLabel(const QString &, QWidget *);
virtual void setText(const QString &);
virtual void setAlignment(int);
diff --git a/WebCore/src/kwq/qt/qlist.h b/WebCore/src/kwq/qt/qlist.h
index 1c3c40c..759ac5a 100644
--- a/WebCore/src/kwq/qt/qlist.h
+++ b/WebCore/src/kwq/qt/qlist.h
@@ -38,9 +38,13 @@ public:
void append(const T *);
void setAutoDelete(bool);
bool insert(uint i, const T *);
+ bool remove();
bool remove(const T *);
bool removeFirst();
bool removeLast();
+ T *getLast() const;
+ T *current() const;
+ T *prev() const;
void prepend(const T *);
T *take(uint i);
T *first();
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index ca3a03b..cdcda8e 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -42,9 +42,36 @@ public:
enum AlignmentFlags {
AlignCenter,
WordBreak,
+ ShowPrefix,
+ };
+
+ enum PenStyle {
+ NoPen,
+ SolidLine,
+ DotLine,
+ };
+
+ enum BrushStyle {
+ NoBrush,
+ SolidPattern,
+ };
+
+ enum GUIStyle {
+ MacStyle,
+ WindowsStyle,
+ };
+
+ enum Key {
+ Key_Home = 0x1010, // cursor movement
+ Key_End = 0x1011,
+ Key_Left = 0x1012,
+ Key_Up = 0x1013,
+ Key_Right = 0x1014,
+ Key_Down = 0x1015,
};
static const QColor &black;
+ static const QColor &darkGray;
};
#endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index b83ea81..c4a3a3d 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -28,8 +28,8 @@
#include <kwqdef.h>
-// includes added to help in compilation of khtml/khtmlview.h
#include "qobjectdefs.h"
+#include "qnamespace.h"
#include "qstring.h"
#include "qevent.h"
#include "qstringlist.h"
@@ -44,7 +44,7 @@
class QVariant;
-class QObject {
+class QObject : public Qt {
public:
QObject(QObject *parent=0, const char *name=0);
const char *name() const;
@@ -57,6 +57,7 @@ public:
int startTimer(int);
void killTimer(int);
void killTimers();
+ void installEventFilter(const QObject *);
};
#endif
diff --git a/WebCore/src/kwq/qt/qobjectdefs.h b/WebCore/src/kwq/qt/qobjectdefs.h
index a579215..4ce32ec 100644
--- a/WebCore/src/kwq/qt/qobjectdefs.h
+++ b/WebCore/src/kwq/qt/qobjectdefs.h
@@ -26,7 +26,7 @@
#ifndef QOBJECTDEFS_H_
#define QOBJECTDEFS_H_
-// FIXME: should these macros be in "kwq.h" or other header file?
+#include <kglobalsettings.h>
#define Q_PROPERTY(text)
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index 0542b16..1d682a4 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -26,24 +26,38 @@
#ifndef QPAINTER_H_
#define QPAINTER_H_
+#include "qnamespace.h"
#include "qpaintdevice.h"
#include "qcolor.h"
#include "qbrush.h"
+#include "qpen.h"
+#include "qregion.h"
class QFont;
class QFontMetrics;
class QPixmap;
-class QPainter {
+class QPainter : public Qt {
public:
QPainter();
QPainter(const QPaintDevice *);
void setFont(const QFont &);
QFontMetrics fontMetrics() const;
+ const QPen &pen() const;
+ void setPen(const QPen &);
+ void setBrush(BrushStyle);
+ QRect xForm(const QRect &) const;
+
+ void drawRect( int x, int y, int w, int h );
void fillRect(int x, int y, int w, int h, const QBrush &);
- void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &);
+ void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &, int sx=0, int sy=0);
+ void setClipping(bool);
+ void setClipRegion(const QRegion &);
+ const QRegion &clipRegion() const;
+ bool hasClipping() const;
+
};
#endif
diff --git a/WebCore/src/kwq/qt/qpalette.h b/WebCore/src/kwq/qt/qpalette.h
index 079ad89..3dbbeb2 100644
--- a/WebCore/src/kwq/qt/qpalette.h
+++ b/WebCore/src/kwq/qt/qpalette.h
@@ -30,7 +30,7 @@ class QColor;
class QColorGroup {
public:
- enum ColorRole { Foreground, Shadow, Light, Mid, Dark, Base, ButtonText, Button, Background };
+ enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
void setColor(ColorRole role, const QColor &color);
const QColor &foreground() const;
@@ -47,7 +47,7 @@ public:
class QPalette {
public:
- enum ColorGroup { Active, Inactive };
+ enum ColorGroup { Active, Inactive, Disabled };
void setColor(ColorGroup, QColorGroup::ColorRole role, const QColor &color);
diff --git a/WebCore/src/kwq/qt/qpen.h b/WebCore/src/kwq/qt/qpen.h
index 1da5906..bc1a666 100644
--- a/WebCore/src/kwq/qt/qpen.h
+++ b/WebCore/src/kwq/qt/qpen.h
@@ -26,4 +26,12 @@
#ifndef QPEN_H_
#define QPEN_H_
+#include "qnamespace.h"
+
+class QPen : public Qt {
+public:
+ QPen();
+ QPen(const QColor &color, uint width=0, PenStyle style=SolidLine);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index f457611..e10099e 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -37,7 +37,10 @@ public:
int x() const;
int y() const;
+ int manhattanLength() const;
+
friend inline QPoint operator+(const QPoint &, const QPoint &);
+ friend inline QPoint operator-(const QPoint &, const QPoint &);
};
// FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
diff --git a/WebCore/src/kwq/qt/qpushbutton.h b/WebCore/src/kwq/qt/qpushbutton.h
index 6a6d4c8..e9e1dbc 100644
--- a/WebCore/src/kwq/qt/qpushbutton.h
+++ b/WebCore/src/kwq/qt/qpushbutton.h
@@ -26,6 +26,13 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
-class QPushButton;
+#include "qwidget.h"
+#include "qbutton.h"
+
+class QPushButton : public QButton {
+public:
+ QPushButton();
+ QPushButton(QWidget *);
+};
#endif
diff --git a/WebCore/src/kwq/qt/qradiobutton.h b/WebCore/src/kwq/qt/qradiobutton.h
index 8e1b19b..206ccf5 100644
--- a/WebCore/src/kwq/qt/qradiobutton.h
+++ b/WebCore/src/kwq/qt/qradiobutton.h
@@ -26,4 +26,15 @@
#ifndef QRADIOBUTTON_H_
#define QRADIOBUTTON_H_
+#include "qwidget.h"
+#include "qbutton.h"
+
+class QRadioButton : public QButton {
+public:
+ QRadioButton();
+ QRadioButton(QWidget *);
+
+ void setChecked(bool);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index 25393b0..f5b4256 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -33,6 +33,8 @@ public:
QRect();
QRect(int l, int t, int w, int h);
+ int x() const;
+ int y() const;
int left() const;
int top() const;
int width() const;
@@ -40,6 +42,7 @@ public:
bool isNull() const;
QSize size() const;
+ QRect intersect(const QRect &) const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qregion.h b/WebCore/src/kwq/qt/qregion.h
index 4d4998f..35d02ab 100644
--- a/WebCore/src/kwq/qt/qregion.h
+++ b/WebCore/src/kwq/qt/qregion.h
@@ -31,7 +31,6 @@
// FIXME: workaround for error on line 58 of khtml/html/html_imageimpl.h
#include "qimage.h"
-// FIXME: workaround for error on line 62 of khtml/java/kjavaappletcontext.cpp
#include "qrect.h"
class QRegion {
@@ -40,9 +39,13 @@ public:
enum RegionType { Ellipse, Rectangle };
QRegion();
+ QRegion(const QRect &);
QRegion(int, int, int, int, RegionType = Rectangle);
QRegion(const QPointArray &);
+
+ QRegion intersect(const QRegion &) const;
bool contains(const QPoint &) const;
+ bool isNull() const;
};
#endif
diff --git a/WebCore/kwq/KWQKInstance.h b/WebCore/src/kwq/qt/qscrollbar.h
similarity index 90%
copy from WebCore/kwq/KWQKInstance.h
copy to WebCore/src/kwq/qt/qscrollbar.h
index 5e93d92..d36a730 100644
--- a/WebCore/kwq/KWQKInstance.h
+++ b/WebCore/src/kwq/qt/qscrollbar.h
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KINSTANCE_H_
-#define KINSTANCE_H_
+#ifndef QSCROLLBAR_H_
+#define QSCROLLBAR_H_
-class KIconLoader;
+#include "qwidget.h"
-class KInstance {
+class QScrollBar : public QWidget {
public:
- KIconLoader *iconLoader() const;
+ virtual void setPalette(const QPalette &);
};
#endif
diff --git a/WebCore/src/kwq/qt/qscrollview.h b/WebCore/src/kwq/qt/qscrollview.h
index 2370da3..b89b035 100644
--- a/WebCore/src/kwq/qt/qscrollview.h
+++ b/WebCore/src/kwq/qt/qscrollview.h
@@ -27,9 +27,11 @@
#define QSCROLLVIEW_H_
#include "qwidget.h"
+#include "qscrollbar.h"
class QScrollView : public QWidget {
public:
+ QWidget* viewport() const;
int visibleWidth() const;
int visibleHeight() const;
int contentsX() const;
@@ -38,6 +40,8 @@ public:
virtual void setContentsPos(int x, int y);
// NOTE: alphabetical order
enum ScrollBarMode { AlwaysOff, AlwaysOn, Auto };
+ QScrollBar *horizontalScrollBar() const;
+ QScrollBar *verticalScrollBar() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/src/kwq/qt/qsize.h
index 25c6987..b4c912b 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/src/kwq/qt/qsize.h
@@ -34,8 +34,10 @@ public:
bool isValid() const;
int width() const;
int height() const;
+ QSize expandedTo(const QSize &) const;
friend inline QSize operator+(const QSize &, const QSize &);
+ friend inline bool operator==(const QSize &, const QSize &);
friend inline bool operator!=(const QSize &, const QSize &);
};
diff --git a/WebCore/src/kwq/qt/qsortedlist.h b/WebCore/src/kwq/qt/qsortedlist.h
index 8c2926b..1e5f26e 100644
--- a/WebCore/src/kwq/qt/qsortedlist.h
+++ b/WebCore/src/kwq/qt/qsortedlist.h
@@ -26,6 +26,8 @@
#ifndef QSORTEDLIST_H_
#define QSORTEDLIST_H_
+#include "qlist.h"
+
template<class T> class QSortedList : public QList<T> {
};
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 1355e40..fd431a1 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -33,6 +33,12 @@ class QRegExp;
class QChar {
public:
+ enum Direction {
+ // NOTE: alphabetical order
+ DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+ DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+ };
+
QChar();
QChar(char);
QChar(uchar);
@@ -50,8 +56,11 @@ public:
bool isSpace() const;
bool isLetter() const;
bool isLetterOrNumber() const;
+ bool isPunct() const;
uchar cell() const;
uchar row() const;
+ Direction direction() const;
+
friend inline int operator==(char, QChar);
friend inline int operator==(QChar, char);
friend inline int operator==(QChar, QChar);
@@ -63,11 +72,6 @@ public:
static const QChar null;
- enum Direction {
- // NOTE: alphabetical order
- DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
- DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
- };
};
class QString {
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index e8c1b9a..5ad3d5f 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -26,10 +26,13 @@
#ifndef QWIDGET_H_
#define QWIDGET_H_
+#include "qobject.h"
#include "qpaintdevice.h"
#include "qpoint.h"
#include "qsize.h"
-#include "qobject.h"
+#include "qpalette.h"
+#include "qstyle.h"
+#include "qfont.h"
class QWidget : public QObject, public QPaintDevice {
public:
@@ -40,6 +43,7 @@ public:
int width() const;
int height() const;
QSize size() const;
+ virtual QSize sizeHint() const;
virtual void resize(int,int);
void resize(const QSize &);
QPoint pos() const;
@@ -51,6 +55,18 @@ public:
void setFocus();
void clearFocus();
virtual void setActiveWindow();
+ virtual void setEnabled(bool);
+ const QPalette& palette() const;
+ virtual void setPalette(const QPalette &);
+ void unsetPalette();
+ virtual void setAutoMask(bool);
+ virtual void setMouseTracking(bool);
+ QStyle &style() const;
+ void setStyle(QStyle *);
+ QFont font() const;
+ virtual void setFont(const QFont &);
+ void constPolish() const;
+ virtual QSize minimumSizeHint() const;
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list