comparison data/fft/FFTDataServer.cpp @ 686:b4a8d8221eaf debug-output

Remove most toStdString calls (no longer needed, with debug header)
author Chris Cannam
date Thu, 12 May 2011 17:31:24 +0100
parents 948271d124ac
children 06f13a3b9e9e
comparison
equal deleted inserted replaced
685:99222d4bfc78 686:b4a8d8221eaf
226 226
227 FFTDataServer * 227 FFTDataServer *
228 FFTDataServer::findServer(QString n) 228 FFTDataServer::findServer(QString n)
229 { 229 {
230 #ifdef DEBUG_FFT_SERVER 230 #ifdef DEBUG_FFT_SERVER
231 std::cerr << "FFTDataServer::findServer(\"" << n.toStdString() << "\")" << std::endl; 231 std::cerr << "FFTDataServer::findServer(\"" << n << "\")" << std::endl;
232 #endif 232 #endif
233 233
234 if (m_servers.find(n) != m_servers.end()) { 234 if (m_servers.find(n) != m_servers.end()) {
235 235
236 FFTDataServer *server = m_servers[n].first; 236 FFTDataServer *server = m_servers[n].first;
237 237
238 #ifdef DEBUG_FFT_SERVER 238 #ifdef DEBUG_FFT_SERVER
239 std::cerr << "FFTDataServer::findServer(\"" << n.toStdString() << "\"): found " << server << std::endl; 239 std::cerr << "FFTDataServer::findServer(\"" << n << "\"): found " << server << std::endl;
240 #endif 240 #endif
241 241
242 claimInstance(server, false); 242 claimInstance(server, false);
243 243
244 return server; 244 return server;
245 } 245 }
246 246
247 #ifdef DEBUG_FFT_SERVER 247 #ifdef DEBUG_FFT_SERVER
248 std::cerr << "FFTDataServer::findServer(\"" << n.toStdString() << "\"): not found" << std::endl; 248 std::cerr << "FFTDataServer::findServer(\"" << n << "\"): not found" << std::endl;
249 #endif 249 #endif
250 250
251 return 0; 251 return 0;
252 } 252 }
253 253
453 std::cerr << "FFTDataServer::modelAboutToBeDeleted: server is " 453 std::cerr << "FFTDataServer::modelAboutToBeDeleted: server is "
454 << server << std::endl; 454 << server << std::endl;
455 #endif 455 #endif
456 456
457 if (i->second.second > 0) { 457 if (i->second.second > 0) {
458 std::cerr << "WARNING: FFTDataServer::modelAboutToBeDeleted: Model " << model << " (\"" << model->objectName().toStdString() << "\") is about to be deleted, but is still being referred to by FFT server " << server << " with non-zero refcount " << i->second.second << std::endl; 458 std::cerr << "WARNING: FFTDataServer::modelAboutToBeDeleted: Model " << model << " (\"" << model->objectName() << "\") is about to be deleted, but is still being referred to by FFT server " << server << " with non-zero refcount " << i->second.second << std::endl;
459 server->suspendWrites(); 459 server->suspendWrites();
460 return; 460 return;
461 } 461 }
462 for (ServerQueue::iterator j = m_releasedServers.begin(); 462 for (ServerQueue::iterator j = m_releasedServers.begin();
463 j != m_releasedServers.end(); ++j) { 463 j != m_releasedServers.end(); ++j) {