Fix template look up.

3 files changed, 24 insertions, 5 deletions

diff --git a/graphics/kphotoalbum/distinfo b/graphics/kphotoalbum/distinfo
index 2f5d7836e72..2c967abac2b 100644
--- a/graphics/kphotoalbum/distinfo
+++ b/graphics/kphotoalbum/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/11/24 14:00:53 joerg Exp $
+$NetBSD: distinfo,v 1.8 2012/12/22 20:01:44 joerg Exp $
 
 SHA1 (kphotoalbum-3.1.1.tar.bz2) = 28957f177adda08caba1935e05b7e3dc20e7649e
 RMD160 (kphotoalbum-3.1.1.tar.bz2) = 8bda36262a160f8f0db994698bf337ee89b95a7b
@@ -6,4 +6,5 @@ Size (kphotoalbum-3.1.1.tar.bz2) = 15503061 bytes
 SHA1 (patch-aa) = 8ff3f4b51f45098c907497897f5e63c6d36bf767
 SHA1 (patch-ab) = f80b02e6705b82202827a230c3a568f97eb59056
 SHA1 (patch-src_MainWindow_Window.cpp) = dec64f9c3651c7d13cb2b6402bfc86fbf27dbc28
-SHA1 (patch-src_Utilities_Set.cpp) = c8960cd10a05cebfb65570907cca41f9c2b49e13
+SHA1 (patch-src_Utilities_Set.cpp) = 00c3478fa36d1f1e2fe1012985f4d0fb4047edc3
+SHA1 (patch-src_Utilities_Set.h) = abbdefb666460ea899ec29768097db3bc77c38a6
diff --git a/graphics/kphotoalbum/patches/patch-src_Utilities_Set.cpp b/graphics/kphotoalbum/patches/patch-src_Utilities_Set.cpp
index 7e54c68dba7..74d03dbfd93 100644
--- a/graphics/kphotoalbum/patches/patch-src_Utilities_Set.cpp
+++ b/graphics/kphotoalbum/patches/patch-src_Utilities_Set.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_Utilities_Set.cpp,v 1.1 2011/11/24 14:00:53 joerg Exp $
+$NetBSD: patch-src_Utilities_Set.cpp,v 1.2 2012/12/22 20:01:45 joerg Exp $
 
---- src/Utilities/Set.cpp.orig	2011-11-24 02:03:09.000000000 +0000
+--- src/Utilities/Set.cpp.orig	2008-03-17 18:56:18.000000000 +0000
 +++ src/Utilities/Set.cpp
 @@ -39,7 +39,7 @@ QValueList<T> Utilities::Set<T>::toList(
  }
@@ -11,7 +11,7 @@ $NetBSD: patch-src_Utilities_Set.cpp,v 1.1 2011/11/24 14:00:53 joerg Exp $
  {
      for (typename Set<T>::const_iterator i = other.begin();
           i != other.end(); ++i)
-@@ -48,7 +48,7 @@ Utilities::Set<T>::Set<T>& Utilities::Se
+@@ -48,11 +48,11 @@ Utilities::Set<T>::Set<T>& Utilities::Se
  }
  
  template <class T>
@@ -20,3 +20,8 @@ $NetBSD: patch-src_Utilities_Set.cpp,v 1.1 2011/11/24 14:00:53 joerg Exp $
  {
      for (typename Set<T>::const_iterator i = other.begin();
           i != other.end(); ++i)
+-        erase(*i);
++        this->erase(*i);
+     return *this;
+ }
+ 
diff --git a/graphics/kphotoalbum/patches/patch-src_Utilities_Set.h b/graphics/kphotoalbum/patches/patch-src_Utilities_Set.h
new file mode 100644
index 00000000000..450ecc8d96a
--- /dev/null
+++ b/graphics/kphotoalbum/patches/patch-src_Utilities_Set.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Utilities_Set.h,v 1.1 2012/12/22 20:01:45 joerg Exp $
+
+--- src/Utilities/Set.h.orig	2012-12-22 19:04:37.000000000 +0000
++++ src/Utilities/Set.h
+@@ -50,7 +50,7 @@ namespace Utilities
+ 
+         bool contains(const T& x) const
+         {
+-            return count(x) > 0;
++            return this->count(x) > 0;
+         }
+ 
+         Set<T>& operator+=(const Set<T>& other);