comparison widgets/LayerTree.cpp @ 663:1a0fdad4af4d tonioni

Merge from the default branch
author Chris Cannam
date Fri, 12 Jul 2013 13:25:22 +0100
parents d632a1e87018
children 1a0dfcbffaf1
comparison
equal deleted inserted replaced
660:8663a831838f 663:1a0fdad4af4d
236 QModelIndex 236 QModelIndex
237 ModelMetadataModel::index(int row, int column, const QModelIndex &parent) const 237 ModelMetadataModel::index(int row, int column, const QModelIndex &parent) const
238 { 238 {
239 if (!parent.isValid()) { 239 if (!parent.isValid()) {
240 if (row >= m_models.size()) return QModelIndex(); 240 if (row >= m_models.size()) return QModelIndex();
241 return createIndex(row, column, 0); 241 return createIndex(row, column, (void *)0);
242 } 242 }
243 243
244 return QModelIndex(); 244 return QModelIndex();
245 } 245 }
246 246