qt5 migration

src/core/project.cpp

@@ -121,7 +121,7 @@ void Project::readXpipFile(WorkMonitorInterface * p_monitor, QFileInfo xpip_file
     simplereader.setContentHandler(parser);
     simplereader.setErrorHandler(parser);
 
-    qDebug() << "Read XPIP XML result file '" << xpip_fileinfo.absoluteFilePath() << "'";
+    qDebug() << "Project::readXpipFile Read XPIP XML result file '" << xpip_fileinfo.absoluteFilePath() << "'";
 
     QFile qfile(xpip_fileinfo.absoluteFilePath());
     QXmlInputSource xmlInputSource(&qfile);

src/files/xpipfile.cpp

@@ -29,7 +29,7 @@ XpipFile::XpipFile(const QUrl & xpip_source) : _xpip_source(xpip_source)
 
 XpipFile::XpipFile(const QFileInfo & xpip_source): _xpip_source(xpip_source.absoluteFilePath())
 {
-
+    qDebug() << "XpipFile::XpipFile begin " << _xpip_source.toString() << " " <<xpip_source.absoluteFilePath();
 }
 XpipFile::XpipFile(const XpipFile & other) : _xpip_source(other._xpip_source)
 {
@@ -41,9 +41,10 @@ XpipFile::~XpipFile()
 }
 
 ProjectSp XpipFile::getProjectSp(WorkMonitorInterface * p_monitor) const {
+    qDebug() << "XpipFile::getProjectSp begin " << _xpip_source.toString();
     ProjectSp project_sp = Project().makeProjectSp();
 
-    project_sp.get()->readXpipFile(p_monitor, QFileInfo(_xpip_source.toLocalFile()));
+    project_sp.get()->readXpipFile(p_monitor, QFileInfo(_xpip_source.toString()));
 
     return (project_sp);
 

src/gui/workerthread.cpp

@@ -171,10 +171,9 @@ WorkerThread::~WorkerThread()
 void WorkerThread::doXpipFileLoad(QString filename) {
     qDebug() << "WorkerThread::doXpipFileLoad begin "<< filename;
     try {
-        QFileInfo new_xpip_file;
-        new_xpip_file.setFile(filename);
+        QFileInfo new_xpip_file(filename);
         emit loadingMessage(tr("loading XPIP file"));
-
+ qDebug() << "WorkerThread::doXpipFileLoad new_xpip_file "<< new_xpip_file.absoluteFilePath();
         XpipFile xpip_file(new_xpip_file);
         ProjectSp project_sp = xpip_file.getProjectSp(_p_work_monitor);
 

src/input/xpipsaxhandler.cpp

@@ -28,7 +28,9 @@
 
 XpipSaxHandler::XpipSaxHandler(WorkMonitorInterface * p_monitor, Project * p_project):_p_project(p_project)
 {
+    qDebug() << "XpipSaxHandler::XpipSaxHandler begin" ;
     _p_monitor = p_monitor;
+    qDebug() << "XpipSaxHandler::XpipSaxHandler end" ;
 }
 
 XpipSaxHandler::~XpipSaxHandler()
@@ -39,7 +41,7 @@ XpipSaxHandler::~XpipSaxHandler()
 
 bool XpipSaxHandler::startElement(const QString & namespaceURI, const QString & localName,
                                   const QString & qName, const QXmlAttributes & attributes) {
-    // qDebug() << namespaceURI << " " << localName << " " << qName ;
+    qDebug()<< "XpipSaxHandler::startElement begin" << namespaceURI << " " << localName << " " << qName ;
     _tag_stack.push_back(qName);
     bool is_ok = true;
 
@@ -153,10 +155,10 @@ bool XpipSaxHandler::startElement_information(QXmlAttributes attributes) {
     qDebug() << "startElement_information ";
     _p_project->setCombineMode(true);
     if (attributes.value("Data_Type").simplified() == "indiv") {
-      _p_project->setCombineMode(false);
+        _p_project->setCombineMode(false);
     }
     _total_protein_match = attributes.value("match_number").toUInt();
-    
+
     _p_monitor->setProgressMaximumValue(_total_protein_match);
     qDebug() << "startElement_information end" ;
     return true;