Fixes build failures on a future release train.

        Reviewed by Maciej.

        Test cases added: (None needed.)

        * kwq/KWQPointArray.h: check if NSPoint is the same as CGPoint
        * kwq/KWQPoint.mm: ditto
        * kwq/KWQRect.h: check if NSRect is the same as CGRect
        * kwq/KWQRect.mm: ditto
        * kwq/KWQSize.h: check if NSSize is the same as CGSize
        * kwq/KWQSize.mm: ditto

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@10665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-12-19 b/WebCore/ChangeLog-2005-12-19
index 595930d1ec0a6de2a5b0c4dd17a2f7a565b83be5..dc876b08da5c5f4d5ba546421d77c7588015aa17 100644 (file)
--- a/WebCore/ChangeLog-2005-12-19
+++ b/WebCore/ChangeLog-2005-12-19
@@ -1,3 +1,18 @@
+2005-09-29  Timothy Hatcher  <timothy@apple.com>
+
+        Fixes build failures on a future release train.
+
+        Reviewed by Maciej.
+
+        Test cases added: (None needed.)
+
+        * kwq/KWQPointArray.h: check if NSPoint is the same as CGPoint
+        * kwq/KWQPoint.mm: ditto
+        * kwq/KWQRect.h: check if NSRect is the same as CGRect
+        * kwq/KWQRect.mm: ditto
+        * kwq/KWQSize.h: check if NSSize is the same as CGSize
+        * kwq/KWQSize.mm: ditto
+
 2005-09-29  David Hyatt  <hyatt@apple.com>
 
        Add support for parsing of the CSS3 box-sizing property.  This

diff --git a/WebCore/kwq/KWQPoint.mm b/WebCore/kwq/KWQPoint.mm
index e4a6f3277afdae7d7da46129c9c9798baa32780d..f5b4042a865db642d4e6d484b269c41b777c728a 100644 (file)
--- a/WebCore/kwq/KWQPoint.mm
+++ b/WebCore/kwq/KWQPoint.mm
@@ -33,14 +33,22 @@ QPoint::QPoint(int xIn, int yIn) : xCoord(xIn), yCoord(yIn)
 {
 }
 
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 QPoint::QPoint(const NSPoint &p) : xCoord((int)p.x), yCoord((int)p.y)
 {
 }
+#endif
 
+QPoint::QPoint(const CGPoint &p) : xCoord((int)p.x), yCoord((int)p.y)
+{
+}
+
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 QPoint::operator NSPoint() const
 {
     return NSMakePoint(xCoord, yCoord);
 }
+#endif
 
 QPoint::operator CGPoint() const
 {

diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index e95d7d0260ded5b8e47a975dcf1e47bbbe4d8a16..d0c511e4ea26647f589f42ad85b9d603e612a8b6 100644 (file)
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -34,7 +34,11 @@
 
 #include "KWQMemArray.h"
 
+#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+typedef struct CGPoint NSPoint;
+#else
 typedef struct _NSPoint NSPoint;
+#endif
 typedef struct CGPoint CGPoint;
 
 class QRect;
@@ -43,8 +47,11 @@ class QPoint {
 public:
     QPoint();
     QPoint(int, int);
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     explicit QPoint(const NSPoint &); // don't do this implicitly since it's lossy
-    
+#endif
+    explicit QPoint(const CGPoint &); // don't do this implicitly since it's lossy
+
     int x() const { return xCoord; }
     int y() const { return yCoord; }
     
@@ -58,7 +65,9 @@ public:
     friend QPoint operator+(const QPoint &, const QPoint &);
     friend QPoint operator-(const QPoint &, const QPoint &);
     
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     operator NSPoint() const;
+#endif
     operator CGPoint() const;
     
 private:

diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index 877dcbe7b8c2e417a7605a045eccbdb738afddb9..6dd2752dd1586bec3eb77360ff5805b8b1f6e065 100644 (file)
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -29,7 +29,11 @@
 #include "KWQSize.h"
 #include "KWQPointArray.h"
 
+#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+typedef struct CGRect NSRect;
+#else
 typedef struct _NSRect NSRect;
+#endif
 typedef struct CGRect CGRect;
 
 class QRect {
@@ -38,7 +42,9 @@ public:
     QRect(QPoint p, QSize s);
     QRect(int, int, int, int);
     QRect(const QPoint &, const QPoint &);
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     explicit QRect(const NSRect &); // don't do this implicitly since it's lossy
+#endif
     explicit QRect(const CGRect &); // don't do this implicitly since it's lossy
 
     bool isNull() const;
@@ -84,7 +90,9 @@ public:
 
     inline QRect operator&(const QRect &r) const { return intersect(r); }
 
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     operator NSRect() const;
+#endif
     operator CGRect() const;
 
 #ifdef _KWQ_IOSTREAM_

diff --git a/WebCore/kwq/KWQRect.mm b/WebCore/kwq/KWQRect.mm
index 8e62637abb8fe0d5727c752e31779a2f58858d96..3291206a4a5855333a2592d60e2bbfaca6937fc2 100644 (file)
--- a/WebCore/kwq/KWQRect.mm
+++ b/WebCore/kwq/KWQRect.mm
@@ -50,9 +50,11 @@ QRect::QRect(const QPoint &topLeft, const QPoint &bottomRight)
     h = bottomRight.y() - topLeft.y() + 1;
 }
 
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 QRect::QRect(const NSRect &r) : xp((int)r.origin.x), yp((int)r.origin.y), w((int)r.size.width), h((int)r.size.height)
 {
 }
+#endif
 
 QRect::QRect(const CGRect &r) : xp((int)r.origin.x), yp((int)r.origin.y), w((int)r.size.width), h((int)r.size.height)
 {
@@ -184,10 +186,12 @@ void QRect::inflate(int s)
     h += 2*s;
 }
 
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 QRect::operator NSRect() const
 {
     return NSMakeRect(xp, yp, w, h);
 }
+#endif
 
 QRect::operator CGRect() const
 {

diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 40b8e51ad7ed497d68c5ff5df9fa611556414a4b..0bc8b1823142d2cc4a9289857862190617855c33 100644 (file)
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -32,14 +32,21 @@
 #include <iosfwd>
 #endif
 
+#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+typedef struct CGSize NSSize;
+#else
 typedef struct _NSSize NSSize;
+#endif
 typedef struct CGSize CGSize;
 
 class QSize {
 public:
     QSize();
     QSize(int,int);
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     explicit QSize(const NSSize &);
+#endif
+    explicit QSize(const CGSize &);
 
     bool isValid() const;
     int width() const { return w; }
@@ -48,7 +55,9 @@ public:
     void setHeight(int height) { h = height; }
     QSize expandedTo(const QSize &) const;
     
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     operator NSSize() const;
+#endif
     operator CGSize() const;
 
     friend QSize operator+(const QSize &, const QSize &);

diff --git a/WebCore/kwq/KWQSize.mm b/WebCore/kwq/KWQSize.mm
index 93b9bf9ebd26f41cf8bc0737c899efa998cf169a..d9ef68b87529c28ef5621929ce1dd5db4d40de00 100644 (file)
--- a/WebCore/kwq/KWQSize.mm
+++ b/WebCore/kwq/KWQSize.mm
@@ -33,9 +33,15 @@ QSize::QSize(int width, int height) : w(width), h(height)
 {
 }
 
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 QSize::QSize(const NSSize &s) : w((int)s.width), h((int)s.height)
 {
 }
+#endif
+
+QSize::QSize(const CGSize &s) : w((int)s.width), h((int)s.height)
+{
+}
 
 bool QSize::isValid() const
 {
@@ -47,10 +53,12 @@ QSize QSize::expandedTo(const QSize &o) const
     return QSize(w > o.w ? w : o.w, h > o.h ? h : o.h);
 }
 
+#ifndef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 QSize::operator NSSize() const
 {
     return NSMakeSize(w, h);
 }
+#endif
 
 QSize::operator CGSize() const
 {