[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:45:58 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0190eb426259756a38d23ab27bd39de34634d961
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 21 16:27:22 2001 +0000
Bug fixes resulting from writing qpoint unit test
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index db06f22..7607f39 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -30,6 +30,8 @@
#include <config.h>
#endif
+#include <iostream>
+
#include <KWQDef.h>
#include "qarray.h"
@@ -85,15 +87,15 @@ public:
QPoint &operator/=(int);
QPoint &operator/=(double);
- friend inline bool operator==(const QPoint &, const QPoint &);
- friend inline bool operator!=(const QPoint &, const QPoint &);
- friend inline QPoint operator*(const QPoint &, int);
- friend inline QPoint operator*(int, const QPoint &);
- friend inline QPoint operator*(const QPoint &, double);
- friend inline QPoint operator*(double, const QPoint &);
- friend inline QPoint operator-(const QPoint &);
- friend inline QPoint operator/(const QPoint &, int);
- friend inline QPoint operator/(const QPoint &, 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);
#endif
// protected -------------------------------------------------------------------
@@ -131,6 +133,10 @@ public:
QPointArray &operator=(const QPointArray &);
+#ifdef _KWQ_IOSTREAM_
+ friend ostream &operator<<(ostream &, const QPoint &);
+#endif
+
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/kwq/qt/Makefile.in
index 1a524ce..82e0aba 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/kwq/qt/Makefile.in
@@ -15,6 +15,7 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -29,6 +30,7 @@ CLEAN_FILES = *.o \
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
+ -I$(TOPSRCDIR) \
-I.. \
-I. \
$(NULL)
@@ -44,8 +46,6 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/kwq/qt/_qpoint.cpp b/WebCore/kwq/qt/_qpoint.cpp
index 5d69f26..da705f8 100644
--- a/WebCore/kwq/qt/_qpoint.cpp
+++ b/WebCore/kwq/qt/_qpoint.cpp
@@ -18,7 +18,7 @@
// -------------------------------------------------------------------------
-#include <qpoint.h>
+#include "qpoint.h"
// for abs()
#include <stdlib.h>
@@ -35,6 +35,12 @@ QPoint::QPoint(int xpos, int ypos)
yy = (QCOORD)ypos;
}
+QPoint::QPoint(const QPoint &other)
+{
+ xx = other.xx;
+ yy = other.yy;
+}
+
int QPoint::x() const
{
return xx;
@@ -60,6 +66,18 @@ int QPoint::manhattanLength() const
return abs(xx) + abs(yy);
}
+#ifdef _KWQ_IOSTREAM_
+ostream &operator<<(ostream &o, const QPoint &p)
+{
+ return o <<
+ "QPoint: [x: " <<
+ (Q_INT32)p.xx <<
+ "; h: " <<
+ (Q_INT32)p.yy <<
+ ']';
+}
+#endif
+
// KWQ_COMPLETE implementations ------------------------------------------
#ifdef _KWQ_COMPLETE_
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index db06f22..7607f39 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -30,6 +30,8 @@
#include <config.h>
#endif
+#include <iostream>
+
#include <KWQDef.h>
#include "qarray.h"
@@ -85,15 +87,15 @@ public:
QPoint &operator/=(int);
QPoint &operator/=(double);
- friend inline bool operator==(const QPoint &, const QPoint &);
- friend inline bool operator!=(const QPoint &, const QPoint &);
- friend inline QPoint operator*(const QPoint &, int);
- friend inline QPoint operator*(int, const QPoint &);
- friend inline QPoint operator*(const QPoint &, double);
- friend inline QPoint operator*(double, const QPoint &);
- friend inline QPoint operator-(const QPoint &);
- friend inline QPoint operator/(const QPoint &, int);
- friend inline QPoint operator/(const QPoint &, 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);
#endif
// protected -------------------------------------------------------------------
@@ -131,6 +133,10 @@ public:
QPointArray &operator=(const QPointArray &);
+#ifdef _KWQ_IOSTREAM_
+ friend ostream &operator<<(ostream &, const QPoint &);
+#endif
+
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kwq/qt/Makefile.in
index 1a524ce..82e0aba 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kwq/qt/Makefile.in
@@ -15,6 +15,7 @@ include $(TOPSRCDIR)/Makefile.vars
#----------------------------------------------------------------------
# Set variables for this directory
+SOURCES = $(wildcard *.cpp)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
@@ -29,6 +30,7 @@ CLEAN_FILES = *.o \
# Set flags for this directory
CXXFLAGS = $(BASECXXFLAGS) \
+ -I$(TOPSRCDIR) \
-I.. \
-I. \
$(NULL)
@@ -44,8 +46,6 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend:
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kwq/qt/_qpoint.cpp b/WebCore/src/kwq/qt/_qpoint.cpp
index 5d69f26..da705f8 100644
--- a/WebCore/src/kwq/qt/_qpoint.cpp
+++ b/WebCore/src/kwq/qt/_qpoint.cpp
@@ -18,7 +18,7 @@
// -------------------------------------------------------------------------
-#include <qpoint.h>
+#include "qpoint.h"
// for abs()
#include <stdlib.h>
@@ -35,6 +35,12 @@ QPoint::QPoint(int xpos, int ypos)
yy = (QCOORD)ypos;
}
+QPoint::QPoint(const QPoint &other)
+{
+ xx = other.xx;
+ yy = other.yy;
+}
+
int QPoint::x() const
{
return xx;
@@ -60,6 +66,18 @@ int QPoint::manhattanLength() const
return abs(xx) + abs(yy);
}
+#ifdef _KWQ_IOSTREAM_
+ostream &operator<<(ostream &o, const QPoint &p)
+{
+ return o <<
+ "QPoint: [x: " <<
+ (Q_INT32)p.xx <<
+ "; h: " <<
+ (Q_INT32)p.yy <<
+ ']';
+}
+#endif
+
// KWQ_COMPLETE implementations ------------------------------------------
#ifdef _KWQ_COMPLETE_
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index db06f22..7607f39 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -30,6 +30,8 @@
#include <config.h>
#endif
+#include <iostream>
+
#include <KWQDef.h>
#include "qarray.h"
@@ -85,15 +87,15 @@ public:
QPoint &operator/=(int);
QPoint &operator/=(double);
- friend inline bool operator==(const QPoint &, const QPoint &);
- friend inline bool operator!=(const QPoint &, const QPoint &);
- friend inline QPoint operator*(const QPoint &, int);
- friend inline QPoint operator*(int, const QPoint &);
- friend inline QPoint operator*(const QPoint &, double);
- friend inline QPoint operator*(double, const QPoint &);
- friend inline QPoint operator-(const QPoint &);
- friend inline QPoint operator/(const QPoint &, int);
- friend inline QPoint operator/(const QPoint &, 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);
#endif
// protected -------------------------------------------------------------------
@@ -131,6 +133,10 @@ public:
QPointArray &operator=(const QPointArray &);
+#ifdef _KWQ_IOSTREAM_
+ friend ostream &operator<<(ostream &, const QPoint &);
+#endif
+
// protected -------------------------------------------------------------------
// private ---------------------------------------------------------------------
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list