# HG changeset patch
# User Chris Cannam
# Date 1405605031 -3600
# Node ID cd42620e3f4024f6d9e25f7b90f08e350b1fdaa0
# Parent  2d34148d5d6e6650b072d45294d08dec8131c083
Fix some errant signals (the modelChanged with args are now modelChangedWithin)

diff -r 2d34148d5d6e -r cd42620e3f40 data/model/AggregateWaveModel.cpp
--- a/data/model/AggregateWaveModel.cpp	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/AggregateWaveModel.cpp	Thu Jul 17 14:50:31 2014 +0100
@@ -231,9 +231,9 @@
 }
 
 void
-AggregateWaveModel::componentModelChanged(int start, int end)
+AggregateWaveModel::componentModelChangedWithin(int start, int end)
 {
-    emit modelChanged(start, end);
+    emit modelChangedWithin(start, end);
 }
 
 void
diff -r 2d34148d5d6e -r cd42620e3f40 data/model/AggregateWaveModel.h
--- a/data/model/AggregateWaveModel.h	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/AggregateWaveModel.h	Thu Jul 17 14:50:31 2014 +0100
@@ -85,12 +85,12 @@
 
 signals:
     void modelChanged();
-    void modelChanged(int, int);
+    void modelChangedWithin(int, int);
     void completionChanged();
 
 protected slots:
     void componentModelChanged();
-    void componentModelChanged(int, int);
+    void componentModelChangedWithin(int, int);
     void componentModelCompletionChanged();
 
 protected:
diff -r 2d34148d5d6e -r cd42620e3f40 data/model/AlignmentModel.cpp
--- a/data/model/AlignmentModel.cpp	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/AlignmentModel.cpp	Thu Jul 17 14:50:31 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();
diff -r 2d34148d5d6e -r cd42620e3f40 data/model/AlignmentModel.h
--- a/data/model/AlignmentModel.h	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/AlignmentModel.h	Thu Jul 17 14:50:31 2014 +0100
@@ -60,12 +60,12 @@
 
 signals:
     void modelChanged();
-    void modelChanged(int startFrame, int endFrame);
+    void modelChangedWithin(int startFrame, int endFrame);
     void completionChanged();
 
 protected slots:
     void pathChanged();
-    void pathChanged(int startFrame, int endFrame);
+    void pathChangedWithin(int startFrame, int endFrame);
     void pathCompletionChanged();
 
 protected:
diff -r 2d34148d5d6e -r cd42620e3f40 data/model/ModelDataTableModel.cpp
--- a/data/model/ModelDataTableModel.cpp	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/ModelDataTableModel.cpp	Thu Jul 17 14:50:31 2014 +0100
@@ -31,8 +31,8 @@
     Model *baseModel = dynamic_cast<Model *>(m);
 
     connect(baseModel, SIGNAL(modelChanged()), this, SLOT(modelChanged()));
-    connect(baseModel, SIGNAL(modelChanged(int, int)),
-            this, SLOT(modelChanged(int, int)));
+    connect(baseModel, SIGNAL(modelChangedWithin(int, int)),
+            this, SLOT(modelChangedWithin(int, int)));
     connect(baseModel, SIGNAL(aboutToBeDeleted()),
             this, SLOT(modelAboutToBeDeleted()));
 }
@@ -219,7 +219,7 @@
 }
 
 void 
-ModelDataTableModel::modelChanged(int, int)
+ModelDataTableModel::modelChangedWithin(int, int)
 {
     //!!! inefficient
     clearSort();
diff -r 2d34148d5d6e -r cd42620e3f40 data/model/ModelDataTableModel.h
--- a/data/model/ModelDataTableModel.h	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/ModelDataTableModel.h	Thu Jul 17 14:50:31 2014 +0100
@@ -69,7 +69,7 @@
 
 protected slots:
     void modelChanged();
-    void modelChanged(int, int);
+    void modelChangedWithin(int, int);
     void modelAboutToBeDeleted();
 
 protected:
diff -r 2d34148d5d6e -r cd42620e3f40 data/model/WritableWaveFileModel.cpp
--- a/data/model/WritableWaveFileModel.cpp	Fri Jul 04 11:08:05 2014 +0100
+++ b/data/model/WritableWaveFileModel.cpp	Thu Jul 17 14:50:31 2014 +0100
@@ -86,8 +86,8 @@
     m_model->setStartFrame(m_startFrame);
 
     connect(m_model, SIGNAL(modelChanged()), this, SIGNAL(modelChanged()));
-    connect(m_model, SIGNAL(modelChanged(int, int)),
-            this, SIGNAL(modelChanged(int, int)));
+    connect(m_model, SIGNAL(modelChangedWithin(int, int)),
+            this, SIGNAL(modelChangedWithin(int, int)));
 }
 
 WritableWaveFileModel::~WritableWaveFileModel()