Mercurial > hg > svcore

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Fri, 18 Jul 2014 11:07:30 +0100
parents cd42620e3f40
children cc27f35aa75c
line wrap: on
line diff
--- a/data/model/ModelDataTableModel.cpp	Wed Jul 02 17:31:21 2014 +0100
+++ b/data/model/ModelDataTableModel.cpp	Fri Jul 18 11:07:30 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();