qt5 migration

src/gui/choose_modification_dialog/choosemodificationdialog.cpp

@@ -47,11 +47,8 @@ ChooseModificationDialog::ChooseModificationDialog(QWidget * parent):
 
 #if QT_VERSION >= 0x050000
     // Qt5 code
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
+    connect(ui->modification_listview,&QListView::clicked,this,&ChooseModificationDialog::ItemClicked);
+    connect(ui->modification_listview,&QListView::doubleClicked,this,&ChooseModificationDialog::ItemDoubleClicked);
 #else
 // Qt4 code
 

src/gui/edit_label_methods/editlabelmethods.cpp

@@ -40,11 +40,7 @@ EditLabelMethods::EditLabelMethods(ProjectWindow *parent):
 
 #if QT_VERSION >= 0x050000
     // Qt5 code
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
+     connect(ui->method_list_view,&QListView::clicked,this,&EditLabelMethods::ItemClicked);
 #else
 
     connect(ui->method_list_view,SIGNAL(clicked(const QModelIndex)),this,SLOT(ItemClicked(QModelIndex)));

src/gui/edit_modifications/editmodifications.cpp

@@ -42,11 +42,10 @@ EditModifications::EditModifications(ProjectWindow *parent):
 
 #if QT_VERSION >= 0x050000
     // Qt5 code
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
+    connect(ui->modification_list_view,&QListView::clicked,this,&EditModifications::ItemClicked);
+    connect(ui->modification_list_view,&QListView::doubleClicked,this,&EditModifications::ItemDoubleClicked);
+
+    connect(_p_browse_modification_dialog, &ChooseModificationDialog::accepted, this,&EditModifications::doAcceptedBrowseDialog);
 #else
 
     connect(ui->modification_list_view,SIGNAL(clicked(const QModelIndex)),this,SLOT(ItemClicked(QModelIndex)));

src/gui/export_spreadsheet_dialog/exportspreadsheetdialog.cpp

@@ -99,11 +99,6 @@ ExportSpreadsheetDialog::ExportSpreadsheetDialog(QWidget * parent):
 
 #if QT_VERSION >= 0x050000
     // Qt5 code
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
 #else
 // Qt4 code
 

src/gui/load_results_dialog/loadresultsdialog.cpp

@@ -57,11 +57,6 @@ LoadResultsDialog::LoadResultsDialog(QWidget * parent):
     ui->filter_parameter_layout->addWidget(_p_automatic_filter_widget);
 #if QT_VERSION >= 0x050000
     // Qt5 code
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
 #else
 // Qt4 code
 

src/gui/peptide_detail_view/peptidewindow.cpp

@@ -95,11 +95,11 @@ PeptideWindow::PeptideWindow(ProjectWindow *parent):
     qRegisterMetaType<pappso::SpectrumSp>("pappso::SpectrumSp");
 #if QT_VERSION >= 0x050000
     // Qt5 code
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
+    connect (_p_project_window, &ProjectWindow::identificationGroupGrouped, this,&PeptideWindow::doIdentificationGroupGrouped);
+
+    connect (this, &PeptideWindow::loadSpectrumSp, worker,&SpectrumSpLoaderThread::doLoadSpectrumSp);
+    connect (worker, &SpectrumSpLoaderThread::spectrumSpReady, this,&PeptideWindow::doSpectrumSpReady);
+    connect (_p_spectrum_overlay,&LoadingOverlay::mzChanged, this, &PeptideWindow::setMz);
 #else
 // Qt4 code
     connect (_p_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *)));