comparison widgets/SubdividingMenu.cpp @ 946:36cddc3de023 alignment_view

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 4a578a360011
children edfc38ade098
comparison
equal deleted inserted replaced
897:499b637f2a26 946:36cddc3de023
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();