diff data/model/AlignmentModel.cpp @ 949:5f7b509a441a tonioni

Merge from default branch
author Chris Cannam
date Fri, 18 Jul 2014 11:07:30 +0100
parents cd42620e3f40
children 13f53ecc8bb5
line wrap: on
line diff
--- a/data/model/AlignmentModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/AlignmentModel.cpp	Fri Jul 18 11:07:30 2014 +0100
@@ -37,8 +37,8 @@
         connect(m_rawPath, SIGNAL(modelChanged()),
                 this, SLOT(pathChanged()));
 
-        connect(m_rawPath, SIGNAL(modelChanged(int, int)),
-                this, SLOT(pathChanged(int, int)));
+        connect(m_rawPath, SIGNAL(modelChangedWithin(int, int)),
+                this, SLOT(pathChangedWithin(int, int)));
         
         connect(m_rawPath, SIGNAL(completionChanged()),
                 this, SLOT(pathCompletionChanged()));
@@ -175,7 +175,7 @@
 }
 
 void
-AlignmentModel::pathChanged(int, int)
+AlignmentModel::pathChangedWithin(int, int)
 {
     if (!m_pathComplete) return;
     constructPath();