comparison widgets/SubdividingMenu.cpp @ 922:26da827e8fb5 tonioni

Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents 4a578a360011
children edfc38ade098
comparison
equal deleted inserted replaced
921:4968bbaf1ed8 922:26da827e8fb5
51 void 51 void
52 SubdividingMenu::setEntries(const std::set<QString> &entries) 52 SubdividingMenu::setEntries(const std::set<QString> &entries)
53 { 53 {
54 m_entriesSet = true; 54 m_entriesSet = true;
55 55
56 int total = entries.size(); 56 int total = int(entries.size());
57 57
58 if (total < m_upperLimit) return; 58 if (total < m_upperLimit) return;
59 59
60 int count = 0; 60 int count = 0;
61 QMenu *chunkMenu = new QMenu(); 61 QMenu *chunkMenu = new QMenu();