removeItem and appendItem are the public functions, so use them.

Remove unnecessary class reference in a nested class declaration.
Fixes build with GCC 3.4.

5 files changed, 81 insertions, 1 deletions

diff --git a/games/boson/distinfo b/games/boson/distinfo
index 5af960ab8c0..47bacbd75b2 100644
--- a/games/boson/distinfo
+++ b/games/boson/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2006/05/26 22:47:19 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/06/21 20:46:28 joerg Exp $
 
 SHA1 (boson-all-0.8.tar.bz2) = 8af09f0632e0483e8d0ebd279ea302bbaa3518a7
 RMD160 (boson-all-0.8.tar.bz2) = eb894699fefa422ca05fde5e1a3b2cd864d4ecbb
 Size (boson-all-0.8.tar.bz2) = 32271883 bytes
 SHA1 (patch-aa) = a95b4abb4d13fce5731192b9f99a8e6baf69af69
 SHA1 (patch-ab) = 5ff072e94bbdb6d0f3e2876852f0f8e1c8586a54
+SHA1 (patch-ac) = 13f5668982ae5a1930640d8baba6dbd2a5dfd027
+SHA1 (patch-ad) = c2004c4d2a9fbf908a511c8aa39ab6b46ea0c930
+SHA1 (patch-ae) = f2c219e7d9deb7c7c7c16b73e6f3f1d4a81b3c13
+SHA1 (patch-af) = f5b50b1b044eea72ebb3a64cb2dc194d261a4ff0
diff --git a/games/boson/patches/patch-ac b/games/boson/patches/patch-ac
new file mode 100644
index 00000000000..ec7c5ae98a6
--- /dev/null
+++ b/games/boson/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1 2006/06/21 20:46:28 joerg Exp $
+
+--- boson/bosoncanvas.cpp.orig	2006-06-21 17:58:06.000000000 +0000
++++ boson/bosoncanvas.cpp
+@@ -911,12 +911,12 @@ unsigned int BosonCanvas::allItemsCount(
+ 
+ void BosonCanvas::addItem(BosonItem* item)
+ {
+- d->mAllItems.append(item);
++ d->mAllItems.appendItem(item);
+ }
+ 
+ void BosonCanvas::removeItem(BosonItem* item)
+ {
+- d->mAllItems.remove(item);
++ d->mAllItems.removeItem(item);
+  emit signalRemovedItem(item);
+ }
+ 
diff --git a/games/boson/patches/patch-ad b/games/boson/patches/patch-ad
new file mode 100644
index 00000000000..7d7c3fb45fb
--- /dev/null
+++ b/games/boson/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/06/21 20:46:28 joerg Exp $
+
+--- boson/bosoncollisions.cpp.orig	2006-06-21 18:45:21.000000000 +0000
++++ boson/bosoncollisions.cpp
+@@ -232,7 +232,7 @@ BoItemList* BosonCollisions::collisionsA
+ 		s = *it;
+ 		if (s != item) {
+ 			if (collisions->findIndex(s) < 0 && (!item || !exact || item->bosonCollidesWith(s))) {
+-				collisions->append(s);
++				collisions->appendItem(s);
+ 			}
+ 		}
+ 	}
diff --git a/games/boson/patches/patch-ae b/games/boson/patches/patch-ae
new file mode 100644
index 00000000000..27b1c9ba4ea
--- /dev/null
+++ b/games/boson/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/06/21 20:46:28 joerg Exp $
+
+--- boson/bosonpath.h.orig	2006-06-21 18:53:42.000000000 +0000
++++ boson/bosonpath.h
+@@ -135,7 +135,7 @@ class BosonPath
+     float mPathCost;
+     int mRange;
+ 
+-    class BosonPath::Marking
++    class Marking
+     {
+       public:
+         Marking() { dir = DirNone; f = -1; g = -1; c = -1; level = -1; }
diff --git a/games/boson/patches/patch-af b/games/boson/patches/patch-af
new file mode 100644
index 00000000000..4cce91ae688
--- /dev/null
+++ b/games/boson/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 2006/06/21 20:46:28 joerg Exp $
+
+--- boson/unit.cpp.orig	2006-06-21 18:55:20.000000000 +0000
++++ boson/unit.cpp
+@@ -1083,7 +1083,7 @@ BoItemList* Unit::unitsInRange(unsigned 
+  QRect rect;
+  rect.setCoords(left - range, top - range, right + range, bottom + range);
+  BoItemList* items = collisions()->collisionsAtCells(rect, (BosonItem*)this, false);
+- items->remove((BosonItem*)this);
++ items->removeItem((BosonItem*)this);
+ 
+  BoItemList* inRange = new BoItemList();
+  BoItemList::Iterator it = items->begin();
+@@ -1101,7 +1101,7 @@ BoItemList* Unit::unitsInRange(unsigned 
+ 	}
+ 	// TODO: remove the items from inRange which are not actually in range (hint:
+ 	// pythagoras)
+-	inRange->append(*it);
++	inRange->appendItem(*it);
+  }
+  return inRange;
+ }
+@@ -1115,7 +1115,7 @@ BoItemList* Unit::enemyUnitsInRange(unsi
+  for (; it != units->end(); ++it) {
+ 	u = (Unit*)*it;
+ 	if (owner()->isEnemy(u->owner())) {
+-		enemy->append(u);
++		enemy->appendItem(u);
+ 	}
+  }
+  return enemy;