[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 b54857660f66acf218f8822e0c26dd5143ffa5f4
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 16:28:32 2001 +0000

    Added new QPointArrary constructor and did some mangling
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index 852a604..febf844 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -31,7 +31,7 @@
 class QPoint {
 public:
     QPoint();
-    QPoint(int,int);
+    QPoint(int, int);
     QPoint(const QPoint &);
     
     int x() const;
@@ -39,16 +39,17 @@ public:
 
     int manhattanLength() const;
 
-    friend inline QPoint operator+(const QPoint &, const QPoint &);
-    friend inline QPoint operator-(const QPoint &, const QPoint &);
+    friend QPoint operator+(const QPoint &, const QPoint &);
+    friend QPoint operator-(const QPoint &, const QPoint &);
 };
 
 // FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
 class QPointArray {
 public:
     QPointArray(int);
+    QPointArray(int, const QCOORD *);
     void setPoint(uint, int, int);
-    bool setPoints(int nPoints, int firstx, int firsty, ... );
+    bool setPoints(int, int, int, ... );
 };
 
 #endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index 852a604..febf844 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -31,7 +31,7 @@
 class QPoint {
 public:
     QPoint();
-    QPoint(int,int);
+    QPoint(int, int);
     QPoint(const QPoint &);
     
     int x() const;
@@ -39,16 +39,17 @@ public:
 
     int manhattanLength() const;
 
-    friend inline QPoint operator+(const QPoint &, const QPoint &);
-    friend inline QPoint operator-(const QPoint &, const QPoint &);
+    friend QPoint operator+(const QPoint &, const QPoint &);
+    friend QPoint operator-(const QPoint &, const QPoint &);
 };
 
 // FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
 class QPointArray {
 public:
     QPointArray(int);
+    QPointArray(int, const QCOORD *);
     void setPoint(uint, int, int);
-    bool setPoints(int nPoints, int firstx, int firsty, ... );
+    bool setPoints(int, int, int, ... );
 };
 
 #endif
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index 852a604..febf844 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -31,7 +31,7 @@
 class QPoint {
 public:
     QPoint();
-    QPoint(int,int);
+    QPoint(int, int);
     QPoint(const QPoint &);
     
     int x() const;
@@ -39,16 +39,17 @@ public:
 
     int manhattanLength() const;
 
-    friend inline QPoint operator+(const QPoint &, const QPoint &);
-    friend inline QPoint operator-(const QPoint &, const QPoint &);
+    friend QPoint operator+(const QPoint &, const QPoint &);
+    friend QPoint operator-(const QPoint &, const QPoint &);
 };
 
 // FIXME: QPointArray here to workaround bug in khtml/html/html_imageimpl.cpp
 class QPointArray {
 public:
     QPointArray(int);
+    QPointArray(int, const QCOORD *);
     void setPoint(uint, int, int);
-    bool setPoints(int nPoints, int firstx, int firsty, ... );
+    bool setPoints(int, int, int, ... );
 };
 
 #endif

-- 
WebKit Debian packaging