Mercurial > hg > svgui
comparison widgets/LayerTree.cpp @ 946:36cddc3de023 alignment_view
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 20 Apr 2015 09:19:52 +0100 |
| parents | 4a578a360011 |
| children | a34a2a25907c |
comparison
equal
deleted
inserted
replaced
| 897:499b637f2a26 | 946:36cddc3de023 |
|---|---|
| 251 } | 251 } |
| 252 | 252 |
| 253 int | 253 int |
| 254 ModelMetadataModel::rowCount(const QModelIndex &parent) const | 254 ModelMetadataModel::rowCount(const QModelIndex &parent) const |
| 255 { | 255 { |
| 256 if (!parent.isValid()) return m_models.size(); | 256 if (!parent.isValid()) return int(m_models.size()); |
| 257 return 0; | 257 return 0; |
| 258 } | 258 } |
| 259 | 259 |
| 260 int | 260 int |
| 261 ModelMetadataModel::columnCount(const QModelIndex &) const | 261 ModelMetadataModel::columnCount(const QModelIndex &) const |