Fix GCC 3.4 by adding explicit this for template calls.

2 files changed, 72 insertions, 1 deletions

diff --git a/x11/qwspritefield/distinfo b/x11/qwspritefield/distinfo
index 1f257612b45..af4499710ce 100644
--- a/x11/qwspritefield/distinfo
+++ b/x11/qwspritefield/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:36:19 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/12/12 15:16:36 joerg Exp $
 
 SHA1 (QwSpriteField1.6.tar.gz) = 44e55d8a2613eb33dbf1a2ad194e39159760f6d7
 RMD160 (QwSpriteField1.6.tar.gz) = a7ce26952c09b1ff9b926e50102222acb9b19137
 Size (QwSpriteField1.6.tar.gz) = 607801 bytes
 SHA1 (patch-aa) = d0cb9816fd429d01b98e68269997e101b9c20216
 SHA1 (patch-ab) = 09e46d84f7d3ec29b1927bb96d27229eee832a76
+SHA1 (patch-ac) = 5e0f3eb5267efc9a4d0c3f5ea586af3fd0e20f45
diff --git a/x11/qwspritefield/patches/patch-ac b/x11/qwspritefield/patches/patch-ac
new file mode 100644
index 00000000000..6b25ac6b5f6
--- /dev/null
+++ b/x11/qwspritefield/patches/patch-ac
@@ -0,0 +1,70 @@
+$NetBSD: patch-ac,v 1.1 2005/12/12 15:16:36 joerg Exp $
+
+--- QwSpriteField-template.cpp.orig	2005-12-12 15:06:17.000000000 +0000
++++ QwSpriteField-template.cpp
+@@ -325,8 +325,8 @@ This is the default when the sprite is c
+ template <class COORD>
+ void QwMobilePositionedSprite<COORD>::adoptSpritefieldBounds()
+ {
+-    if (spritefield) {
+-        bounds(0,0,spritefield->width()-1,spritefield->height()-1);
++    if (this->spritefield) {
++        bounds(0,0,this->spritefield->width()-1,this->spritefield->height()-1);
+     } else {
+         // Simple default so programmer can see the problem
+         bounds(0,0,50,50);
+@@ -373,8 +373,8 @@ happen if the bounds action is set to Ig
+ template <class COORD>
+ bool QwMobilePositionedSprite<COORD>::outOfBounds()
+ {
+-    return (exact_x()<b_left) || (exact_x()>b_right)
+-        || (exact_y()<b_top) || (exact_y()>b_bottom);
++    return (this->exact_x()<b_left) || (this->exact_x()>b_right)
++        || (this->exact_y()<b_top) || (this->exact_y()>b_bottom);
+ }
+ 
+ /*!
+@@ -459,7 +459,7 @@ multiplied by the current velocity of th
+ template <class COORD>
+ void QwMobilePositionedSprite<COORD>::forward(COORD multiplier)
+ {
+-    QwPositionedSprite<COORD>::moveTo(exact_x()+multiplier*dx, exact_y()+multiplier*dy);
++    QwPositionedSprite<COORD>::moveTo(this->exact_x()+multiplier*dx, this->exact_y()+multiplier*dy);
+ }
+ 
+ /*!
+@@ -473,9 +473,9 @@ has already been dealt with.
+ template <class COORD>
+ Pix QwMobilePositionedSprite<COORD>::forwardHits(COORD multiplier, int frme) const
+ {
+-    int ix = int(exact_x()+multiplier*dx);
+-    int iy = int(exact_y()+multiplier*dy);
+-    if (ix == x() && iy == y())
++    int ix = int(this->exact_x()+multiplier*dx);
++    int iy = int(this->exact_y()+multiplier*dy);
++    if (ix == this->x() && iy == this->y())
+ 	return 0;
+     return QwPositionedSprite<COORD>::neighbourhood((COORD)ix, (COORD)iy, frme);
+ }
+@@ -491,9 +491,9 @@ has already been dealt with.
+ template <class COORD>
+ Pix QwMobilePositionedSprite<COORD>::forwardHits(COORD multiplier) const
+ {
+-    int ix = int(exact_x()+multiplier*dx);
+-    int iy = int(exact_y()+multiplier*dy);
+-    if (ix == x() && iy == y())
++    int ix = int(this->exact_x()+multiplier*dx);
++    int iy = int(this->exact_y()+multiplier*dy);
++    if (ix == this->x() && iy == this->y())
+ 	return 0;
+     return QwPositionedSprite<COORD>::neighbourhood(ix, iy);
+ }
+@@ -507,7 +507,7 @@ the given index.
+ template <class COORD>
+ void QwMobilePositionedSprite<COORD>::forward(COORD multiplier, int frme)
+ {
+-    moveTo(exact_x()+multiplier*dx, exact_y()+multiplier*dy, frme);
++    moveTo(this->exact_x()+multiplier*dx, this->exact_y()+multiplier*dy, frme);
+ }
+ 
+ /*!