[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:24 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1a679dfc4995216161e0f10552b9a7dacf28b440
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 22:55:16 2001 +0000
Files added while getting khtml/rendering to compile
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@83 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/KWQButton.h
similarity index 88%
copy from WebCore/kwq/qt/qpushbutton.h
copy to WebCore/kwq/KWQButton.h
index e9e1dbc..5b3492f 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/KWQButton.h
@@ -23,16 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QPUSHBUTTON_H_
-#define QPUSHBUTTON_H_
+#ifndef QBUTTON_H_
+#define QBUTTON_H_
#include "qwidget.h"
-#include "qbutton.h"
-class QPushButton : public QButton {
+class QString;
+
+class QButton : public QWidget {
public:
- QPushButton();
- QPushButton(QWidget *);
+ QButton();
+ QButton(QWidget *);
+
+ virtual void setText(const QString &);
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/KWQKKAction.h
similarity index 94%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/kwq/KWQKKAction.h
index ce66a2e..65636f3 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/KWQKKAction.h
@@ -23,10 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef KACTION_H_
+#define KACTION_H_
-class KComboBox {
+#include <qpopupmenu.h>
+
+class KAction {
};
#endif
diff --git a/WebCore/kwq/qt/qscrollbar.h b/WebCore/kwq/KWQLineEdit.h
similarity index 89%
copy from WebCore/kwq/qt/qscrollbar.h
copy to WebCore/kwq/KWQLineEdit.h
index d36a730..560fbc2 100644
--- a/WebCore/kwq/qt/qscrollbar.h
+++ b/WebCore/kwq/KWQLineEdit.h
@@ -23,14 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSCROLLBAR_H_
-#define QSCROLLBAR_H_
+#ifndef QLINEEDIT_H_
+#define QLINEEDIT_H_
#include "qwidget.h"
-class QScrollBar : public QWidget {
+class QLineEdit : public QWidget {
public:
- virtual void setPalette(const QPalette &);
+ QLineEdit(QWidget *parent=0, const char *name=0 );
+
+ bool isReadOnly() const;
};
#endif
diff --git a/WebCore/src/kwq/qt/qtimer.h b/WebCore/kwq/KWQStyle.h
similarity index 85%
copy from WebCore/src/kwq/qt/qtimer.h
copy to WebCore/kwq/KWQStyle.h
index aa069b9..eb66433 100644
--- a/WebCore/src/kwq/qt/qtimer.h
+++ b/WebCore/kwq/KWQStyle.h
@@ -23,14 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QTIMER_H_
-#define QTIMER_H_
+#ifndef QSTYLE_H_
+#define QSTYLE_H_
#include "qobject.h"
+#include "qobjectdefs.h"
+#include "qsize.h"
-class QTimer : public QObject {
+class QStyle : public QObject {
public:
- static void singleShot(int msec, QObject *receiver, const char *member);
+ GUIStyle guiStyle() const;
+ virtual QSize indicatorSize() const = 0;
+ virtual QSize exclusiveIndicatorSize() const = 0;
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/kdeui/kaction.h
similarity index 94%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/kwq/kdeui/kaction.h
index ce66a2e..65636f3 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/kdeui/kaction.h
@@ -23,10 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef KACTION_H_
+#define KACTION_H_
-class KComboBox {
+#include <qpopupmenu.h>
+
+class KAction {
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/kdeui/kxmlguiclient.h
similarity index 95%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/kwq/kdeui/kxmlguiclient.h
index ce66a2e..9ed7e04 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/kdeui/kxmlguiclient.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef KXMLGUICLIENT_H_
+#define KXMLGUICLIENT_H_
-class KComboBox {
+class KXMLGUIClient {
};
#endif
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qbutton.h
similarity index 88%
copy from WebCore/kwq/qt/qpushbutton.h
copy to WebCore/kwq/qt/qbutton.h
index e9e1dbc..5b3492f 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qbutton.h
@@ -23,16 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QPUSHBUTTON_H_
-#define QPUSHBUTTON_H_
+#ifndef QBUTTON_H_
+#define QBUTTON_H_
#include "qwidget.h"
-#include "qbutton.h"
-class QPushButton : public QButton {
+class QString;
+
+class QButton : public QWidget {
public:
- QPushButton();
- QPushButton(QWidget *);
+ QButton();
+ QButton(QWidget *);
+
+ virtual void setText(const QString &);
};
#endif
diff --git a/WebCore/kwq/qt/qscrollbar.h b/WebCore/kwq/qt/qlineedit.h
similarity index 89%
copy from WebCore/kwq/qt/qscrollbar.h
copy to WebCore/kwq/qt/qlineedit.h
index d36a730..560fbc2 100644
--- a/WebCore/kwq/qt/qscrollbar.h
+++ b/WebCore/kwq/qt/qlineedit.h
@@ -23,14 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSCROLLBAR_H_
-#define QSCROLLBAR_H_
+#ifndef QLINEEDIT_H_
+#define QLINEEDIT_H_
#include "qwidget.h"
-class QScrollBar : public QWidget {
+class QLineEdit : public QWidget {
public:
- virtual void setPalette(const QPalette &);
+ QLineEdit(QWidget *parent=0, const char *name=0 );
+
+ bool isReadOnly() const;
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/kwq/qt/qpopupmenu.h
similarity index 95%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/kwq/qt/qpopupmenu.h
index ce66a2e..cd231d0 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/kwq/qt/qpopupmenu.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef QPOPUPMENU_H_
+#define QPOPUPMENU_H_
-class KComboBox {
+class QPopupMenu {
};
#endif
diff --git a/WebCore/src/kwq/qt/qtimer.h b/WebCore/kwq/qt/qstyle.h
similarity index 85%
copy from WebCore/src/kwq/qt/qtimer.h
copy to WebCore/kwq/qt/qstyle.h
index aa069b9..eb66433 100644
--- a/WebCore/src/kwq/qt/qtimer.h
+++ b/WebCore/kwq/qt/qstyle.h
@@ -23,14 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QTIMER_H_
-#define QTIMER_H_
+#ifndef QSTYLE_H_
+#define QSTYLE_H_
#include "qobject.h"
+#include "qobjectdefs.h"
+#include "qsize.h"
-class QTimer : public QObject {
+class QStyle : public QObject {
public:
- static void singleShot(int msec, QObject *receiver, const char *member);
+ GUIStyle guiStyle() const;
+ virtual QSize indicatorSize() const = 0;
+ virtual QSize exclusiveIndicatorSize() const = 0;
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/src/kwq/kdeui/kaction.h
similarity index 94%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/src/kwq/kdeui/kaction.h
index ce66a2e..65636f3 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/src/kwq/kdeui/kaction.h
@@ -23,10 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef KACTION_H_
+#define KACTION_H_
-class KComboBox {
+#include <qpopupmenu.h>
+
+class KAction {
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/src/kwq/kdeui/kxmlguiclient.h
similarity index 95%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/src/kwq/kdeui/kxmlguiclient.h
index ce66a2e..9ed7e04 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/src/kwq/kdeui/kxmlguiclient.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef KXMLGUICLIENT_H_
+#define KXMLGUICLIENT_H_
-class KComboBox {
+class KXMLGUIClient {
};
#endif
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/src/kwq/qt/qbutton.h
similarity index 88%
copy from WebCore/kwq/qt/qpushbutton.h
copy to WebCore/src/kwq/qt/qbutton.h
index e9e1dbc..5b3492f 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/src/kwq/qt/qbutton.h
@@ -23,16 +23,19 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QPUSHBUTTON_H_
-#define QPUSHBUTTON_H_
+#ifndef QBUTTON_H_
+#define QBUTTON_H_
#include "qwidget.h"
-#include "qbutton.h"
-class QPushButton : public QButton {
+class QString;
+
+class QButton : public QWidget {
public:
- QPushButton();
- QPushButton(QWidget *);
+ QButton();
+ QButton(QWidget *);
+
+ virtual void setText(const QString &);
};
#endif
diff --git a/WebCore/kwq/qt/qscrollbar.h b/WebCore/src/kwq/qt/qlineedit.h
similarity index 89%
copy from WebCore/kwq/qt/qscrollbar.h
copy to WebCore/src/kwq/qt/qlineedit.h
index d36a730..560fbc2 100644
--- a/WebCore/kwq/qt/qscrollbar.h
+++ b/WebCore/src/kwq/qt/qlineedit.h
@@ -23,14 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSCROLLBAR_H_
-#define QSCROLLBAR_H_
+#ifndef QLINEEDIT_H_
+#define QLINEEDIT_H_
#include "qwidget.h"
-class QScrollBar : public QWidget {
+class QLineEdit : public QWidget {
public:
- virtual void setPalette(const QPalette &);
+ QLineEdit(QWidget *parent=0, const char *name=0 );
+
+ bool isReadOnly() const;
};
#endif
diff --git a/WebCore/kwq/KWQKComboBox.h b/WebCore/src/kwq/qt/qpopupmenu.h
similarity index 95%
copy from WebCore/kwq/KWQKComboBox.h
copy to WebCore/src/kwq/qt/qpopupmenu.h
index ce66a2e..cd231d0 100644
--- a/WebCore/kwq/KWQKComboBox.h
+++ b/WebCore/src/kwq/qt/qpopupmenu.h
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KCOMBOBOX_H_
-#define KCOMBOBOX_H_
+#ifndef QPOPUPMENU_H_
+#define QPOPUPMENU_H_
-class KComboBox {
+class QPopupMenu {
};
#endif
diff --git a/WebCore/src/kwq/qt/qtimer.h b/WebCore/src/kwq/qt/qstyle.h
similarity index 85%
copy from WebCore/src/kwq/qt/qtimer.h
copy to WebCore/src/kwq/qt/qstyle.h
index aa069b9..eb66433 100644
--- a/WebCore/src/kwq/qt/qtimer.h
+++ b/WebCore/src/kwq/qt/qstyle.h
@@ -23,14 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QTIMER_H_
-#define QTIMER_H_
+#ifndef QSTYLE_H_
+#define QSTYLE_H_
#include "qobject.h"
+#include "qobjectdefs.h"
+#include "qsize.h"
-class QTimer : public QObject {
+class QStyle : public QObject {
public:
- static void singleShot(int msec, QObject *receiver, const char *member);
+ GUIStyle guiStyle() const;
+ virtual QSize indicatorSize() const = 0;
+ virtual QSize exclusiveIndicatorSize() const = 0;
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list