Bug #: 3669

Submitted by: eseidel
Reviewed by: darin
        * kwq/KWQSize.h:
        * kwq/KWQSize.mm:
        (QSize::operator CGSize): adding CGSize conversion support

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 85fe9a67d3e769092a293e44b0b2a033a1452729..2d91a05d7b9c9d98e2aeb5ba3bfd5ce3b67997cc 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2005-07-01  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by darin.
+
+        * kwq/KWQSize.h:
+        * kwq/KWQSize.mm:
+        (QSize::operator CGSize): adding CGSize conversion support
+
 2005-06-30  Bruce DiBello  <bdibello@apple.com>
 
         Reviewed by Geoff Garen.

diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index eecae853afc0967e649ec87fe3692e348844bec5..40b8e51ad7ed497d68c5ff5df9fa611556414a4b 100644 (file)
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -33,6 +33,7 @@
 #endif
 
 typedef struct _NSSize NSSize;
+typedef struct CGSize CGSize;
 
 class QSize {
 public:
@@ -48,6 +49,7 @@ public:
     QSize expandedTo(const QSize &) const;
     
     operator NSSize() const;
+    operator CGSize() const;
 
     friend QSize operator+(const QSize &, const QSize &);
     friend bool operator==(const QSize &, const QSize &);

diff --git a/WebCore/kwq/KWQSize.mm b/WebCore/kwq/KWQSize.mm
index f7c6acc6218ef21955c7e521088f2dd9f7d8edff..93b9bf9ebd26f41cf8bc0737c899efa998cf169a 100644 (file)
--- a/WebCore/kwq/KWQSize.mm
+++ b/WebCore/kwq/KWQSize.mm
@@ -52,6 +52,11 @@ QSize::operator NSSize() const
     return NSMakeSize(w, h);
 }
 
+QSize::operator CGSize() const
+{
+    return CGSizeMake(w, h);
+}
+
 QSize operator+(const QSize &a, const QSize &b)
 {
     return QSize(a.w + b.w, a.h + b.h);