comparison widgets/InteractiveFileFinder.cpp @ 586:1ae54a29e59e

Merge from debug-output branch

 InteractiveFileFinder::m_instance;
 
 InteractiveFileFinder::InteractiveFileFinder() :
     m_lastLocatedLocation("")
 {
-    std::cerr << "Registering interactive file finder" << std::endl;
+    DEBUG << "Registering interactive file finder" << endl;
     FileFinder::registerFileFinder(this);
 }
 
 InteractiveFileFinder::~InteractiveFileFinder()
 {

         if (files.empty()) break;
         path = *files.begin();
         
         QFileInfo fi(path);
 
-        std::cerr << "type = " << type << ", suffix = " << fi.suffix().toStdString() << std::endl;
+        std::cerr << "type = " << type << ", suffix = " << fi.suffix() << std::endl;
         
         if ((type == LayerFile || type == LayerFileNoMidi)
             && fi.suffix() == "") {
             QString expectedExtension;
             QString selectedFilter = dialog.selectedFilter();

             } else if (selectedFilter.contains(".mid")) {
                 expectedExtension = "mid";
             } else if (selectedFilter.contains(".ttl")) {
                 expectedExtension = "ttl";
             }
-            std::cerr << "expected extension = " << expectedExtension.toStdString() << std::endl;
+            std::cerr << "expected extension = " << expectedExtension << std::endl;
             if (expectedExtension != "") {
                 path = QString("%1.%2").arg(path).arg(expectedExtension);
                 fi = QFileInfo(path);
             }
         }

 QString
 InteractiveFileFinder::find(FileType type, QString location, QString lastKnownLocation)
 {
     if (FileSource::canHandleScheme(location)) {
         if (FileSource(location).isAvailable()) {
-            std::cerr << "InteractiveFileFinder::find: ok, it's available... returning" << std::endl;
+            DEBUG << "InteractiveFileFinder::find: ok, it's available... returning" << endl;
             return location;
         }
     }
 
     if (QFileInfo(location).exists()) return location;

 QString
 InteractiveFileFinder::findRelative(QString location, QString relativeTo)
 {
     if (relativeTo == "") return "";
 
-    std::cerr << "Looking for \"" << location.toStdString() << "\" next to \""
-              << relativeTo.toStdString() << "\"..." << std::endl;
+    DEBUG << "Looking for \"" << location << "\" next to \""
+              << relativeTo << "\"..." << endl;
 
     QString fileName;
     QString resolved;
 
     if (FileSource::isRemote(location)) {

     }
 
     if (FileSource::isRemote(relativeTo)) {
         resolved = QUrl(relativeTo).resolved(fileName).toString();
         if (!FileSource(resolved).isAvailable()) resolved = "";
-        std::cerr << "resolved: " << resolved.toStdString() << std::endl;
+        std::cerr << "resolved: " << resolved << std::endl;
     } else {
         if (QUrl(relativeTo).scheme() == "file") {
             relativeTo = QUrl(relativeTo).toLocalFile();
         }
         resolved = QFileInfo(relativeTo).dir().filePath(fileName);