[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:56 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7a65178f4cfa79820311785236843e875477d02b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 5 15:49:41 2001 +0000
Finished with getting khtml/rendering/render_form.cpp to compile
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@99 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/rendering/.cvsignore b/WebCore/khtml/rendering/.cvsignore
index 282522d..39a4cb9 100644
--- a/WebCore/khtml/rendering/.cvsignore
+++ b/WebCore/khtml/rendering/.cvsignore
@@ -1,2 +1,7 @@
Makefile
+Makefile.am
Makefile.in
+*.kde
+*.dep
+*.moc
+*.gperf
diff --git a/WebCore/kwq/KWQApplication.h b/WebCore/kwq/KWQApplication.h
index 04cd9ae..b4e8c40 100644
--- a/WebCore/kwq/KWQApplication.h
+++ b/WebCore/kwq/KWQApplication.h
@@ -38,6 +38,7 @@ public:
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
+ static bool sendEvent(QObject *receiver, QEvent *event);
};
#endif
diff --git a/WebCore/kwq/KWQComboBox.h b/WebCore/kwq/KWQComboBox.h
index 42ab36f..11253ff 100644
--- a/WebCore/kwq/KWQComboBox.h
+++ b/WebCore/kwq/KWQComboBox.h
@@ -34,7 +34,13 @@ public:
QComboBox(QWidget *parent=0, const char *name=0);
QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+ int count() const;
QListBox *listBox() const;
+ void popup();
+ bool eventFilter(QObject *object, QEvent *event);
+ void insertItem(const QString &text, int index=-1);
+ void clear();
+ virtual void setCurrentItem(int);
};
#endif
diff --git a/WebCore/kwq/KWQEvent.h b/WebCore/kwq/KWQEvent.h
index 9f111d1..5233a8b 100644
--- a/WebCore/kwq/KWQEvent.h
+++ b/WebCore/kwq/KWQEvent.h
@@ -40,6 +40,7 @@ public:
FocusIn,
FocusOut,
AccelAvailable,
+ KeyPress,
};
Type type() const;
};
@@ -64,6 +65,8 @@ public:
class QKeyEvent : public QEvent {
public:
+ QKeyEvent();
+ QKeyEvent(Type, Key, int, int);
int key() const;
ButtonState state() const;
void accept();
diff --git a/WebCore/kwq/KWQFrame.h b/WebCore/kwq/KWQFrame.h
index 2dfeccd..c7f3dc8 100644
--- a/WebCore/kwq/KWQFrame.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -43,6 +43,7 @@ public:
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
+ int frameWidth() const;
};
#endif
diff --git a/WebCore/kwq/KWQKCursor.h b/WebCore/kwq/KWQKCursor.h
index b1f66f4..f93484a 100644
--- a/WebCore/kwq/KWQKCursor.h
+++ b/WebCore/kwq/KWQKCursor.h
@@ -26,4 +26,13 @@
#ifndef KCURSOR_H_
#define KCURSOR_H_
+#include <qwidget.h>
+
+class KCursor {
+public:
+ KCursor();
+
+ static void setAutoHideCursor(QWidget *w, bool enable);
+};
+
#endif
diff --git a/WebCore/kwq/KWQKListBox.h b/WebCore/kwq/KWQKListBox.h
index d74b4ab..ff9079d 100644
--- a/WebCore/kwq/KWQKListBox.h
+++ b/WebCore/kwq/KWQKListBox.h
@@ -27,8 +27,12 @@
#define KLISTBOX_H_
#include <qlistbox.h>
+#include <qwidget.h>
class KListBox : public QListBox {
+public:
+ KListBox();
+ KListBox(QWidget *);
};
#endif
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index cd5b776..d2480fb 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -63,6 +63,17 @@ public:
};
enum Key {
+ Key_Escape = 0x1000, // misc keys
+ Key_Tab = 0x1001,
+ Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
+ Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
+ Key_Return = 0x1004,
+ Key_Enter = 0x1005,
+ Key_Insert = 0x1006,
+ Key_Delete = 0x1007,
+ Key_Pause = 0x1008,
+ Key_Print = 0x1009,
+ Key_SysReq = 0x100a,
Key_Home = 0x1010, // cursor movement
Key_End = 0x1011,
Key_Left = 0x1012,
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index a2e60f6..ba27c90 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -34,6 +34,7 @@
#include "qstyle.h"
#include "qfont.h"
#include "qcursor.h"
+#include "qevent.h"
class QWidget : public QObject, public QPaintDevice {
public:
@@ -82,6 +83,8 @@ public:
virtual QSize minimumSizeHint() const;
bool isVisible() const;
virtual void setCursor(const QCursor &);
+ bool event(QEvent *);
+ bool focusNextPrevChild(bool);
};
#endif
diff --git a/WebCore/kwq/kdeui/kcursor.h b/WebCore/kwq/kdeui/kcursor.h
index b1f66f4..f93484a 100644
--- a/WebCore/kwq/kdeui/kcursor.h
+++ b/WebCore/kwq/kdeui/kcursor.h
@@ -26,4 +26,13 @@
#ifndef KCURSOR_H_
#define KCURSOR_H_
+#include <qwidget.h>
+
+class KCursor {
+public:
+ KCursor();
+
+ static void setAutoHideCursor(QWidget *w, bool enable);
+};
+
#endif
diff --git a/WebCore/kwq/kdeui/keditcl.h b/WebCore/kwq/kdeui/keditcl.h
index dc47ec6..c71477e 100644
--- a/WebCore/kwq/kdeui/keditcl.h
+++ b/WebCore/kwq/kdeui/keditcl.h
@@ -26,18 +26,13 @@
#ifndef KEDITCL_H_
#define KEDITCL_H_
-class QScrollBar;
-
-class QMultiLineEdit {
-public:
- // FIXME: normally these two would be in QTableView
- QScrollBar *verticalScrollBar() const;
- QScrollBar *horizontalScrollBar() const;
-
- bool hasMarkedText() const;
-};
+#include <qmultilineedit.h>
+#include <qwidget.h>
class KEdit : public QMultiLineEdit {
+public:
+ KEdit();
+ KEdit(QWidget *);
};
#endif
diff --git a/WebCore/kwq/kdeui/klistbox.h b/WebCore/kwq/kdeui/klistbox.h
index d74b4ab..ff9079d 100644
--- a/WebCore/kwq/kdeui/klistbox.h
+++ b/WebCore/kwq/kdeui/klistbox.h
@@ -27,8 +27,12 @@
#define KLISTBOX_H_
#include <qlistbox.h>
+#include <qwidget.h>
class KListBox : public QListBox {
+public:
+ KListBox();
+ KListBox(QWidget *);
};
#endif
diff --git a/WebCore/kwq/qt/qapplication.h b/WebCore/kwq/qt/qapplication.h
index 04cd9ae..b4e8c40 100644
--- a/WebCore/kwq/qt/qapplication.h
+++ b/WebCore/kwq/qt/qapplication.h
@@ -38,6 +38,7 @@ public:
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
+ static bool sendEvent(QObject *receiver, QEvent *event);
};
#endif
diff --git a/WebCore/kwq/qt/qcombobox.h b/WebCore/kwq/qt/qcombobox.h
index 42ab36f..11253ff 100644
--- a/WebCore/kwq/qt/qcombobox.h
+++ b/WebCore/kwq/qt/qcombobox.h
@@ -34,7 +34,13 @@ public:
QComboBox(QWidget *parent=0, const char *name=0);
QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+ int count() const;
QListBox *listBox() const;
+ void popup();
+ bool eventFilter(QObject *object, QEvent *event);
+ void insertItem(const QString &text, int index=-1);
+ void clear();
+ virtual void setCurrentItem(int);
};
#endif
diff --git a/WebCore/kwq/qt/qevent.h b/WebCore/kwq/qt/qevent.h
index 9f111d1..5233a8b 100644
--- a/WebCore/kwq/qt/qevent.h
+++ b/WebCore/kwq/qt/qevent.h
@@ -40,6 +40,7 @@ public:
FocusIn,
FocusOut,
AccelAvailable,
+ KeyPress,
};
Type type() const;
};
@@ -64,6 +65,8 @@ public:
class QKeyEvent : public QEvent {
public:
+ QKeyEvent();
+ QKeyEvent(Type, Key, int, int);
int key() const;
ButtonState state() const;
void accept();
diff --git a/WebCore/kwq/qt/qframe.h b/WebCore/kwq/qt/qframe.h
index 2dfeccd..c7f3dc8 100644
--- a/WebCore/kwq/qt/qframe.h
+++ b/WebCore/kwq/qt/qframe.h
@@ -43,6 +43,7 @@ public:
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
+ int frameWidth() const;
};
#endif
diff --git a/WebCore/kwq/qt/qlistbox.h b/WebCore/kwq/qt/qlistbox.h
index 6ae6524..d0d8eca 100644
--- a/WebCore/kwq/qt/qlistbox.h
+++ b/WebCore/kwq/qt/qlistbox.h
@@ -27,10 +27,39 @@
#define QLISTBOX_H_
#include "qscrollview.h"
+#include "qstring.h"
+
+class QListBoxItem;
+class QListBoxText;
class QListBox : public QScrollView {
public:
+ enum SelectionMode { Single, Multi, Extended, NoSelection };
+
+ uint count() const;
+ void clear();
+ virtual void setSelectionMode(SelectionMode);
+ QListBoxItem *firstItem() const;
int currentItem() const;
+ void insertItem(const QString &, int index=-1);
+ void insertItem(const QListBoxItem *, int index=-1);
+ void setSelected(int, bool);
+ bool isSelected(int);
+};
+
+class QListBoxItem {
+public:
+ void setSelectable(bool);
+ QListBox *listBox() const;
+ virtual int width(const QListBox *) const;
+ virtual int height(const QListBox *) const;
+ QListBoxItem *next() const;
+ QListBoxItem *prev() const;
+};
+
+class QListBoxText : public QListBoxItem {
+public:
+ QListBoxText(const QString & text=QString::null);
};
#endif
diff --git a/WebCore/kwq/qt/qmultilineedit.h b/WebCore/kwq/qt/qmultilineedit.h
index bf1a9d4..92fccd4 100644
--- a/WebCore/kwq/qt/qmultilineedit.h
+++ b/WebCore/kwq/qt/qmultilineedit.h
@@ -26,4 +26,32 @@
#ifndef QMULTILINEEDIT_H_
#define QMULTILINEEDIT_H_
+#include "qtableview.h"
+#include "qscrollbar.h"
+#include "qstring.h"
+
+class QMultiLineEdit : public QTableView {
+public:
+
+ enum WordWrap {
+ NoWrap,
+ WidgetWidth,
+ FixedPixelWidth,
+ FixedColumnWidth
+ };
+
+ void setWordWrap(WordWrap);
+ WordWrap wordWrap() const;
+ bool hasMarkedText() const;
+ bool isReadOnly() const;
+ virtual void setReadOnly(bool);
+ virtual void setCursorPosition(int line, int col, bool mark = FALSE);
+ void getCursorPosition(int *line, int *col) const;
+ virtual void setText(const QString &);
+ QString text();
+ QString textLine(int line) const;
+ int numLines() const;
+ void selectAll();
+};
+
#endif
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index cd5b776..d2480fb 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -63,6 +63,17 @@ public:
};
enum Key {
+ Key_Escape = 0x1000, // misc keys
+ Key_Tab = 0x1001,
+ Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
+ Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
+ Key_Return = 0x1004,
+ Key_Enter = 0x1005,
+ Key_Insert = 0x1006,
+ Key_Delete = 0x1007,
+ Key_Pause = 0x1008,
+ Key_Print = 0x1009,
+ Key_SysReq = 0x100a,
Key_Home = 0x1010, // cursor movement
Key_End = 0x1011,
Key_Left = 0x1012,
diff --git a/WebCore/src/kwq/kdeui/keditcl.h b/WebCore/kwq/qt/qtableview.h
similarity index 77%
copy from WebCore/src/kwq/kdeui/keditcl.h
copy to WebCore/kwq/qt/qtableview.h
index dc47ec6..44066e4 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/kwq/qt/qtableview.h
@@ -23,21 +23,25 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KEDITCL_H_
-#define KEDITCL_H_
+#ifndef QTABLEVIEW_H_
+#define QTABLEVIEW_H_
-class QScrollBar;
+#include "qframe.h"
+#include "qscrollbar.h"
-class QMultiLineEdit {
+class QTableView : public QFrame {
public:
- // FIXME: normally these two would be in QTableView
QScrollBar *verticalScrollBar() const;
QScrollBar *horizontalScrollBar() const;
- bool hasMarkedText() const;
+ virtual void setTableFlags(uint);
+ void clearTableFlags(uint f = ~0);
};
-class KEdit : public QMultiLineEdit {
-};
+const uint Tbl_vScrollBar = 0x00000001;
+const uint Tbl_hScrollBar = 0x00000002;
+const uint Tbl_autoVScrollBar = 0x00000004;
+const uint Tbl_autoHScrollBar = 0x00000008;
+const uint Tbl_autoScrollBars = 0x0000000C;
#endif
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index a2e60f6..ba27c90 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -34,6 +34,7 @@
#include "qstyle.h"
#include "qfont.h"
#include "qcursor.h"
+#include "qevent.h"
class QWidget : public QObject, public QPaintDevice {
public:
@@ -82,6 +83,8 @@ public:
virtual QSize minimumSizeHint() const;
bool isVisible() const;
virtual void setCursor(const QCursor &);
+ bool event(QEvent *);
+ bool focusNextPrevChild(bool);
};
#endif
diff --git a/WebCore/src/kdelibs/khtml/rendering/.cvsignore b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
index 282522d..39a4cb9 100644
--- a/WebCore/src/kdelibs/khtml/rendering/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
@@ -1,2 +1,7 @@
Makefile
+Makefile.am
Makefile.in
+*.kde
+*.dep
+*.moc
+*.gperf
diff --git a/WebCore/src/kwq/kdeui/kcursor.h b/WebCore/src/kwq/kdeui/kcursor.h
index b1f66f4..f93484a 100644
--- a/WebCore/src/kwq/kdeui/kcursor.h
+++ b/WebCore/src/kwq/kdeui/kcursor.h
@@ -26,4 +26,13 @@
#ifndef KCURSOR_H_
#define KCURSOR_H_
+#include <qwidget.h>
+
+class KCursor {
+public:
+ KCursor();
+
+ static void setAutoHideCursor(QWidget *w, bool enable);
+};
+
#endif
diff --git a/WebCore/src/kwq/kdeui/keditcl.h b/WebCore/src/kwq/kdeui/keditcl.h
index dc47ec6..c71477e 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/src/kwq/kdeui/keditcl.h
@@ -26,18 +26,13 @@
#ifndef KEDITCL_H_
#define KEDITCL_H_
-class QScrollBar;
-
-class QMultiLineEdit {
-public:
- // FIXME: normally these two would be in QTableView
- QScrollBar *verticalScrollBar() const;
- QScrollBar *horizontalScrollBar() const;
-
- bool hasMarkedText() const;
-};
+#include <qmultilineedit.h>
+#include <qwidget.h>
class KEdit : public QMultiLineEdit {
+public:
+ KEdit();
+ KEdit(QWidget *);
};
#endif
diff --git a/WebCore/src/kwq/kdeui/klistbox.h b/WebCore/src/kwq/kdeui/klistbox.h
index d74b4ab..ff9079d 100644
--- a/WebCore/src/kwq/kdeui/klistbox.h
+++ b/WebCore/src/kwq/kdeui/klistbox.h
@@ -27,8 +27,12 @@
#define KLISTBOX_H_
#include <qlistbox.h>
+#include <qwidget.h>
class KListBox : public QListBox {
+public:
+ KListBox();
+ KListBox(QWidget *);
};
#endif
diff --git a/WebCore/src/kwq/qt/qapplication.h b/WebCore/src/kwq/qt/qapplication.h
index 04cd9ae..b4e8c40 100644
--- a/WebCore/src/kwq/qt/qapplication.h
+++ b/WebCore/src/kwq/qt/qapplication.h
@@ -38,6 +38,7 @@ public:
static QSize globalStrut();
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
+ static bool sendEvent(QObject *receiver, QEvent *event);
};
#endif
diff --git a/WebCore/src/kwq/qt/qcombobox.h b/WebCore/src/kwq/qt/qcombobox.h
index 42ab36f..11253ff 100644
--- a/WebCore/src/kwq/qt/qcombobox.h
+++ b/WebCore/src/kwq/qt/qcombobox.h
@@ -34,7 +34,13 @@ public:
QComboBox(QWidget *parent=0, const char *name=0);
QComboBox(bool rw, QWidget *parent=0, const char *name=0);
+ int count() const;
QListBox *listBox() const;
+ void popup();
+ bool eventFilter(QObject *object, QEvent *event);
+ void insertItem(const QString &text, int index=-1);
+ void clear();
+ virtual void setCurrentItem(int);
};
#endif
diff --git a/WebCore/src/kwq/qt/qevent.h b/WebCore/src/kwq/qt/qevent.h
index 9f111d1..5233a8b 100644
--- a/WebCore/src/kwq/qt/qevent.h
+++ b/WebCore/src/kwq/qt/qevent.h
@@ -40,6 +40,7 @@ public:
FocusIn,
FocusOut,
AccelAvailable,
+ KeyPress,
};
Type type() const;
};
@@ -64,6 +65,8 @@ public:
class QKeyEvent : public QEvent {
public:
+ QKeyEvent();
+ QKeyEvent(Type, Key, int, int);
int key() const;
ButtonState state() const;
void accept();
diff --git a/WebCore/src/kwq/qt/qframe.h b/WebCore/src/kwq/qt/qframe.h
index 2dfeccd..c7f3dc8 100644
--- a/WebCore/src/kwq/qt/qframe.h
+++ b/WebCore/src/kwq/qt/qframe.h
@@ -43,6 +43,7 @@ public:
QFrame(QWidget *parent);
virtual void setFrameStyle(int);
+ int frameWidth() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qlistbox.h b/WebCore/src/kwq/qt/qlistbox.h
index 6ae6524..d0d8eca 100644
--- a/WebCore/src/kwq/qt/qlistbox.h
+++ b/WebCore/src/kwq/qt/qlistbox.h
@@ -27,10 +27,39 @@
#define QLISTBOX_H_
#include "qscrollview.h"
+#include "qstring.h"
+
+class QListBoxItem;
+class QListBoxText;
class QListBox : public QScrollView {
public:
+ enum SelectionMode { Single, Multi, Extended, NoSelection };
+
+ uint count() const;
+ void clear();
+ virtual void setSelectionMode(SelectionMode);
+ QListBoxItem *firstItem() const;
int currentItem() const;
+ void insertItem(const QString &, int index=-1);
+ void insertItem(const QListBoxItem *, int index=-1);
+ void setSelected(int, bool);
+ bool isSelected(int);
+};
+
+class QListBoxItem {
+public:
+ void setSelectable(bool);
+ QListBox *listBox() const;
+ virtual int width(const QListBox *) const;
+ virtual int height(const QListBox *) const;
+ QListBoxItem *next() const;
+ QListBoxItem *prev() const;
+};
+
+class QListBoxText : public QListBoxItem {
+public:
+ QListBoxText(const QString & text=QString::null);
};
#endif
diff --git a/WebCore/src/kwq/qt/qmultilineedit.h b/WebCore/src/kwq/qt/qmultilineedit.h
index bf1a9d4..92fccd4 100644
--- a/WebCore/src/kwq/qt/qmultilineedit.h
+++ b/WebCore/src/kwq/qt/qmultilineedit.h
@@ -26,4 +26,32 @@
#ifndef QMULTILINEEDIT_H_
#define QMULTILINEEDIT_H_
+#include "qtableview.h"
+#include "qscrollbar.h"
+#include "qstring.h"
+
+class QMultiLineEdit : public QTableView {
+public:
+
+ enum WordWrap {
+ NoWrap,
+ WidgetWidth,
+ FixedPixelWidth,
+ FixedColumnWidth
+ };
+
+ void setWordWrap(WordWrap);
+ WordWrap wordWrap() const;
+ bool hasMarkedText() const;
+ bool isReadOnly() const;
+ virtual void setReadOnly(bool);
+ virtual void setCursorPosition(int line, int col, bool mark = FALSE);
+ void getCursorPosition(int *line, int *col) const;
+ virtual void setText(const QString &);
+ QString text();
+ QString textLine(int line) const;
+ int numLines() const;
+ void selectAll();
+};
+
#endif
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index cd5b776..d2480fb 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -63,6 +63,17 @@ public:
};
enum Key {
+ Key_Escape = 0x1000, // misc keys
+ Key_Tab = 0x1001,
+ Key_Backtab = 0x1002, Key_BackTab = Key_Backtab,
+ Key_Backspace = 0x1003, Key_BackSpace = Key_Backspace,
+ Key_Return = 0x1004,
+ Key_Enter = 0x1005,
+ Key_Insert = 0x1006,
+ Key_Delete = 0x1007,
+ Key_Pause = 0x1008,
+ Key_Print = 0x1009,
+ Key_SysReq = 0x100a,
Key_Home = 0x1010, // cursor movement
Key_End = 0x1011,
Key_Left = 0x1012,
diff --git a/WebCore/src/kwq/kdeui/keditcl.h b/WebCore/src/kwq/qt/qtableview.h
similarity index 77%
copy from WebCore/src/kwq/kdeui/keditcl.h
copy to WebCore/src/kwq/qt/qtableview.h
index dc47ec6..44066e4 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/src/kwq/qt/qtableview.h
@@ -23,21 +23,25 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KEDITCL_H_
-#define KEDITCL_H_
+#ifndef QTABLEVIEW_H_
+#define QTABLEVIEW_H_
-class QScrollBar;
+#include "qframe.h"
+#include "qscrollbar.h"
-class QMultiLineEdit {
+class QTableView : public QFrame {
public:
- // FIXME: normally these two would be in QTableView
QScrollBar *verticalScrollBar() const;
QScrollBar *horizontalScrollBar() const;
- bool hasMarkedText() const;
+ virtual void setTableFlags(uint);
+ void clearTableFlags(uint f = ~0);
};
-class KEdit : public QMultiLineEdit {
-};
+const uint Tbl_vScrollBar = 0x00000001;
+const uint Tbl_hScrollBar = 0x00000002;
+const uint Tbl_autoVScrollBar = 0x00000004;
+const uint Tbl_autoHScrollBar = 0x00000008;
+const uint Tbl_autoScrollBars = 0x0000000C;
#endif
diff --git a/WebCore/src/kwq/qt/qwidget.h b/WebCore/src/kwq/qt/qwidget.h
index a2e60f6..ba27c90 100644
--- a/WebCore/src/kwq/qt/qwidget.h
+++ b/WebCore/src/kwq/qt/qwidget.h
@@ -34,6 +34,7 @@
#include "qstyle.h"
#include "qfont.h"
#include "qcursor.h"
+#include "qevent.h"
class QWidget : public QObject, public QPaintDevice {
public:
@@ -82,6 +83,8 @@ public:
virtual QSize minimumSizeHint() const;
bool isVisible() const;
virtual void setCursor(const QCursor &);
+ bool event(QEvent *);
+ bool focusNextPrevChild(bool);
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list