Mercurial > hg > svgui
comparison widgets/SubdividingMenu.cpp @ 682:1a0dfcbffaf1
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 14:06:40 +0000 |
parents | 4806715f7a19 |
children | e4773943c9c1 |
comparison
equal
deleted
inserted
replaced
681:eaf4446a1bef | 682:1a0dfcbffaf1 |
---|---|
15 | 15 |
16 #include "SubdividingMenu.h" | 16 #include "SubdividingMenu.h" |
17 | 17 |
18 #include <iostream> | 18 #include <iostream> |
19 | 19 |
20 #include "base/Debug.h" | |
21 | |
20 using std::set; | 22 using std::set; |
21 using std::map; | 23 using std::map; |
22 | 24 |
23 SubdividingMenu::SubdividingMenu(size_t lowerLimit, size_t upperLimit, | 25 SubdividingMenu::SubdividingMenu(size_t lowerLimit, size_t upperLimit, |
24 QWidget *parent) : | 26 QWidget *parent) : |
79 if (count == 0) { | 81 if (count == 0) { |
80 firstNameInChunk = *j; | 82 firstNameInChunk = *j; |
81 firstInitialInChunk = initial; | 83 firstInitialInChunk = initial; |
82 } | 84 } |
83 | 85 |
84 // std::cerr << "count = "<< count << ", upper limit = " << m_upperLimit << std::endl; | 86 // cerr << "count = "<< count << ", upper limit = " << m_upperLimit << endl; |
85 | 87 |
86 bool lastInChunk = (k == entries.end() || | 88 bool lastInChunk = (k == entries.end() || |
87 (count >= m_lowerLimit-1 && | 89 (count >= m_lowerLimit-1 && |
88 (count == m_upperLimit || | 90 (count == m_upperLimit || |
89 (*k)[0] != initial))); | 91 (*k)[0] != initial))); |
132 | 134 |
133 void | 135 void |
134 SubdividingMenu::entriesAdded() | 136 SubdividingMenu::entriesAdded() |
135 { | 137 { |
136 if (m_entriesSet) { | 138 if (m_entriesSet) { |
137 std::cerr << "ERROR: SubdividingMenu::entriesAdded: setEntries was also called -- should use one mechanism or the other, but not both" << std::endl; | 139 cerr << "ERROR: SubdividingMenu::entriesAdded: setEntries was also called -- should use one mechanism or the other, but not both" << endl; |
138 return; | 140 return; |
139 } | 141 } |
140 | 142 |
141 set<QString> entries; | 143 set<QString> entries; |
142 for (map<QString, QObject *>::const_iterator i = m_pendingEntries.begin(); | 144 for (map<QString, QObject *>::const_iterator i = m_pendingEntries.begin(); |