[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c5201efeb20e471a9f0969957606c1b3bb2de847
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 17 21:50:57 2002 +0000
top level:
* configure.in: Improve odds of avoiding $ln problem a bit
more. Also, turn on more c++ warning flags.
* .cvsignore: Prune cruft.
WebCore:
* src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
src/kwq/qt/qpoint.h, src/kwq/qt/qrect.h, src/kwq/qt/qsize.h: Make
QPoint, QRect and QSize easily turn-off-able again.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@538 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9759c1e..e8e38b8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-01-16 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
+ src/kwq/qt/qpoint.h, src/kwq/qt/qrect.h, src/kwq/qt/qsize.h: Make
+ QPoint, QRect and QSize easily turn-off-able again.
+
2002-01-15 Maciej Stachowiak <mjs at apple.com>
* src/kdelibs/kjs/Makefile.am: Add missing files to BUILT_SOURCES
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9759c1e..e8e38b8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-01-16 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
+ src/kwq/qt/qpoint.h, src/kwq/qt/qrect.h, src/kwq/qt/qsize.h: Make
+ QPoint, QRect and QSize easily turn-off-able again.
+
2002-01-15 Maciej Stachowiak <mjs at apple.com>
* src/kdelibs/kjs/Makefile.am: Add missing files to BUILT_SOURCES
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9759c1e..e8e38b8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-01-16 Maciej Stachowiak <mjs at apple.com>
+
+ * src/kwq/qt/_qpoint.h, src/kwq/qt/_qrect.h, src/kwq/qt/_qsize.h,
+ src/kwq/qt/qpoint.h, src/kwq/qt/qrect.h, src/kwq/qt/qsize.h: Make
+ QPoint, QRect and QSize easily turn-off-able again.
+
2002-01-15 Maciej Stachowiak <mjs at apple.com>
* src/kdelibs/kjs/Makefile.am: Add missing files to BUILT_SOURCES
diff --git a/WebCore/kwq/KWQPoint.mm b/WebCore/kwq/KWQPoint.mm
index 7437cdb..83bc60b 100644
--- a/WebCore/kwq/KWQPoint.mm
+++ b/WebCore/kwq/KWQPoint.mm
@@ -25,6 +25,8 @@
#include <qpoint.h>
+#ifndef USING_BORROWED_QPOINT
+
QPoint::QPoint() : xCoord(0), yCoord(0)
{
}
@@ -66,3 +68,5 @@ ostream &operator<<(ostream &o, const QPoint &p)
return o << "QPoint: [x: " << p.x() << "; h: " << p.y() << "]";
}
#endif
+
+#endif
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index bebe621..eac4a72 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -30,6 +30,12 @@
#include <config.h>
#endif
+#ifdef USING_BORROWED_QPOINT
+
+#include <_qpoint.h>
+
+#else /* !USING_BORROWED_QPOINT */
+
#include <iostream>
#include <KWQDef.h>
@@ -126,3 +132,5 @@ public:
}; // class QPointArray ========================================================
#endif
+
+#endif /* USING_BORROWED_QPOINT */
diff --git a/WebCore/kwq/KWQRect.h b/WebCore/kwq/KWQRect.h
index ad8bfb9..6849715 100644
--- a/WebCore/kwq/KWQRect.h
+++ b/WebCore/kwq/KWQRect.h
@@ -26,6 +26,12 @@
#ifndef QRECT_H_
#define QRECT_H_
+#ifdef USING_BORROWED_QRECT
+
+#include <_qrect.h>
+
+#else
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -114,3 +120,5 @@ bool operator==(const QRect &, const QRect &);
bool operator!=(const QRect &, const QRect &);
#endif
+
+#endif
diff --git a/WebCore/kwq/KWQRect.mm b/WebCore/kwq/KWQRect.mm
index 799f658..9fa5834 100644
--- a/WebCore/kwq/KWQRect.mm
+++ b/WebCore/kwq/KWQRect.mm
@@ -25,6 +25,8 @@
#include <qrect.h>
+#ifndef USING_BORROWED_QRECT
+
#define MAX(a,b) ((a) >= (b) ? (a) : (b))
@@ -159,4 +161,4 @@ ostream &operator<<(ostream &o, const QRect &r)
}
#endif
-
+#endif
diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 43fca06..16fd017 100644
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -26,6 +26,12 @@
#ifndef QSIZE_H_
#define QSIZE_H_
+#ifdef USING_BORROWED_QSIZE
+
+#include <_qsize.h>
+
+#else
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -89,3 +95,5 @@ public:
}; // class QSize ==============================================================
#endif
+
+#endif
diff --git a/WebCore/kwq/KWQSize.mm b/WebCore/kwq/KWQSize.mm
index 8decf71..1d24be8 100644
--- a/WebCore/kwq/KWQSize.mm
+++ b/WebCore/kwq/KWQSize.mm
@@ -25,6 +25,8 @@
#include <qsize.h>
+#ifndef USING_BORROWED_QSIZE
+
QSize::QSize() : w(-1), h(-1)
{
}
@@ -83,3 +85,4 @@ ostream &operator<<(ostream &o, const QSize &s)
}
#endif
+#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/_qpoint.h
similarity index 83%
copy from WebCore/kwq/qt/qpoint.h
copy to WebCore/kwq/qt/_qpoint.h
index bebe621..c8e4857 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/_qpoint.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QPOINT_H_
-#define QPOINT_H_
+#ifndef _QPOINT_H_
+#define _QPOINT_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -50,9 +50,7 @@ public:
QPoint();
QPoint(int, int);
-
- // QPoint(const QPoint &);
- // default copy constructor is fine
+ QPoint(const QPoint &);
// add no-op destructor
#ifdef _KWQ_PEDANTIC_
@@ -66,6 +64,10 @@ public:
int manhattanLength() const;
+ bool isNull() const;
+ void setX(int);
+ void setY(int);
+
// operators ---------------------------------------------------------------
/* Note: Trolltech seems to want operator= to be a bitwise copy
@@ -75,13 +77,29 @@ public:
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
+ QPoint &operator+=(const QPoint &);
+ QPoint &operator-=(const QPoint &);
+ QPoint &operator*=(int);
+ QPoint &operator*=(double);
+ QPoint &operator/=(int);
+ QPoint &operator/=(double);
+
+ friend bool operator==(const QPoint &, const QPoint &);
+ friend bool operator!=(const QPoint &, const QPoint &);
+ friend QPoint operator*(const QPoint &, int);
+ friend QPoint operator*(int, const QPoint &);
+ friend QPoint operator*(const QPoint &, double);
+ friend QPoint operator*(double, const QPoint &);
+ friend QPoint operator-(const QPoint &);
+ friend QPoint operator/(const QPoint &, int);
+ friend QPoint operator/(const QPoint &, double);
+
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
-private:
- QCOORD xCoord;
- QCOORD yCoord;
+ QCOORD xx;
+ QCOORD yy;
}; // class QPoint =============================================================
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/kwq/qt/_qrect.h
similarity index 71%
copy from WebCore/src/kwq/qt/qrect.h
copy to WebCore/kwq/qt/_qrect.h
index ad8bfb9..78ae7ce 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/_qrect.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QRECT_H_
-#define QRECT_H_
+#ifndef _QRECT_H_
+#define _QRECT_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -50,11 +50,14 @@ public:
// constructors, copy constructors, and destructors ------------------------
QRect();
- QRect(QPoint p, QSize s);
QRect(int, int, int, int);
- // QRect(const QRect &);
- // default copy constructor is fine
+ QRect(const QRect &);
+#ifdef USING_BORROWED_QRECT
+ QRect(const QPoint &, const QPoint &);
+ QRect(const QPoint &, const QSize &);
+#endif
+
// add no-op destructor
#ifdef _KWQ_PEDANTIC_
~QRect() {}
@@ -74,13 +77,48 @@ public:
int width() const;
int height() const;
- QPoint topLeft() const;
QSize size() const;
void setWidth(int);
void setHeight(int);
QRect intersect(const QRect &) const;
bool intersects(const QRect &) const;
+#ifdef USING_BORROWED_QRECT
+ bool isEmpty() const;
+ QRect normalize() const;
+
+ void setLeft(int);
+ void setTop(int);
+ void setRight(int);
+ void setBottom(int);
+ void setX(int);
+ void setY(int);
+
+ QPoint topLeft() const;
+ QPoint bottomRight() const;
+ QPoint topRight() const;
+ QPoint bottomLeft() const;
+ QPoint center() const;
+
+ void rect(int *, int *, int *, int *) const;
+ void coords(int *, int *, int *, int *) const;
+
+ void setSize(const QSize &);
+ void setRect(int, int, int, int);
+ void setCoords(int, int, int, int);
+
+ void moveTopLeft(const QPoint &);
+ void moveBottomRight(const QPoint &);
+ void moveTopRight(const QPoint &);
+ void moveBottomLeft(const QPoint &);
+ void moveCenter(const QPoint &);
+ void moveBy(int, int);
+
+ bool contains(const QPoint &, bool proper=FALSE) const;
+ bool contains(int, int, bool proper=FALSE) const;
+ bool contains(const QRect &, bool proper=FALSE) const;
+ QRect unite(const QRect &) const;
+#endif // USING_BORROWED_QRECT
// operators ---------------------------------------------------------------
@@ -90,6 +128,15 @@ public:
QRect operator&(const QRect &) const;
+#ifdef USING_BORROWED_QRECT
+ friend bool operator==(const QRect &, const QRect &);
+ friend bool operator!=(const QRect &, const QRect &);
+
+ QRect operator|(const QRect &) const;
+ QRect& operator|=(const QRect &);
+ QRect& operator&=(const QRect &);
+#endif
+
#ifdef _KWQ_IOSTREAM_
friend ostream &operator<<(ostream &, const QRect &);
#endif
@@ -98,14 +145,11 @@ public:
// private ---------------------------------------------------------------------
-private:
- QCOORD xp;
- QCOORD yp;
- QCOORD w;
- QCOORD h;
+ QCOORD x1;
+ QCOORD x2;
+ QCOORD y1;
+ QCOORD y2;
- friend bool operator==(const QRect &, const QRect &);
- friend bool operator!=(const QRect &, const QRect &);
}; // class QRect ==============================================================
// operators associated with QRect =============================================
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/kwq/qt/_qsize.h
similarity index 79%
copy from WebCore/src/kwq/qt/qsize.h
copy to WebCore/kwq/qt/_qsize.h
index 43fca06..e5465ae 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/kwq/qt/_qsize.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSIZE_H_
-#define QSIZE_H_
+#ifndef _QSIZE_H_
+#define _QSIZE_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -48,7 +48,7 @@ public:
QSize();
QSize(int,int);
- // QSize(const QSize &);
+ QSize(const QSize &);
// add no-op destructor
#ifdef _KWQ_PEDANTIC_
@@ -64,6 +64,13 @@ public:
void setHeight(int);
QSize expandedTo(const QSize &) const;
+#ifdef USING_BORROWED_QSIZE
+ bool isNull() const;
+ bool isEmpty() const;
+ void transpose();
+ QSize boundedTo(const QSize &) const;
+#endif
+
// operators ---------------------------------------------------------------
/* Note: Trolltech seems to want operator= to be a bitwise copy
@@ -74,6 +81,22 @@ public:
friend bool operator==(const QSize &, const QSize &);
friend bool operator!=(const QSize &, const QSize &);
+#ifdef USING_BORROWED_QSIZE
+ QSize &operator+=(const QSize &);
+ QSize &operator-=(const QSize &);
+ QSize &operator*=(int);
+ QSize &operator*=(double);
+ QSize &operator/=(int);
+ QSize &operator/=(double);
+
+ friend QSize operator-(const QSize &, const QSize &);
+ friend QSize operator*(const QSize &, int);
+ friend QSize operator*(int, const QSize &);
+ friend QSize operator*(const QSize &, double);
+ friend QSize operator*(double, const QSize &);
+ friend QSize operator/(const QSize &, int);
+ friend QSize operator/(const QSize &, double);
+#endif
#ifdef _KWQ_IOSTREAM_
friend ostream &operator<<(ostream &, const QSize &);
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index bebe621..eac4a72 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -30,6 +30,12 @@
#include <config.h>
#endif
+#ifdef USING_BORROWED_QPOINT
+
+#include <_qpoint.h>
+
+#else /* !USING_BORROWED_QPOINT */
+
#include <iostream>
#include <KWQDef.h>
@@ -126,3 +132,5 @@ public:
}; // class QPointArray ========================================================
#endif
+
+#endif /* USING_BORROWED_QPOINT */
diff --git a/WebCore/kwq/qt/qrect.h b/WebCore/kwq/qt/qrect.h
index ad8bfb9..6849715 100644
--- a/WebCore/kwq/qt/qrect.h
+++ b/WebCore/kwq/qt/qrect.h
@@ -26,6 +26,12 @@
#ifndef QRECT_H_
#define QRECT_H_
+#ifdef USING_BORROWED_QRECT
+
+#include <_qrect.h>
+
+#else
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -114,3 +120,5 @@ bool operator==(const QRect &, const QRect &);
bool operator!=(const QRect &, const QRect &);
#endif
+
+#endif
diff --git a/WebCore/kwq/qt/qsize.h b/WebCore/kwq/qt/qsize.h
index 43fca06..16fd017 100644
--- a/WebCore/kwq/qt/qsize.h
+++ b/WebCore/kwq/qt/qsize.h
@@ -26,6 +26,12 @@
#ifndef QSIZE_H_
#define QSIZE_H_
+#ifdef USING_BORROWED_QSIZE
+
+#include <_qsize.h>
+
+#else
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -89,3 +95,5 @@ public:
}; // class QSize ==============================================================
#endif
+
+#endif
diff --git a/WebCore/src/kwq/KWQPoint.mm b/WebCore/src/kwq/KWQPoint.mm
index 7437cdb..83bc60b 100644
--- a/WebCore/src/kwq/KWQPoint.mm
+++ b/WebCore/src/kwq/KWQPoint.mm
@@ -25,6 +25,8 @@
#include <qpoint.h>
+#ifndef USING_BORROWED_QPOINT
+
QPoint::QPoint() : xCoord(0), yCoord(0)
{
}
@@ -66,3 +68,5 @@ ostream &operator<<(ostream &o, const QPoint &p)
return o << "QPoint: [x: " << p.x() << "; h: " << p.y() << "]";
}
#endif
+
+#endif
diff --git a/WebCore/src/kwq/KWQRect.mm b/WebCore/src/kwq/KWQRect.mm
index 799f658..9fa5834 100644
--- a/WebCore/src/kwq/KWQRect.mm
+++ b/WebCore/src/kwq/KWQRect.mm
@@ -25,6 +25,8 @@
#include <qrect.h>
+#ifndef USING_BORROWED_QRECT
+
#define MAX(a,b) ((a) >= (b) ? (a) : (b))
@@ -159,4 +161,4 @@ ostream &operator<<(ostream &o, const QRect &r)
}
#endif
-
+#endif
diff --git a/WebCore/src/kwq/KWQSize.mm b/WebCore/src/kwq/KWQSize.mm
index 8decf71..1d24be8 100644
--- a/WebCore/src/kwq/KWQSize.mm
+++ b/WebCore/src/kwq/KWQSize.mm
@@ -25,6 +25,8 @@
#include <qsize.h>
+#ifndef USING_BORROWED_QSIZE
+
QSize::QSize() : w(-1), h(-1)
{
}
@@ -83,3 +85,4 @@ ostream &operator<<(ostream &o, const QSize &s)
}
#endif
+#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/_qpoint.h
similarity index 83%
copy from WebCore/kwq/qt/qpoint.h
copy to WebCore/src/kwq/qt/_qpoint.h
index bebe621..c8e4857 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/_qpoint.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QPOINT_H_
-#define QPOINT_H_
+#ifndef _QPOINT_H_
+#define _QPOINT_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -50,9 +50,7 @@ public:
QPoint();
QPoint(int, int);
-
- // QPoint(const QPoint &);
- // default copy constructor is fine
+ QPoint(const QPoint &);
// add no-op destructor
#ifdef _KWQ_PEDANTIC_
@@ -66,6 +64,10 @@ public:
int manhattanLength() const;
+ bool isNull() const;
+ void setX(int);
+ void setY(int);
+
// operators ---------------------------------------------------------------
/* Note: Trolltech seems to want operator= to be a bitwise copy
@@ -75,13 +77,29 @@ public:
friend QPoint operator+(const QPoint &, const QPoint &);
friend QPoint operator-(const QPoint &, const QPoint &);
+ QPoint &operator+=(const QPoint &);
+ QPoint &operator-=(const QPoint &);
+ QPoint &operator*=(int);
+ QPoint &operator*=(double);
+ QPoint &operator/=(int);
+ QPoint &operator/=(double);
+
+ friend bool operator==(const QPoint &, const QPoint &);
+ friend bool operator!=(const QPoint &, const QPoint &);
+ friend QPoint operator*(const QPoint &, int);
+ friend QPoint operator*(int, const QPoint &);
+ friend QPoint operator*(const QPoint &, double);
+ friend QPoint operator*(double, const QPoint &);
+ friend QPoint operator-(const QPoint &);
+ friend QPoint operator/(const QPoint &, int);
+ friend QPoint operator/(const QPoint &, double);
+
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
-private:
- QCOORD xCoord;
- QCOORD yCoord;
+ QCOORD xx;
+ QCOORD yy;
}; // class QPoint =============================================================
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/_qrect.h
similarity index 71%
copy from WebCore/src/kwq/qt/qrect.h
copy to WebCore/src/kwq/qt/_qrect.h
index ad8bfb9..78ae7ce 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/_qrect.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QRECT_H_
-#define QRECT_H_
+#ifndef _QRECT_H_
+#define _QRECT_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -50,11 +50,14 @@ public:
// constructors, copy constructors, and destructors ------------------------
QRect();
- QRect(QPoint p, QSize s);
QRect(int, int, int, int);
- // QRect(const QRect &);
- // default copy constructor is fine
+ QRect(const QRect &);
+#ifdef USING_BORROWED_QRECT
+ QRect(const QPoint &, const QPoint &);
+ QRect(const QPoint &, const QSize &);
+#endif
+
// add no-op destructor
#ifdef _KWQ_PEDANTIC_
~QRect() {}
@@ -74,13 +77,48 @@ public:
int width() const;
int height() const;
- QPoint topLeft() const;
QSize size() const;
void setWidth(int);
void setHeight(int);
QRect intersect(const QRect &) const;
bool intersects(const QRect &) const;
+#ifdef USING_BORROWED_QRECT
+ bool isEmpty() const;
+ QRect normalize() const;
+
+ void setLeft(int);
+ void setTop(int);
+ void setRight(int);
+ void setBottom(int);
+ void setX(int);
+ void setY(int);
+
+ QPoint topLeft() const;
+ QPoint bottomRight() const;
+ QPoint topRight() const;
+ QPoint bottomLeft() const;
+ QPoint center() const;
+
+ void rect(int *, int *, int *, int *) const;
+ void coords(int *, int *, int *, int *) const;
+
+ void setSize(const QSize &);
+ void setRect(int, int, int, int);
+ void setCoords(int, int, int, int);
+
+ void moveTopLeft(const QPoint &);
+ void moveBottomRight(const QPoint &);
+ void moveTopRight(const QPoint &);
+ void moveBottomLeft(const QPoint &);
+ void moveCenter(const QPoint &);
+ void moveBy(int, int);
+
+ bool contains(const QPoint &, bool proper=FALSE) const;
+ bool contains(int, int, bool proper=FALSE) const;
+ bool contains(const QRect &, bool proper=FALSE) const;
+ QRect unite(const QRect &) const;
+#endif // USING_BORROWED_QRECT
// operators ---------------------------------------------------------------
@@ -90,6 +128,15 @@ public:
QRect operator&(const QRect &) const;
+#ifdef USING_BORROWED_QRECT
+ friend bool operator==(const QRect &, const QRect &);
+ friend bool operator!=(const QRect &, const QRect &);
+
+ QRect operator|(const QRect &) const;
+ QRect& operator|=(const QRect &);
+ QRect& operator&=(const QRect &);
+#endif
+
#ifdef _KWQ_IOSTREAM_
friend ostream &operator<<(ostream &, const QRect &);
#endif
@@ -98,14 +145,11 @@ public:
// private ---------------------------------------------------------------------
-private:
- QCOORD xp;
- QCOORD yp;
- QCOORD w;
- QCOORD h;
+ QCOORD x1;
+ QCOORD x2;
+ QCOORD y1;
+ QCOORD y2;
- friend bool operator==(const QRect &, const QRect &);
- friend bool operator!=(const QRect &, const QRect &);
}; // class QRect ==============================================================
// operators associated with QRect =============================================
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/src/kwq/qt/_qsize.h
similarity index 79%
copy from WebCore/src/kwq/qt/qsize.h
copy to WebCore/src/kwq/qt/_qsize.h
index 43fca06..e5465ae 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/src/kwq/qt/_qsize.h
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSIZE_H_
-#define QSIZE_H_
+#ifndef _QSIZE_H_
+#define _QSIZE_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -48,7 +48,7 @@ public:
QSize();
QSize(int,int);
- // QSize(const QSize &);
+ QSize(const QSize &);
// add no-op destructor
#ifdef _KWQ_PEDANTIC_
@@ -64,6 +64,13 @@ public:
void setHeight(int);
QSize expandedTo(const QSize &) const;
+#ifdef USING_BORROWED_QSIZE
+ bool isNull() const;
+ bool isEmpty() const;
+ void transpose();
+ QSize boundedTo(const QSize &) const;
+#endif
+
// operators ---------------------------------------------------------------
/* Note: Trolltech seems to want operator= to be a bitwise copy
@@ -74,6 +81,22 @@ public:
friend bool operator==(const QSize &, const QSize &);
friend bool operator!=(const QSize &, const QSize &);
+#ifdef USING_BORROWED_QSIZE
+ QSize &operator+=(const QSize &);
+ QSize &operator-=(const QSize &);
+ QSize &operator*=(int);
+ QSize &operator*=(double);
+ QSize &operator/=(int);
+ QSize &operator/=(double);
+
+ friend QSize operator-(const QSize &, const QSize &);
+ friend QSize operator*(const QSize &, int);
+ friend QSize operator*(int, const QSize &);
+ friend QSize operator*(const QSize &, double);
+ friend QSize operator*(double, const QSize &);
+ friend QSize operator/(const QSize &, int);
+ friend QSize operator/(const QSize &, double);
+#endif
#ifdef _KWQ_IOSTREAM_
friend ostream &operator<<(ostream &, const QSize &);
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index bebe621..eac4a72 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -30,6 +30,12 @@
#include <config.h>
#endif
+#ifdef USING_BORROWED_QPOINT
+
+#include <_qpoint.h>
+
+#else /* !USING_BORROWED_QPOINT */
+
#include <iostream>
#include <KWQDef.h>
@@ -126,3 +132,5 @@ public:
}; // class QPointArray ========================================================
#endif
+
+#endif /* USING_BORROWED_QPOINT */
diff --git a/WebCore/src/kwq/qt/qrect.h b/WebCore/src/kwq/qt/qrect.h
index ad8bfb9..6849715 100644
--- a/WebCore/src/kwq/qt/qrect.h
+++ b/WebCore/src/kwq/qt/qrect.h
@@ -26,6 +26,12 @@
#ifndef QRECT_H_
#define QRECT_H_
+#ifdef USING_BORROWED_QRECT
+
+#include <_qrect.h>
+
+#else
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -114,3 +120,5 @@ bool operator==(const QRect &, const QRect &);
bool operator!=(const QRect &, const QRect &);
#endif
+
+#endif
diff --git a/WebCore/src/kwq/qt/qsize.h b/WebCore/src/kwq/qt/qsize.h
index 43fca06..16fd017 100644
--- a/WebCore/src/kwq/qt/qsize.h
+++ b/WebCore/src/kwq/qt/qsize.h
@@ -26,6 +26,12 @@
#ifndef QSIZE_H_
#define QSIZE_H_
+#ifdef USING_BORROWED_QSIZE
+
+#include <_qsize.h>
+
+#else
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -89,3 +95,5 @@ public:
}; // class QSize ==============================================================
#endif
+
+#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list