qt5 migration

src/gui/peptide_list_view/peptidelistwindow.cpp

@@ -68,11 +68,12 @@ PeptideListWindow::PeptideListWindow(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 (_project_window, &ProjectWindow::identificationGroupGrouped, this,&PeptideListWindow::doIdentificationGroupGrouped);
+
+    connect (this, &PeptideListWindow::peptideDataChanged, _peptide_table_model_p, &PeptideTableModel::onPeptideDataChanged);
+
+    connect(ui->tableView, &QTableView::clicked, _p_proxy_model, &PeptideTableProxyModel::onTableClicked);
+    connect(_peptide_table_model_p, &PeptideTableModel::layoutChanged, this, &PeptideListWindow::updateStatusBar);
 #else
 // Qt4 code
     connect (_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *)));

src/gui/project_view/identification_group_widget/identificationgroupwidget.cpp

@@ -35,11 +35,7 @@ IdentificationGroupWidget::IdentificationGroupWidget(ProjectWindow * parent, Ide
     ui->setupUi(this);
 #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,&IdentificationGroupWidget::doIdentificationGroupGrouped);
 #else
 // Qt4 code
 

src/gui/project_view/projectwindow.cpp

@@ -71,11 +71,6 @@ ProjectWindow::ProjectWindow(MainWindow *parent):
 
     connect(_p_edit_label_methods, &EditLabelMethods::accepted, this,&ProjectWindow::doAcceptedLabelingMethod);
 
-    /*
-    connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-    connect(this, &PtSpectrumViewer::operateMsDataFile, worker, &PwizLoaderThread::doMsDataFileLoad);
-    connect(worker, &PwizLoaderThread::msDataReady, this, &PtSpectrumViewer::handleMsDataFile);
-    */
 #else
 // Qt4 code
     //connect (_protein_list_window, SIGNAL(proteinMatchClicked(ProteinMatch *)), this //,SLOT(doProteinMatchClicked(ProteinMatch *)));

src/gui/protein_list_view/proteinlistwindow.cpp

@@ -99,11 +99,13 @@ ProteinListWindow::ProteinListWindow(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 (_project_window, &ProjectWindow::identificationGroupGrouped, this,&ProteinListWindow::doIdentificationGroupGrouped);
+
+    connect (this, &ProteinListWindow::proteinDataChanged, _protein_table_model_p, &ProteinTableModel::onProteinDataChanged);
+    connect(ui->tableView, &QTableView::clicked, _p_proxy_model, &ProteinTableProxyModel::onTableClicked);
+    connect(ui->centralwidget, &QWidget::customContextMenuRequested,
+            this, &ProteinListWindow::showContextMenu);
+    connect(_protein_table_model_p, &ProteinTableModel::layoutChanged, this, &ProteinListWindow::updateStatusBar);
 #else
 // Qt4 code
     connect (_project_window, SIGNAL(identificationGroupGrouped(IdentificationGroup *)), this,SLOT(doIdentificationGroupGrouped(IdentificationGroup *)));