comparison data/model/ModelDataTableModel.cpp @ 822:54829c1e155e tonioni

Merge from the default branch

 }
 
 QModelIndex
 ModelDataTableModel::index(int row, int column, const QModelIndex &parent) const
 {
-    return createIndex(row, column, 0);
+    return createIndex(row, column, (void *)0);
 }
 
 QModelIndex
 ModelDataTableModel::parent(const QModelIndex &index) const
 {

 QModelIndex 
 ModelDataTableModel::getModelIndexForFrame(size_t frame) const
 {
     if (!m_model) return createIndex(0, 0);
     int row = m_model->getRowForFrame(frame);
-    return createIndex(getSorted(row), 0, 0);
+    return createIndex(getSorted(row), 0, (void *)0);
 }
 
 size_t 
 ModelDataTableModel::getFrameForModelIndex(const QModelIndex &index) const
 {

     m_sortColumn = column;
     m_sortOrdering = sortOrder;
     int current = getCurrentRow();
     if (current != prevCurrent) {
 //         std::cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << std::endl;
-         emit currentChanged(createIndex(current, 0, 0));
+        emit currentChanged(createIndex(current, 0, (void *)0));
     }
     emit layoutChanged();
 }
 
 void