Mercurial > hg > svgui
comparison widgets/LayerTree.cpp @ 640:c6d705bf1672
Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author | Chris Cannam |
---|---|
date | Tue, 14 May 2013 12:36:43 +0100 |
parents | d632a1e87018 |
children | 1a0dfcbffaf1 |
comparison
equal
deleted
inserted
replaced
632:9d8f6552014d | 640:c6d705bf1672 |
---|---|
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 |