comparison framework/MainWindowBase.cpp @ 373:024226dd9f51

Give these two functions different names, not just different arg lists

 
     labeller.labelAll<SparseOneDimensionalModel::Point>(*sodm, &ms);
 }
 
 MainWindowBase::FileOpenStatus
-MainWindowBase::open(QString fileOrUrl, AudioFileOpenMode mode)
-{
+MainWindowBase::openPath(QString fileOrUrl, AudioFileOpenMode mode)
+{
+    cerr << "MainWindowBase::openPath(" << fileOrUrl << ")" << endl;
     ProgressDialog dialog(tr("Opening file or URL..."), true, 2000, this);
     connect(&dialog, SIGNAL(showing()), this, SIGNAL(hideSplash()));
     return open(FileSource(fileOrUrl, &dialog), mode);
 }
 

                 source.getExtension().toLower() == "n3" ||
                 source.getExtension().toLower() == "ttl");
 
     bool audio = AudioFileReaderFactory::getKnownExtensions().contains
         (source.getExtension().toLower());
+
+    cerr << "MainWindowBase::open(" << source.getLocalFilename() << ": audio = " << audio << endl;
 
     bool rdfSession = false;
     if (rdf) {
         RDFImporter::RDFDocumentType rdfType = 
             RDFImporter::identifyDocumentType

 
 MainWindowBase::FileOpenStatus
 MainWindowBase::openAudio(FileSource source, AudioFileOpenMode mode,
                           QString templateName)
 {
-//    SVDEBUG << "MainWindowBase::openAudio(" << source.getLocation() << ")" << endl;
+    cerr << "MainWindowBase::openAudio(" << source.getLocation() << ")" << endl;
 
     if (templateName == "") {
         templateName = getDefaultSessionTemplate();
     }
 

 
     return FileOpenSucceeded;
 }
 
 MainWindowBase::FileOpenStatus
-MainWindowBase::openSessionFile(QString fileOrUrl)
+MainWindowBase::openSessionPath(QString fileOrUrl)
 {
     ProgressDialog dialog(tr("Opening session..."), true, 2000, this);
     connect(&dialog, SIGNAL(showing()), this, SIGNAL(hideSplash()));
     return openSession(FileSource(fileOrUrl, &dialog));
 }