diff qt/d1/qt/core/QPoint.d @ 252:37eed70de029

More things broken than fixed. Rolling back to 263
author maxter
date Sat, 22 Aug 2009 12:50:58 +0000
parents 7664de4a55e5
children 34a37904ff77
line wrap: on
line diff
--- a/qt/d1/qt/core/QPoint.d	Thu Aug 20 19:08:32 2009 +0000
+++ b/qt/d1/qt/core/QPoint.d	Sat Aug 22 12:50:58 2009 +0000
@@ -61,7 +61,7 @@
 
     QPoint opMulAssign(qreal c)
     { xp = qRound(xp*c); yp = qRound(yp*c); return *this; }
-
+    
     bool opEquals(in QPoint p)
     { return xp == p.xp && yp == p.yp; }
 
@@ -70,7 +70,7 @@
 
     QPoint opSub(in QPoint p)
     { return QPoint(this.xp-p.xp, this.yp-p.yp); }
-
+    
     QPoint opMul(qreal c)
     { return QPoint(qRound(this.xp*c), qRound(this.yp*c)); }
 
@@ -87,11 +87,11 @@
     }
 
     public final void writeTo(QDataStream arg__1) {
-        qtd_QPoint_writeTo_QDataStream(this, arg__1 is null ? null : arg__1.__nativeId);
+        qtd_QPoint_writeTo_QDataStream(this, arg__1 is null ? null : arg__1.nativeId);
     }
 
     public final void readFrom(QDataStream arg__1) {
-        qtd_QPoint_readFrom_QDataStream(this, arg__1 is null ? null : arg__1.__nativeId);
+        qtd_QPoint_readFrom_QDataStream(this, arg__1 is null ? null : arg__1.nativeId);
     }
 
 private:
@@ -116,46 +116,46 @@
         pt.xp = pt.yp = 0;
         return pt;
     }
-
+    
     public static QPointF opCall(qreal xpos, qreal ypos) {
         QPointF pt;
         pt.xp = xpos;
         pt.yp = ypos;
         return pt;
     }
-
+    
     public static QPointF opCall(in QPoint p) {
         QPointF pt;
         pt.xp = p.x();
         pt.yp = p.y();
         return pt;
     }
-
+    
     bool isNull() //const
     {
         return qIsNull(xp) && qIsNull(yp);
     }
-
+    
     qreal x() //const
     {
         return xp;
     }
-
+    
     qreal y() //const
     {
         return yp;
     }
-
+    
     void x(qreal xpos)
     {
         xp = xpos;
     }
-
+    
     void y(qreal ypos)
     {
         yp = ypos;
     }
-/*
+/*    
 inline qreal &QPointF::rx()
 {
         return xp;
@@ -166,53 +166,53 @@
     return yp;
 }
 */
-
+    
     QPointF opAddAssign(in QPointF p)
     { xp+=p.xp; yp+=p.yp; return *this; }
-
+    
     QPointF opSubAssign(in QPointF p)
     { xp-=p.xp; yp-=p.yp; return *this; }
-
+    
     QPointF opMulAssign(qreal c)
     { xp*=c; yp*=c; return *this; }
-
+    
     bool opEquals(in QPointF p)
     { return qFuzzyCompare(xp, p.xp) && qFuzzyCompare(yp, p.yp); }
-
+    
     QPointF opAdd(in QPointF p)
     { return QPointF(this.xp+p.xp, this.yp+p.yp); }
-
+    
     QPointF opSub(in QPointF p)
     { return QPointF(this.xp-p.xp, this.yp-p.yp); }
-
+    
     QPointF opMul(qreal c)
     { return QPointF(this.xp*c, this.yp*c); }
-
+    
     QPointF opDivAssign(qreal c)
     {
         xp/=c;
         yp/=c;
         return *this;
     }
-
+    
     QPointF opDiv(qreal c)
     {
         return QPointF(xp/c, yp/c);
     }
-
+    
     QPoint toPoint() //const
     {
         return QPoint(qRound(xp), qRound(yp));
     }
-
+    
     public final void writeTo(QDataStream arg__1) {
-        qtd_QPointF_writeTo_QDataStream(this, arg__1 is null ? null : arg__1.__nativeId);
+        qtd_QPointF_writeTo_QDataStream(this, arg__1 is null ? null : arg__1.nativeId);
     }
-
+    
     public final void readFrom(QDataStream arg__1) {
-        qtd_QPointF_readFrom_QDataStream(this, arg__1 is null ? null : arg__1.__nativeId);
+        qtd_QPointF_readFrom_QDataStream(this, arg__1 is null ? null : arg__1.nativeId);
     }
-
+    
 private:
     qreal xp;
     qreal yp;