[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:16:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit caebdf937d3fd9803737c63cb3bf18d414e8b125
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 4 00:53:54 2002 +0000
Forgot one file.
* kwq/qt/qframe.h: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1257 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 48f9f22..376cf03 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
2002-06-03 Darin Adler <darin at apple.com>
+ Forgot one file.
+
+ * kwq/qt/qframe.h: Added.
+
+2002-06-03 Darin Adler <darin at apple.com>
+
Get rid of many unneeded APPLE_CHANGES.
Also get rid of _KWQ_ and _KWQ_PEDANTIC_.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 48f9f22..376cf03 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
2002-06-03 Darin Adler <darin at apple.com>
+ Forgot one file.
+
+ * kwq/qt/qframe.h: Added.
+
+2002-06-03 Darin Adler <darin at apple.com>
+
Get rid of many unneeded APPLE_CHANGES.
Also get rid of _KWQ_ and _KWQ_PEDANTIC_.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 48f9f22..376cf03 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
2002-06-03 Darin Adler <darin at apple.com>
+ Forgot one file.
+
+ * kwq/qt/qframe.h: Added.
+
+2002-06-03 Darin Adler <darin at apple.com>
+
Get rid of many unneeded APPLE_CHANGES.
Also get rid of _KWQ_ and _KWQ_PEDANTIC_.
diff --git a/WebCore/kwq/KWQScrollBar.h b/WebCore/kwq/KWQFrame.h
similarity index 85%
copy from WebCore/kwq/KWQScrollBar.h
copy to WebCore/kwq/KWQFrame.h
index 6be6ddd..38db6c0 100644
--- a/WebCore/kwq/KWQScrollBar.h
+++ b/WebCore/kwq/KWQFrame.h
@@ -23,17 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWQSCROLLVIEW_H_
-#define KWQSCROLLVIEW_H_
+#ifndef QFRAME_H_
+#define QFRAME_H_
#include <qwidget.h>
-#include <qpalette.h>
-class QScrollBar : public QWidget {
+class QFrame : public QWidget {
public:
- QScrollBar(QWidget *);
+ enum Shape { NoFrame, Box, StyledPanel };
+ enum Shadow { Sunken };
- virtual void setPalette(const QPalette &);
+ QFrame(QWidget *parent);
+
+ virtual void setFrameStyle(int);
+ int frameWidth() const;
};
#endif
diff --git a/WebCore/kwq/KWQScrollBar.h b/WebCore/kwq/qt/qframe.h
similarity index 85%
copy from WebCore/kwq/KWQScrollBar.h
copy to WebCore/kwq/qt/qframe.h
index 6be6ddd..38db6c0 100644
--- a/WebCore/kwq/KWQScrollBar.h
+++ b/WebCore/kwq/qt/qframe.h
@@ -23,17 +23,20 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef KWQSCROLLVIEW_H_
-#define KWQSCROLLVIEW_H_
+#ifndef QFRAME_H_
+#define QFRAME_H_
#include <qwidget.h>
-#include <qpalette.h>
-class QScrollBar : public QWidget {
+class QFrame : public QWidget {
public:
- QScrollBar(QWidget *);
+ enum Shape { NoFrame, Box, StyledPanel };
+ enum Shadow { Sunken };
- virtual void setPalette(const QPalette &);
+ QFrame(QWidget *parent);
+
+ virtual void setFrameStyle(int);
+ int frameWidth() const;
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list