[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:46 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3e0cf522dd0bdbe8a590c90c1858b81a5ab44258
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 23:57:44 2001 +0000
More enhancements and additions to get khtml/rendering to compile
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@92 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQButton.h b/WebCore/kwq/KWQButton.h
index 5b3492f..898bab3 100644
--- a/WebCore/kwq/KWQButton.h
+++ b/WebCore/kwq/KWQButton.h
@@ -36,6 +36,7 @@ public:
QButton(QWidget *);
virtual void setText(const QString &);
+ QString text() const;
};
#endif
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index 6aae14e..42ab36f 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -26,4 +26,15 @@
#ifndef QCOMBOBOX_H_
#define QCOMBOBOX_H_
+#include "qwidget.h"
+#include "qlistbox.h"
+
+class QComboBox : public QWidget {
+public:
+ QComboBox(QWidget *parent=0, const char *name=0);
+ QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+
+ QListBox *listBox() const;
+};
+
#endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index a0f2a4c..9f111d1 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -66,6 +66,7 @@ class QKeyEvent : public QEvent {
public:
int key() const;
ButtonState state() const;
+ void accept();
};
diff --git a/WebCore/kwq/KWQFontMetrics.h b/WebCore/kwq/KWQFontMetrics.h
index 049bc9e..36b19c3 100644
--- a/WebCore/kwq/KWQFontMetrics.h
+++ b/WebCore/kwq/KWQFontMetrics.h
@@ -37,8 +37,10 @@ public:
QFontMetrics();
QFontMetrics(const QFont&);
+ int height() const;
int width() const;
int width(char) const;
+ int width(QString) 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;
diff --git a/WebCore/kwq/KWQFrame.h b/WebCore/kwq/KWQFrame.h
index d8cd89d..2dfeccd 100644
--- a/WebCore/kwq/KWQFrame.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -39,6 +39,7 @@ public:
Sunken,
};
+ QFrame();
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKComboBox.h
index ce66a2e..2213a24 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKComboBox.h
@@ -26,7 +26,13 @@
#ifndef KCOMBOBOX_H_
#define KCOMBOBOX_H_
-class KComboBox {
+#include <qcombobox.h>
+#include <kcompletion.h>
+
+class KComboBox : public QComboBox, public KCompletionBase {
+public:
+ KComboBox(QWidget *parent=0, const char *name=0);
+ KComboBox(bool rw, QWidget *parent=0, const char *name=0);
};
#endif
diff --git a/WebCore/kwq/KWQKCompletionBox.h b/WebCore/kwq/KWQKCompletionBox.h
index 0ae1875..9a99895 100644
--- a/WebCore/kwq/KWQKCompletionBox.h
+++ b/WebCore/kwq/KWQKCompletionBox.h
@@ -26,4 +26,9 @@
#ifndef KCOMPLETIONBOX_H_
#define KCOMPLETIONBOX_H_
+#include "klistbox.h"
+
+class KCompletionBox : public KListBox {
+};
+
#endif
diff --git a/WebCore/kwq/KWQKFileDialog.h b/WebCore/kwq/KWQKFileDialog.h
index 8751de3..07b11e6 100644
--- a/WebCore/kwq/KWQKFileDialog.h
+++ b/WebCore/kwq/KWQKFileDialog.h
@@ -26,7 +26,13 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
+#include <qstring.h>
+#include <qwidget.h>
+
class KFileDialog {
+public:
+ static QString getOpenFileName(const QString& startDir= QString::null, const QString& filter= QString::null,
+ QWidget *parent= 0, const QString& caption = QString::null);
};
#endif
diff --git a/WebCore/kwq/KWQKLineEdit.h b/WebCore/kwq/KWQKLineEdit.h
index bb7e6ed..9db14b2 100644
--- a/WebCore/kwq/KWQKLineEdit.h
+++ b/WebCore/kwq/KWQKLineEdit.h
@@ -27,12 +27,16 @@
#define KLINEEDIT_H_
#include <qlineedit.h>
+#include <kcompletion.h>
+#include <kcompletionbox.h>
-class KLineEdit : public QLineEdit {
+class KLineEdit : public QLineEdit, public KCompletionBase {
public:
KLineEdit(QWidget *parent=0, const char *name=0);
void setMouseTracking(bool);
+ virtual void setContextMenuEnabled(bool showMenu);
+ KCompletionBox *completionBox(bool create);
};
#endif
diff --git a/WebCore/kwq/KWQKListBox.h b/WebCore/kwq/KWQKListBox.h
index db2aeb6..d74b4ab 100644
--- a/WebCore/kwq/KWQKListBox.h
+++ b/WebCore/kwq/KWQKListBox.h
@@ -26,6 +26,9 @@
#ifndef KLISTBOX_H_
#define KLISTBOX_H_
-class KListBox;
+#include <qlistbox.h>
+
+class KListBox : public QListBox {
+};
#endif
diff --git a/WebCore/kwq/KWQLineEdit.h b/WebCore/kwq/KWQLineEdit.h
index 560fbc2..0535ccf 100644
--- a/WebCore/kwq/KWQLineEdit.h
+++ b/WebCore/kwq/KWQLineEdit.h
@@ -27,12 +27,26 @@
#define QLINEEDIT_H_
#include "qwidget.h"
+#include "qevent.h"
+#include "qstring.h"
class QLineEdit : public QWidget {
public:
+ enum EchoMode { Normal, NoEcho, Password };
+
QLineEdit(QWidget *parent=0, const char *name=0 );
+ virtual void setEchoMode(EchoMode);
bool isReadOnly() const;
+ bool event(QEvent *);
+ bool frame() const;
+ virtual void setCursorPosition(int);
+ int cursorPosition() const;
+ virtual void setText(const QString &);
+ int maxLength() const;
+ virtual void setMaxLength(int);
+ void setReadOnly(bool);
+ void selectAll();
};
#endif
diff --git a/WebCore/kwq/KWQObject.h b/WebCore/kwq/KWQObject.h
index c4a3a3d..044150c 100644
--- a/WebCore/kwq/KWQObject.h
+++ b/WebCore/kwq/KWQObject.h
@@ -58,6 +58,7 @@ public:
void killTimer(int);
void killTimers();
void installEventFilter(const QObject *);
+ void blockSignals(bool);
};
#endif
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index e9e1dbc..bbcb25c 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -28,11 +28,13 @@
#include "qwidget.h"
#include "qbutton.h"
+#include "qstring.h"
class QPushButton : public QButton {
public:
QPushButton();
QPushButton(QWidget *);
+ QPushButton(const QString &text, QWidget *parent, const char* name=0);
};
#endif
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 24dff23..a2e60f6 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -37,6 +37,15 @@
class QWidget : public QObject, public QPaintDevice {
public:
+
+ enum FocusPolicy {
+ NoFocus = 0,
+ TabFocus = 0x1,
+ ClickFocus = 0x2,
+ StrongFocus = 0x3,
+ WheelFocus = 0x7
+ };
+
// FIXME: do any of these methods need to be virtual?
int winId() const;
int x() const;
@@ -55,6 +64,9 @@ public:
QPoint mapToGlobal(const QPoint &) const;
void setFocus();
void clearFocus();
+ FocusPolicy focusPolicy() const;
+ virtual void setFocusPolicy(FocusPolicy);
+ virtual void setFocusProxy( QWidget * );
virtual void setActiveWindow();
virtual void setEnabled(bool);
const QPalette& palette() const;
@@ -68,6 +80,7 @@ public:
virtual void setFont(const QFont &);
void constPolish() const;
virtual QSize minimumSizeHint() const;
+ bool isVisible() const;
virtual void setCursor(const QCursor &);
};
diff --git a/WebCore/kwq/KWQKWinModule.h b/WebCore/kwq/kdecore/kcompletion.h
similarity index 83%
copy from WebCore/kwq/KWQKWinModule.h
copy to WebCore/kwq/kdecore/kcompletion.h
index ae95f51..382975e 100644
--- a/WebCore/kwq/KWQKWinModule.h
+++ b/WebCore/kwq/kdecore/kcompletion.h
@@ -23,19 +23,22 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWINMODULE_H_
-#define KWINMODULE_H_
+#ifndef KCOMPLETION_H_
+#define KCOMPLETION_H_
#include <qobject.h>
+#include <qstringlist.h>
-class QRect;
-
-class KWinModule : public QObject {
+class KCompletion : public QObject {
public:
- KWinModule(QObject* parent = 0);
+ KCompletion();
+ void setItems(const QStringList&);
+};
- QRect workArea(int desktop = - 1) const;
- void doNotManage(const QString&);
+class KCompletionBase {
+public:
+ KCompletionBase();
+ KCompletion *completionObject(bool hsig = true);
};
#endif
diff --git a/WebCore/kwq/kdeui/kcombobox.h b/WebCore/kwq/kdeui/kcombobox.h
index ce66a2e..2213a24 100644
--- a/WebCore/kwq/kdeui/kcombobox.h
+++ b/WebCore/kwq/kdeui/kcombobox.h
@@ -26,7 +26,13 @@
#ifndef KCOMBOBOX_H_
#define KCOMBOBOX_H_
-class KComboBox {
+#include <qcombobox.h>
+#include <kcompletion.h>
+
+class KComboBox : public QComboBox, public KCompletionBase {
+public:
+ KComboBox(QWidget *parent=0, const char *name=0);
+ KComboBox(bool rw, QWidget *parent=0, const char *name=0);
};
#endif
diff --git a/WebCore/kwq/kdeui/kcompletionbox.h b/WebCore/kwq/kdeui/kcompletionbox.h
index 0ae1875..9a99895 100644
--- a/WebCore/kwq/kdeui/kcompletionbox.h
+++ b/WebCore/kwq/kdeui/kcompletionbox.h
@@ -26,4 +26,9 @@
#ifndef KCOMPLETIONBOX_H_
#define KCOMPLETIONBOX_H_
+#include "klistbox.h"
+
+class KCompletionBox : public KListBox {
+};
+
#endif
diff --git a/WebCore/kwq/kdeui/klineedit.h b/WebCore/kwq/kdeui/klineedit.h
index bb7e6ed..9db14b2 100644
--- a/WebCore/kwq/kdeui/klineedit.h
+++ b/WebCore/kwq/kdeui/klineedit.h
@@ -27,12 +27,16 @@
#define KLINEEDIT_H_
#include <qlineedit.h>
+#include <kcompletion.h>
+#include <kcompletionbox.h>
-class KLineEdit : public QLineEdit {
+class KLineEdit : public QLineEdit, public KCompletionBase {
public:
KLineEdit(QWidget *parent=0, const char *name=0);
void setMouseTracking(bool);
+ virtual void setContextMenuEnabled(bool showMenu);
+ KCompletionBox *completionBox(bool create);
};
#endif
diff --git a/WebCore/kwq/kdeui/klistbox.h b/WebCore/kwq/kdeui/klistbox.h
index db2aeb6..d74b4ab 100644
--- a/WebCore/kwq/kdeui/klistbox.h
+++ b/WebCore/kwq/kdeui/klistbox.h
@@ -26,6 +26,9 @@
#ifndef KLISTBOX_H_
#define KLISTBOX_H_
-class KListBox;
+#include <qlistbox.h>
+
+class KListBox : public QListBox {
+};
#endif
diff --git a/WebCore/kwq/kfile/kfiledialog.h b/WebCore/kwq/kfile/kfiledialog.h
index 8751de3..07b11e6 100644
--- a/WebCore/kwq/kfile/kfiledialog.h
+++ b/WebCore/kwq/kfile/kfiledialog.h
@@ -26,7 +26,13 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
+#include <qstring.h>
+#include <qwidget.h>
+
class KFileDialog {
+public:
+ static QString getOpenFileName(const QString& startDir= QString::null, const QString& filter= QString::null,
+ QWidget *parent= 0, const QString& caption = QString::null);
};
#endif
diff --git a/WebCore/kwq/qt/qbutton.h b/WebCore/kwq/qt/qbutton.h
index 5b3492f..898bab3 100644
--- a/WebCore/kwq/qt/qbutton.h
+++ b/WebCore/kwq/qt/qbutton.h
@@ -36,6 +36,7 @@ public:
QButton(QWidget *);
virtual void setText(const QString &);
+ QString text() const;
};
#endif
diff --git a/WebCore/kwq/qt/qcombobox.h b/WebCore/kwq/qt/qcombobox.h
index 6aae14e..42ab36f 100644
--- a/WebCore/kwq/qt/qcombobox.h
+++ b/WebCore/kwq/qt/qcombobox.h
@@ -26,4 +26,15 @@
#ifndef QCOMBOBOX_H_
#define QCOMBOBOX_H_
+#include "qwidget.h"
+#include "qlistbox.h"
+
+class QComboBox : public QWidget {
+public:
+ QComboBox(QWidget *parent=0, const char *name=0);
+ QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+
+ QListBox *listBox() const;
+};
+
#endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index a0f2a4c..9f111d1 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -66,6 +66,7 @@ class QKeyEvent : public QEvent {
public:
int key() const;
ButtonState state() const;
+ void accept();
};
diff --git a/WebCore/kwq/qt/qfontmetrics.h b/WebCore/kwq/qt/qfontmetrics.h
index 049bc9e..36b19c3 100644
--- a/WebCore/kwq/qt/qfontmetrics.h
+++ b/WebCore/kwq/qt/qfontmetrics.h
@@ -37,8 +37,10 @@ public:
QFontMetrics();
QFontMetrics(const QFont&);
+ int height() const;
int width() const;
int width(char) const;
+ int width(QString) 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;
diff --git a/WebCore/kwq/qt/qframe.h b/WebCore/kwq/qt/qframe.h
index d8cd89d..2dfeccd 100644
--- a/WebCore/kwq/qt/qframe.h
+++ b/WebCore/kwq/qt/qframe.h
@@ -39,6 +39,7 @@ public:
Sunken,
};
+ QFrame();
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
diff --git a/WebCore/kwq/qt/qhbox.h b/WebCore/kwq/qt/qhbox.h
index fdb3aaf..913dde8 100644
--- a/WebCore/kwq/qt/qhbox.h
+++ b/WebCore/kwq/qt/qhbox.h
@@ -26,4 +26,15 @@
#ifndef QHBOX_H_
#define QHBOX_H_
+#include "qwidget.h"
+#include "qframe.h"
+
+class QHBox : public QFrame {
+public:
+ QHBox();
+ QHBox(QWidget *);
+
+ bool setStretchFactor(QWidget*, int stretch);
+};
+
#endif
diff --git a/WebCore/kwq/qt/qlineedit.h b/WebCore/kwq/qt/qlineedit.h
index 560fbc2..0535ccf 100644
--- a/WebCore/kwq/qt/qlineedit.h
+++ b/WebCore/kwq/qt/qlineedit.h
@@ -27,12 +27,26 @@
#define QLINEEDIT_H_
#include "qwidget.h"
+#include "qevent.h"
+#include "qstring.h"
class QLineEdit : public QWidget {
public:
+ enum EchoMode { Normal, NoEcho, Password };
+
QLineEdit(QWidget *parent=0, const char *name=0 );
+ virtual void setEchoMode(EchoMode);
bool isReadOnly() const;
+ bool event(QEvent *);
+ bool frame() const;
+ virtual void setCursorPosition(int);
+ int cursorPosition() const;
+ virtual void setText(const QString &);
+ int maxLength() const;
+ virtual void setMaxLength(int);
+ void setReadOnly(bool);
+ void selectAll();
};
#endif
diff --git a/WebCore/kwq/kdecore/kinstance.h b/WebCore/kwq/qt/qlistbox.h
similarity index 91%
copy from WebCore/kwq/kdecore/kinstance.h
copy to WebCore/kwq/qt/qlistbox.h
index 5e93d92..6ae6524 100644
--- a/WebCore/kwq/kdecore/kinstance.h
+++ b/WebCore/kwq/qt/qlistbox.h
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KINSTANCE_H_
-#define KINSTANCE_H_
+#ifndef QLISTBOX_H_
+#define QLISTBOX_H_
-class KIconLoader;
+#include "qscrollview.h"
-class KInstance {
+class QListBox : public QScrollView {
public:
- KIconLoader *iconLoader() const;
+ int currentItem() const;
};
#endif
diff --git a/WebCore/kwq/qt/qobject.h b/WebCore/kwq/qt/qobject.h
index c4a3a3d..044150c 100644
--- a/WebCore/kwq/qt/qobject.h
+++ b/WebCore/kwq/qt/qobject.h
@@ -58,6 +58,7 @@ public:
void killTimer(int);
void killTimers();
void installEventFilter(const QObject *);
+ void blockSignals(bool);
};
#endif
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
index e9e1dbc..bbcb25c 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qpushbutton.h
@@ -28,11 +28,13 @@
#include "qwidget.h"
#include "qbutton.h"
+#include "qstring.h"
class QPushButton : public QButton {
public:
QPushButton();
QPushButton(QWidget *);
+ QPushButton(const QString &text, QWidget *parent, const char* name=0);
};
#endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 24dff23..a2e60f6 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -37,6 +37,15 @@
class QWidget : public QObject, public QPaintDevice {
public:
+
+ enum FocusPolicy {
+ NoFocus = 0,
+ TabFocus = 0x1,
+ ClickFocus = 0x2,
+ StrongFocus = 0x3,
+ WheelFocus = 0x7
+ };
+
// FIXME: do any of these methods need to be virtual?
int winId() const;
int x() const;
@@ -55,6 +64,9 @@ public:
QPoint mapToGlobal(const QPoint &) const;
void setFocus();
void clearFocus();
+ FocusPolicy focusPolicy() const;
+ virtual void setFocusPolicy(FocusPolicy);
+ virtual void setFocusProxy( QWidget * );
virtual void setActiveWindow();
virtual void setEnabled(bool);
const QPalette& palette() const;
@@ -68,6 +80,7 @@ public:
virtual void setFont(const QFont &);
void constPolish() const;
virtual QSize minimumSizeHint() const;
+ bool isVisible() const;
virtual void setCursor(const QCursor &);
};
diff --git a/WebCore/kwq/KWQKWinModule.h b/WebCore/src/kwq/kdecore/kcompletion.h
similarity index 83%
copy from WebCore/kwq/KWQKWinModule.h
copy to WebCore/src/kwq/kdecore/kcompletion.h
index ae95f51..382975e 100644
--- a/WebCore/kwq/KWQKWinModule.h
+++ b/WebCore/src/kwq/kdecore/kcompletion.h
@@ -23,19 +23,22 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWINMODULE_H_
-#define KWINMODULE_H_
+#ifndef KCOMPLETION_H_
+#define KCOMPLETION_H_
#include <qobject.h>
+#include <qstringlist.h>
-class QRect;
-
-class KWinModule : public QObject {
+class KCompletion : public QObject {
public:
- KWinModule(QObject* parent = 0);
+ KCompletion();
+ void setItems(const QStringList&);
+};
- QRect workArea(int desktop = - 1) const;
- void doNotManage(const QString&);
+class KCompletionBase {
+public:
+ KCompletionBase();
+ KCompletion *completionObject(bool hsig = true);
};
#endif
diff --git a/WebCore/src/kwq/kdeui/kcombobox.h b/WebCore/src/kwq/kdeui/kcombobox.h
index ce66a2e..2213a24 100644
--- a/WebCore/src/kwq/kdeui/kcombobox.h
+++ b/WebCore/src/kwq/kdeui/kcombobox.h
@@ -26,7 +26,13 @@
#ifndef KCOMBOBOX_H_
#define KCOMBOBOX_H_
-class KComboBox {
+#include <qcombobox.h>
+#include <kcompletion.h>
+
+class KComboBox : public QComboBox, public KCompletionBase {
+public:
+ KComboBox(QWidget *parent=0, const char *name=0);
+ KComboBox(bool rw, QWidget *parent=0, const char *name=0);
};
#endif
diff --git a/WebCore/src/kwq/kdeui/kcompletionbox.h b/WebCore/src/kwq/kdeui/kcompletionbox.h
index 0ae1875..9a99895 100644
--- a/WebCore/src/kwq/kdeui/kcompletionbox.h
+++ b/WebCore/src/kwq/kdeui/kcompletionbox.h
@@ -26,4 +26,9 @@
#ifndef KCOMPLETIONBOX_H_
#define KCOMPLETIONBOX_H_
+#include "klistbox.h"
+
+class KCompletionBox : public KListBox {
+};
+
#endif
diff --git a/WebCore/src/kwq/kdeui/klineedit.h b/WebCore/src/kwq/kdeui/klineedit.h
index bb7e6ed..9db14b2 100644
--- a/WebCore/src/kwq/kdeui/klineedit.h
+++ b/WebCore/src/kwq/kdeui/klineedit.h
@@ -27,12 +27,16 @@
#define KLINEEDIT_H_
#include <qlineedit.h>
+#include <kcompletion.h>
+#include <kcompletionbox.h>
-class KLineEdit : public QLineEdit {
+class KLineEdit : public QLineEdit, public KCompletionBase {
public:
KLineEdit(QWidget *parent=0, const char *name=0);
void setMouseTracking(bool);
+ virtual void setContextMenuEnabled(bool showMenu);
+ KCompletionBox *completionBox(bool create);
};
#endif
diff --git a/WebCore/src/kwq/kdeui/klistbox.h b/WebCore/src/kwq/kdeui/klistbox.h
index db2aeb6..d74b4ab 100644
--- a/WebCore/src/kwq/kdeui/klistbox.h
+++ b/WebCore/src/kwq/kdeui/klistbox.h
@@ -26,6 +26,9 @@
#ifndef KLISTBOX_H_
#define KLISTBOX_H_
-class KListBox;
+#include <qlistbox.h>
+
+class KListBox : public QListBox {
+};
#endif
diff --git a/WebCore/src/kwq/kfile/kfiledialog.h b/WebCore/src/kwq/kfile/kfiledialog.h
index 8751de3..07b11e6 100644
--- a/WebCore/src/kwq/kfile/kfiledialog.h
+++ b/WebCore/src/kwq/kfile/kfiledialog.h
@@ -26,7 +26,13 @@
#ifndef KFILEDIALOG_H_
#define KFILEDIALOG_H_
+#include <qstring.h>
+#include <qwidget.h>
+
class KFileDialog {
+public:
+ static QString getOpenFileName(const QString& startDir= QString::null, const QString& filter= QString::null,
+ QWidget *parent= 0, const QString& caption = QString::null);
};
#endif
diff --git a/WebCore/src/kwq/qt/qbutton.h b/WebCore/src/kwq/qt/qbutton.h
index 5b3492f..898bab3 100644
--- a/WebCore/src/kwq/qt/qbutton.h
+++ b/WebCore/src/kwq/qt/qbutton.h
@@ -36,6 +36,7 @@ public:
QButton(QWidget *);
virtual void setText(const QString &);
+ QString text() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qcombobox.h b/WebCore/src/kwq/qt/qcombobox.h
index 6aae14e..42ab36f 100644
--- a/WebCore/src/kwq/qt/qcombobox.h
+++ b/WebCore/src/kwq/qt/qcombobox.h
@@ -26,4 +26,15 @@
#ifndef QCOMBOBOX_H_
#define QCOMBOBOX_H_
+#include "qwidget.h"
+#include "qlistbox.h"
+
+class QComboBox : public QWidget {
+public:
+ QComboBox(QWidget *parent=0, const char *name=0);
+ QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+
+ QListBox *listBox() const;
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index a0f2a4c..9f111d1 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -66,6 +66,7 @@ class QKeyEvent : public QEvent {
public:
int key() const;
ButtonState state() const;
+ void accept();
};
diff --git a/WebCore/src/kwq/qt/qfontmetrics.h b/WebCore/src/kwq/qt/qfontmetrics.h
index 049bc9e..36b19c3 100644
--- a/WebCore/src/kwq/qt/qfontmetrics.h
+++ b/WebCore/src/kwq/qt/qfontmetrics.h
@@ -37,8 +37,10 @@ public:
QFontMetrics();
QFontMetrics(const QFont&);
+ int height() const;
int width() const;
int width(char) const;
+ int width(QString) 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;
diff --git a/WebCore/src/kwq/qt/qframe.h b/WebCore/src/kwq/qt/qframe.h
index d8cd89d..2dfeccd 100644
--- a/WebCore/src/kwq/qt/qframe.h
+++ b/WebCore/src/kwq/qt/qframe.h
@@ -39,6 +39,7 @@ public:
Sunken,
};
+ QFrame();
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
diff --git a/WebCore/src/kwq/qt/qhbox.h b/WebCore/src/kwq/qt/qhbox.h
index fdb3aaf..913dde8 100644
--- a/WebCore/src/kwq/qt/qhbox.h
+++ b/WebCore/src/kwq/qt/qhbox.h
@@ -26,4 +26,15 @@
#ifndef QHBOX_H_
#define QHBOX_H_
+#include "qwidget.h"
+#include "qframe.h"
+
+class QHBox : public QFrame {
+public:
+ QHBox();
+ QHBox(QWidget *);
+
+ bool setStretchFactor(QWidget*, int stretch);
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qlineedit.h b/WebCore/src/kwq/qt/qlineedit.h
index 560fbc2..0535ccf 100644
--- a/WebCore/src/kwq/qt/qlineedit.h
+++ b/WebCore/src/kwq/qt/qlineedit.h
@@ -27,12 +27,26 @@
#define QLINEEDIT_H_
#include "qwidget.h"
+#include "qevent.h"
+#include "qstring.h"
class QLineEdit : public QWidget {
public:
+ enum EchoMode { Normal, NoEcho, Password };
+
QLineEdit(QWidget *parent=0, const char *name=0 );
+ virtual void setEchoMode(EchoMode);
bool isReadOnly() const;
+ bool event(QEvent *);
+ bool frame() const;
+ virtual void setCursorPosition(int);
+ int cursorPosition() const;
+ virtual void setText(const QString &);
+ int maxLength() const;
+ virtual void setMaxLength(int);
+ void setReadOnly(bool);
+ void selectAll();
};
#endif
diff --git a/WebCore/kwq/kdecore/kinstance.h b/WebCore/src/kwq/qt/qlistbox.h
similarity index 91%
copy from WebCore/kwq/kdecore/kinstance.h
copy to WebCore/src/kwq/qt/qlistbox.h
index 5e93d92..6ae6524 100644
--- a/WebCore/kwq/kdecore/kinstance.h
+++ b/WebCore/src/kwq/qt/qlistbox.h
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KINSTANCE_H_
-#define KINSTANCE_H_
+#ifndef QLISTBOX_H_
+#define QLISTBOX_H_
-class KIconLoader;
+#include "qscrollview.h"
-class KInstance {
+class QListBox : public QScrollView {
public:
- KIconLoader *iconLoader() const;
+ int currentItem() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qobject.h b/WebCore/src/kwq/qt/qobject.h
index c4a3a3d..044150c 100644
--- a/WebCore/src/kwq/qt/qobject.h
+++ b/WebCore/src/kwq/qt/qobject.h
@@ -58,6 +58,7 @@ public:
void killTimer(int);
void killTimers();
void installEventFilter(const QObject *);
+ void blockSignals(bool);
};
#endif
diff --git a/WebCore/src/kwq/qt/qpushbutton.h b/WebCore/src/kwq/qt/qpushbutton.h
index e9e1dbc..bbcb25c 100644
--- a/WebCore/src/kwq/qt/qpushbutton.h
+++ b/WebCore/src/kwq/qt/qpushbutton.h
@@ -28,11 +28,13 @@
#include "qwidget.h"
#include "qbutton.h"
+#include "qstring.h"
class QPushButton : public QButton {
public:
QPushButton();
QPushButton(QWidget *);
+ QPushButton(const QString &text, QWidget *parent, const char* name=0);
};
#endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index 24dff23..a2e60f6 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -37,6 +37,15 @@
class QWidget : public QObject, public QPaintDevice {
public:
+
+ enum FocusPolicy {
+ NoFocus = 0,
+ TabFocus = 0x1,
+ ClickFocus = 0x2,
+ StrongFocus = 0x3,
+ WheelFocus = 0x7
+ };
+
// FIXME: do any of these methods need to be virtual?
int winId() const;
int x() const;
@@ -55,6 +64,9 @@ public:
QPoint mapToGlobal(const QPoint &) const;
void setFocus();
void clearFocus();
+ FocusPolicy focusPolicy() const;
+ virtual void setFocusPolicy(FocusPolicy);
+ virtual void setFocusProxy( QWidget * );
virtual void setActiveWindow();
virtual void setEnabled(bool);
const QPalette& palette() const;
@@ -68,6 +80,7 @@ public:
virtual void setFont(const QFont &);
void constPolish() const;
virtual QSize minimumSizeHint() const;
+ bool isVisible() const;
virtual void setCursor(const QCursor &);
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list