comparison layer/ImageLayer.cpp @ 584:1fe7951a61e8 debug-output

Remove most toStdString calls (no longer needed, with debug header)

 //!!! how to reap no-longer-used images?
 
 bool
 ImageLayer::getImageOriginalSize(QString name, QSize &size) const
 {
-//    std::cerr << "getImageOriginalSize: \"" << name.toStdString() << "\"" << std::endl;
+//    std::cerr << "getImageOriginalSize: \"" << name << "\"" << std::endl;
 
     QMutexLocker locker(&m_imageMapMutex);
     if (m_images.find(name) == m_images.end()) {
 //        std::cerr << "don't have, trying to open local" << std::endl;
         m_images[name] = QImage(getLocalFilename(name));

 QImage 
 ImageLayer::getImage(View *v, QString name, QSize maxSize) const
 {
     bool need = false;
 
-//    std::cerr << "ImageLayer::getImage(" << v << ", " << name.toStdString() << ", ("
+//    std::cerr << "ImageLayer::getImage(" << v << ", " << name << ", ("
 //              << maxSize.width() << "x" << maxSize.height() << "))" << std::endl;
 
     if (!m_scaled[v][name].isNull()  &&
         ((m_scaled[v][name].width()  == maxSize.width() &&
           m_scaled[v][name].height() <= maxSize.height()) ||

 bool
 ImageLayer::addImage(long frame, QString url)
 {
     QImage image(getLocalFilename(url));
     if (image.isNull()) {
-        std::cerr << "Failed to open image from url \"" << url.toStdString() << "\" (local filename \"" << getLocalFilename(url).toStdString() << "\"" << std::endl;
+        std::cerr << "Failed to open image from url \"" << url << "\" (local filename \"" << getLocalFilename(url) << "\"" << std::endl;
         delete m_fileSources[url];
         m_fileSources.erase(url);
         return false;
     }
 

 }
 
 void
 ImageLayer::checkAddSource(QString img) const
 {
-    std::cerr << "ImageLayer::checkAddSource(" << img.toStdString() << "): yes, trying..." << std::endl;
+    std::cerr << "ImageLayer::checkAddSource(" << img << "): yes, trying..." << std::endl;
 
     if (m_fileSources.find(img) != m_fileSources.end()) {
         return;
     }
 
     ProgressDialog dialog(tr("Opening image URL..."), true, 2000);
     FileSource *rf = new FileSource(img, &dialog);
     if (rf->isOK()) {
-        std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename().toStdString() << ")" << std::endl;
+        std::cerr << "ok, adding it (local filename = " << rf->getLocalFilename() << ")" << std::endl;
         m_fileSources[img] = rf;
         connect(rf, SIGNAL(ready()), this, SLOT(fileSourceReady()));
     } else {
         delete rf;
     }

     QString img;
     for (FileSourceMap::const_iterator i = m_fileSources.begin();
          i != m_fileSources.end(); ++i) {
         if (i->second == rf) {
             img = i->first;
-//            std::cerr << "it's image \"" << img.toStdString() << "\"" << std::endl;
+//            std::cerr << "it's image \"" << img << "\"" << std::endl;
             break;
         }
     }
     if (img == "") return;