[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 5999b8421e2983f48295e492eb639449044e06f8
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 14:20:52 2001 +0000

    More compilation changes
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQDrawUtil.h b/WebCore/kwq/KWQDrawUtil.h
index aae87c7..4e1dd29 100644
--- a/WebCore/kwq/KWQDrawUtil.h
+++ b/WebCore/kwq/KWQDrawUtil.h
@@ -26,4 +26,9 @@
 #ifndef QDRAWUTIL_H_
 #define QDRAWUTIL_H_
 
+#include "qpainter.h"
+
+void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
+        sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+
 #endif
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index 1d682a4..ec70cc8 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -37,6 +37,11 @@ class QFont;
 class QFontMetrics;
 class QPixmap;
 
+class QWMatrix {
+public:
+    QWMatrix &scale(double, double);
+};
+
 class QPainter : public Qt {
 public:
     QPainter();
@@ -50,9 +55,13 @@ public:
 
     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 &, int sx=0, int sy=0);
+    void drawRect(int, int, int, int);
+    void fillRect(int, int, int, int, const QBrush &);
+    void drawPixmap(const QPoint &, const QPixmap &);
+    void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
+    void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
+            sy = 0);
+    void drawText(int, int, int, int, AlignmentFlags, const QString &);
     void setClipping(bool);
     void setClipRegion(const QRegion &);
     const QRegion &clipRegion() const;
diff --git a/WebCore/kwq/KWQPixmap.h b/WebCore/kwq/KWQPixmap.h
index 70d5af6..56db9a3 100644
--- a/WebCore/kwq/KWQPixmap.h
+++ b/WebCore/kwq/KWQPixmap.h
@@ -33,6 +33,7 @@
 #include "qimage.h"
 
 class QBitmap;
+class QWMatrix;
 
 class QPixmap : public QPaintDevice {
 public:
@@ -50,6 +51,7 @@ public:
     int height() const;
     bool isNull() const;
     void resize(const QSize &);
+    QPixmap xForm(const QWMatrix &) const;
     QImage convertToImage() const;
 };
 
diff --git a/WebCore/kwq/qt/qdrawutil.h b/WebCore/kwq/qt/qdrawutil.h
index aae87c7..4e1dd29 100644
--- a/WebCore/kwq/qt/qdrawutil.h
+++ b/WebCore/kwq/qt/qdrawutil.h
@@ -26,4 +26,9 @@
 #ifndef QDRAWUTIL_H_
 #define QDRAWUTIL_H_
 
+#include "qpainter.h"
+
+void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
+        sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+
 #endif
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index 1d682a4..ec70cc8 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -37,6 +37,11 @@ class QFont;
 class QFontMetrics;
 class QPixmap;
 
+class QWMatrix {
+public:
+    QWMatrix &scale(double, double);
+};
+
 class QPainter : public Qt {
 public:
     QPainter();
@@ -50,9 +55,13 @@ public:
 
     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 &, int sx=0, int sy=0);
+    void drawRect(int, int, int, int);
+    void fillRect(int, int, int, int, const QBrush &);
+    void drawPixmap(const QPoint &, const QPixmap &);
+    void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
+    void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
+            sy = 0);
+    void drawText(int, int, int, int, AlignmentFlags, const QString &);
     void setClipping(bool);
     void setClipRegion(const QRegion &);
     const QRegion &clipRegion() const;
diff --git a/WebCore/kwq/qt/qpixmap.h b/WebCore/kwq/qt/qpixmap.h
index 70d5af6..56db9a3 100644
--- a/WebCore/kwq/qt/qpixmap.h
+++ b/WebCore/kwq/qt/qpixmap.h
@@ -33,6 +33,7 @@
 #include "qimage.h"
 
 class QBitmap;
+class QWMatrix;
 
 class QPixmap : public QPaintDevice {
 public:
@@ -50,6 +51,7 @@ public:
     int height() const;
     bool isNull() const;
     void resize(const QSize &);
+    QPixmap xForm(const QWMatrix &) const;
     QImage convertToImage() const;
 };
 
diff --git a/WebCore/src/kwq/qt/qdrawutil.h b/WebCore/src/kwq/qt/qdrawutil.h
index aae87c7..4e1dd29 100644
--- a/WebCore/src/kwq/qt/qdrawutil.h
+++ b/WebCore/src/kwq/qt/qdrawutil.h
@@ -26,4 +26,9 @@
 #ifndef QDRAWUTIL_H_
 #define QDRAWUTIL_H_
 
+#include "qpainter.h"
+
+void qDrawShadePanel(QPainter *, int, int, int, int, const QColorGroup &, bool
+        sunken = FALSE, int lineWidth = 1, const QBrush *fill = 0);
+
 #endif
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index 1d682a4..ec70cc8 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -37,6 +37,11 @@ class QFont;
 class QFontMetrics;
 class QPixmap;
 
+class QWMatrix {
+public:
+    QWMatrix &scale(double, double);
+};
+
 class QPainter : public Qt {
 public:
     QPainter();
@@ -50,9 +55,13 @@ public:
 
     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 &, int sx=0, int sy=0);
+    void drawRect(int, int, int, int);
+    void fillRect(int, int, int, int, const QBrush &);
+    void drawPixmap(const QPoint &, const QPixmap &);
+    void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
+    void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
+            sy = 0);
+    void drawText(int, int, int, int, AlignmentFlags, const QString &);
     void setClipping(bool);
     void setClipRegion(const QRegion &);
     const QRegion &clipRegion() const;
diff --git a/WebCore/src/kwq/qt/qpixmap.h b/WebCore/src/kwq/qt/qpixmap.h
index 70d5af6..56db9a3 100644
--- a/WebCore/src/kwq/qt/qpixmap.h
+++ b/WebCore/src/kwq/qt/qpixmap.h
@@ -33,6 +33,7 @@
 #include "qimage.h"
 
 class QBitmap;
+class QWMatrix;
 
 class QPixmap : public QPaintDevice {
 public:
@@ -50,6 +51,7 @@ public:
     int height() const;
     bool isNull() const;
     void resize(const QSize &);
+    QPixmap xForm(const QWMatrix &) const;
     QImage convertToImage() const;
 };
 

-- 
WebKit Debian packaging