Updated to build with gcc 4.7.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 3ec8e94..fab09c3 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -2106,15 +2106,15 @@ RosegardenGUIDoc::stopRecordingMidi()
 
         bool meaningless = true;
 
-        for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
+        for (Segment::iterator j = s->begin(); j != s->end(); ++j) {
 
-            if ((*i)->isa(Clef::EventType)) continue;
+            if ((*j)->isa(Clef::EventType)) continue;
 
             // no rests in the segment yet, so anything else is meaningful
             meaningless = false;
 
-            if (!haveMeaning || (*i)->getAbsoluteTime() < earliestMeaning) {
-                earliestMeaning = (*i)->getAbsoluteTime();
+            if (!haveMeaning || (*j)->getAbsoluteTime() < earliestMeaning) {
+                earliestMeaning = (*j)->getAbsoluteTime();
             }
 
             haveMeaning = true;
@@ -2149,13 +2149,13 @@ RosegardenGUIDoc::stopRecordingMidi()
          ++i) {
 
         Segment *s = i->second;
-        Segment::iterator i = s->begin();
+        Segment::iterator j = s->begin();
 
-        if (i == s->end() || !(*i)->isa(Clef::EventType)) continue;
+        if (j == s->end() || !(*j)->isa(Clef::EventType)) continue;
 
-        if ((*i)->getAbsoluteTime() < meaningfulBarStart) {
-            Event *e = new Event(**i, meaningfulBarStart);
-            s->erase(i);
+        if ((*j)->getAbsoluteTime() < meaningfulBarStart) {
+            Event *e = new Event(**j, meaningfulBarStart);
+            s->erase(j);
             s->insert(e);
         }
     }