Mercurial > hg > svcore

changeset 947:cd42620e3f40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some errant signals (the modelChanged with args are now modelChangedWithin)
author Chris Cannam
date Thu, 17 Jul 2014 14:50:31 +0100
parents 2d34148d5d6e
children 6d2ece0fe356
files data/model/AggregateWaveModel.cpp data/model/AggregateWaveModel.h data/model/AlignmentModel.cpp data/model/AlignmentModel.h data/model/ModelDataTableModel.cpp data/model/ModelDataTableModel.h data/model/WritableWaveFileModel.cpp
diffstat 7 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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:
--- 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();
--- 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:
--- 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();
--- 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:
--- 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()