comparison main/PreferencesDialog.cpp @ 1769:0698743f52a4

Convert some cerrs to SVCERRs. Apart from anything else, this makes MSVC2017 happy
author Chris Cannam
date Thu, 01 Mar 2018 14:44:21 +0000
parents 06f061c54b66
children 0fa6b7896968
comparison
equal deleted inserted replaced
1768:f684b19ab777 1769:0698743f52a4
152 if (settings.contains("overview-colour")) { 152 if (settings.contains("overview-colour")) {
153 QString qcolorName = 153 QString qcolorName =
154 settings.value("overview-colour", m_overviewColour.name()) 154 settings.value("overview-colour", m_overviewColour.name())
155 .toString(); 155 .toString();
156 m_overviewColour.setNamedColor(qcolorName); 156 m_overviewColour.setNamedColor(qcolorName);
157 cerr << "loaded colour " << m_overviewColour.name() << " from settings" << endl; 157 SVCERR << "loaded colour " << m_overviewColour.name() << " from settings" << endl;
158 } 158 }
159 settings.endGroup(); 159 settings.endGroup();
160 160
161 ColourMapComboBox *spectrogramGColour = new ColourMapComboBox(true); 161 ColourMapComboBox *spectrogramGColour = new ColourMapComboBox(true);
162 spectrogramGColour->setCurrentIndex(m_spectrogramGColour); 162 spectrogramGColour->setCurrentIndex(m_spectrogramGColour);
169 169
170 // can't have "add new colour", as it gets saved in the session not in prefs 170 // can't have "add new colour", as it gets saved in the session not in prefs
171 ColourComboBox *overviewColour = new ColourComboBox(false); 171 ColourComboBox *overviewColour = new ColourComboBox(false);
172 int overviewColourIndex = 172 int overviewColourIndex =
173 ColourDatabase::getInstance()->getColourIndex(m_overviewColour); 173 ColourDatabase::getInstance()->getColourIndex(m_overviewColour);
174 cerr << "index = " << overviewColourIndex << " for colour " << m_overviewColour.name() << endl; 174 SVCERR << "index = " << overviewColourIndex << " for colour " << m_overviewColour.name() << endl;
175 if (overviewColourIndex >= 0) { 175 if (overviewColourIndex >= 0) {
176 overviewColour->setCurrentIndex(overviewColourIndex); 176 overviewColour->setCurrentIndex(overviewColourIndex);
177 } 177 }
178 178
179 connect(spectrogramGColour, SIGNAL(colourMapChanged(int)), 179 connect(spectrogramGColour, SIGNAL(colourMapChanged(int)),
326 } 326 }
327 foreach (QString f, localeFiles) { 327 foreach (QString f, localeFiles) {
328 QString f0 = f; 328 QString f0 = f;
329 f.replace("sonic-visualiser_", "").replace(".qm", ""); 329 f.replace("sonic-visualiser_", "").replace(".qm", "");
330 if (f == f0) { // our expectations about filename format were not met 330 if (f == f0) { // our expectations about filename format were not met
331 cerr << "INFO: Unexpected filename " << f << " in i18n resource directory" << endl; 331 SVCERR << "INFO: Unexpected filename " << f << " in i18n resource directory" << endl;
332 } else { 332 } else {
333 m_locales.push_back(f); 333 m_locales.push_back(f);
334 QString displayText; 334 QString displayText;
335 // Add new translations here 335 // Add new translations here
336 if (f == "ru") displayText = tr("Russian"); 336 if (f == "ru") displayText = tr("Russian");