[pkgsrc/trunk]: pkgsrc/databases/krecipes Fix conflicting local redefinition ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ade626a9d216
branches:  trunk
changeset: 610481:ade626a9d216
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 26 20:19:40 2012 +0000

description:
Fix conflicting local redefinition of an iterator.

diffstat:

 databases/krecipes/distinfo                                                 |   3 +-
 databases/krecipes/patches/patch-krecipes_src_dialogs_ingredientsdialog.cpp |  20 ++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 92e6d657e385 -r ade626a9d216 databases/krecipes/distinfo
--- a/databases/krecipes/distinfo       Fri Oct 26 20:16:44 2012 +0000
+++ b/databases/krecipes/distinfo       Fri Oct 26 20:19:40 2012 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2011/11/24 14:15:41 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/10/26 20:19:40 joerg Exp $
 
 SHA1 (krecipes-1.0-beta1.tar.gz) = c1274f035476778d9b3f85bc007752ba0af841e3
 RMD160 (krecipes-1.0-beta1.tar.gz) = c32732255bbf530932fa3183581be72e12e7a2d2
 Size (krecipes-1.0-beta1.tar.gz) = 8682447 bytes
 SHA1 (patch-aa) = 073893dcf03798122eaa0161100d7b56e35e4715
+SHA1 (patch-krecipes_src_dialogs_ingredientsdialog.cpp) = 09b8a1276931ce1a6a54ee399c0be128e79abc90
 SHA1 (patch-krecipes_src_importers_kreimporter.h) = e875275b530ec7246d1276d67854506780586a80
 SHA1 (patch-krecipes_src_importers_recipemlimporter.h) = 004385da2f3104f5ea72a02fa866577a2e4d82ca
diff -r 92e6d657e385 -r ade626a9d216 databases/krecipes/patches/patch-krecipes_src_dialogs_ingredientsdialog.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/krecipes/patches/patch-krecipes_src_dialogs_ingredientsdialog.cpp       Fri Oct 26 20:19:40 2012 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-krecipes_src_dialogs_ingredientsdialog.cpp,v 1.1 2012/10/26 20:19:40 joerg Exp $
+
+--- krecipes/src/dialogs/ingredientsdialog.cpp.orig    2012-10-26 18:14:37.000000000 +0000
++++ krecipes/src/dialogs/ingredientsdialog.cpp
+@@ -551,12 +551,12 @@ void IngredientsDialog::reloadWeightList
+                       QListViewItem * lastElement = weightsListView->listView() ->lastItem();
+ 
+                       Weight w = *weight_it;
+-                      WeightListItem *weight_it = new WeightListItem( weightsListView->listView(), lastElement, w );
+-                      weight_it->setAmountUnit( w.perAmount,
++                      WeightListItem *weight_it2 = new WeightListItem( weightsListView->listView(), lastElement, w );
++                      weight_it2->setAmountUnit( w.perAmount,
+                         database->unitName(w.perAmountUnitID),
+                         Element((w.prepMethodID==-1)?QString::null:database->prepMethodName(w.prepMethodID),w.prepMethodID)
+                       );
+-                      weight_it->setWeightUnit( w.weight, database->unitName(w.weightUnitID) );
++                      weight_it2->setWeightUnit( w.weight, database->unitName(w.weightUnitID) );
+               }
+       }
+ }