# HG changeset patch
# User Chris Cannam
# Date 1403015095 -3600
# Node ID df82da55e86a2f7a7fabe503925aff2ff0450364
# Parent  06579b8ffb7b987be7e91f14e31fb66c36013b4f
Disambiguate signals

diff -r 06579b8ffb7b -r df82da55e86a data/model/EditableDenseThreeDimensionalModel.cpp
--- a/data/model/EditableDenseThreeDimensionalModel.cpp	Tue Jun 17 14:49:49 2014 +0100
+++ b/data/model/EditableDenseThreeDimensionalModel.cpp	Tue Jun 17 15:24:55 2014 +0100
@@ -367,7 +367,7 @@
 	if (allChange) {
 	    emit modelChanged();
 	} else {
-	    emit modelChanged(windowStart, windowStart + m_resolution);
+	    emit modelChangedWithin(windowStart, windowStart + m_resolution);
 	}
     } else {
 	if (allChange) {
@@ -487,8 +487,8 @@
 	    if (update &&
                 m_sinceLastNotifyMin >= 0 &&
 		m_sinceLastNotifyMax >= 0) {
-		emit modelChanged(m_sinceLastNotifyMin,
-				  m_sinceLastNotifyMax + m_resolution);
+		emit modelChangedWithin(m_sinceLastNotifyMin,
+                                        m_sinceLastNotifyMax + m_resolution);
 		m_sinceLastNotifyMin = m_sinceLastNotifyMax = -1;
 	    } else {
 		emit completionChanged();
diff -r 06579b8ffb7b -r df82da55e86a data/model/Model.h
--- a/data/model/Model.h	Tue Jun 17 14:49:49 2014 +0100
+++ b/data/model/Model.h	Tue Jun 17 15:24:55 2014 +0100
@@ -235,7 +235,7 @@
      * Emitted when a model has been edited (or more data retrieved
      * from cache, in the case of a cached model that generates slowly)
      */
-    void modelChanged(int startFrame, int endFrame);
+    void modelChangedWithin(int startFrame, int endFrame);
 
     /**
      * Emitted when some internal processing has advanced a stage, but
diff -r 06579b8ffb7b -r df82da55e86a data/model/SparseModel.h
--- a/data/model/SparseModel.h	Tue Jun 17 14:49:49 2014 +0100
+++ b/data/model/SparseModel.h	Tue Jun 17 15:24:55 2014 +0100
@@ -718,7 +718,7 @@
 
     if (m_notifyOnAdd) {
         m_rows.clear(); //!!! inefficient
-	emit modelChanged(point.frame, point.frame + m_resolution);
+	emit modelChangedWithin(point.frame, point.frame + m_resolution);
     } else {
 	if (m_sinceLastNotifyMin == -1 ||
 	    point.frame < m_sinceLastNotifyMin) {
@@ -753,7 +753,7 @@
 //    std::cout << "SparseOneDimensionalModel: emit modelChanged("
 //	      << point.frame << ")" << std::endl;
     m_rows.clear(); //!!! inefficient
-    emit modelChanged(point.frame, point.frame + m_resolution);
+    emit modelChangedWithin(point.frame, point.frame + m_resolution);
 }
 
 template <typename PointType>
@@ -781,7 +781,7 @@
                 m_sinceLastNotifyMin >= 0 &&
 		m_sinceLastNotifyMax >= 0) {
                 m_rows.clear(); //!!! inefficient
-		emit modelChanged(m_sinceLastNotifyMin, m_sinceLastNotifyMax);
+		emit modelChangedWithin(m_sinceLastNotifyMin, m_sinceLastNotifyMax);
 		m_sinceLastNotifyMin = m_sinceLastNotifyMax = -1;
 	    } else {
 		emit completionChanged();
diff -r 06579b8ffb7b -r df82da55e86a data/model/WaveFileModel.cpp
--- a/data/model/WaveFileModel.cpp	Tue Jun 17 14:49:49 2014 +0100
+++ b/data/model/WaveFileModel.cpp	Tue Jun 17 15:24:55 2014 +0100
@@ -617,7 +617,7 @@
         SVDEBUG << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl;
 #endif
 	if (fillExtent > m_lastFillExtent) {
-	    emit modelChanged(m_lastFillExtent, fillExtent);
+	    emit modelChangedWithin(m_lastFillExtent, fillExtent);
 	    m_lastFillExtent = fillExtent;
 	}
     } else {
@@ -638,7 +638,7 @@
     m_updateTimer = 0;
     m_mutex.unlock();
     if (getEndFrame() > m_lastFillExtent) {
-        emit modelChanged(m_lastFillExtent, getEndFrame());
+        emit modelChangedWithin(m_lastFillExtent, getEndFrame());
     }
     emit modelChanged();
     emit ready();