Merge lp:~toni-ruottu/kunquat/fixenums into lp:kunquat/0.2

[Toni Ruottu]

=== modified file 'kunquat/qt/typewriter.py'
--- kunquat/qt/typewriter.py	2012-08-28 20:56:55 +0000
+++ kunquat/qt/typewriter.py	2012-11-02 19:42:20 +0000
@@ -74,18 +74,12 @@
     def get_view(self):
         return self._twview
 
-    def all_ints(self):
-        i = 0
-        while True:
-            yield i
-            i += 1
-
     def get_keymap(self):
         return dict(self.keymap_helper(self.keys))
 
     def keymap_helper(self, mapping):
-        for row, buttons in zip(self.all_ints(), mapping):
-            for but, key in zip(self.all_ints(), buttons):
+        for row, buttons in enumerate(mapping):
+            for but, key in enumerate(buttons):
                 yield (key, (row, but))
 
     def count_rows(self):

=== modified file 'kunquat/qt/typewriter_model.py'
--- kunquat/qt/typewriter_model.py	2012-08-29 06:16:41 +0000
+++ kunquat/qt/typewriter_model.py	2012-11-02 19:42:20 +0000
@@ -18,15 +18,9 @@
         self._dice = [unichr(i) for i in dice_code]
         self._die = self._dice[4]
 
-    def all_ints(self):
-        i = 0
-        while True:
-            yield i
-            i += 1
-
     def notemap_helper(self, mapping):
-        for row, buttons in zip(self.all_ints(), mapping):
-            for but, note in zip(self.all_ints(), buttons):
+        for row, buttons in enumerate(mapping):
+            for but, note in enumerate(buttons):
                 yield ((row, but), note)
 
     def get_notemap(self):

=== modified file 'kunquat/qt/typewriter_view.py'
--- kunquat/qt/typewriter_view.py	2012-09-22 18:39:57 +0000
+++ kunquat/qt/typewriter_view.py	2012-11-02 19:42:20 +0000
@@ -28,14 +28,8 @@
         # Reserving 0 pixels does not work properly
         self.setMinimumHeight(1)
 
-    def all_ints(self):
-        i = 0
-        while True:
-            yield i
-            i += 1
-
     def create_rows(self, button_layout):
-        for (i, buttons) in zip(self.all_ints(), button_layout):
+        for (i, buttons) in enumerate(button_layout):
             yield self.create_row(i, buttons)
 
     def special_button(self, rowc):

=== modified file 'kunquat/tracker/toolbar.py'
--- kunquat/tracker/toolbar.py	2012-09-23 15:39:15 +0000
+++ kunquat/tracker/toolbar.py	2012-11-02 19:42:20 +0000
@@ -174,16 +174,10 @@
         index = self._scale_selector.findText(s)
         self._scale_selector.setCurrentIndex(index)
 
-    def all_ints(self):
-        i = 0
-        while True:
-            yield i
-            i += 1
-
     def update_scales(self):
         current = 0
 
-        for i, s in zip(self.all_ints(), self.p._scales):
+        for i, s in enumerate(self.p._scales):
             if s == self.p._scale:
                 current = i