diff --git a/CMakeStuff/modules/FindPappsoMSpp.cmake b/CMakeStuff/modules/FindPappsoMSpp.cmake new file mode 100644 index 0000000000000000000000000000000000000000..b51c327941cda63df5acb9056372410b1d3f2af2 --- /dev/null +++ b/CMakeStuff/modules/FindPappsoMSpp.cmake @@ -0,0 +1,74 @@ +# Copyright : Olivier Langella (CNRS) +# License : GPL-3.0+ +# Authors : Olivier Langella, Filippo Rusconi + +find_path(PappsoMSpp_INCLUDE_DIRS pappsomspp/types.h + PATHS /usr/local/include /usr/include + PATH_SUFFIXES pappsomspp libpappsomspp ENV PATH) + + +find_library(PappsoMSpp_LIBRARY NAMES pappsomspp) + +if(PappsoMSpp_INCLUDE_DIRS AND PappsoMSpp_LIBRARY) + + mark_as_advanced(PappsoMSpp_INCLUDE_DIRS) + mark_as_advanced(PappsoMSpp_LIBRARY) + + message(STATUS "~~~~~~~~~~~~~ ${PappsoMSpp_LIBRARY} ~~~~~~~~~~~~~~~") + + set(PappsoMSpp_FOUND TRUE) + +endif() + +if(PappsoMSpp_FOUND) + + if(NOT PappsoMSpp_FIND_QUIETLY) + message(STATUS "Found PappsoMSpp_LIBRARY: ${PappsoMSpp_LIBRARY}") + endif() + + if(NOT TARGET PappsoMSpp::Core) + + add_library(PappsoMSpp::Core UNKNOWN IMPORTED) + + set_target_properties(PappsoMSpp::Core PROPERTIES + IMPORTED_LOCATION "${PappsoMSpp_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIRS}") + + endif() + + find_library(PappsoMSppWidget_LIBRARY NAMES pappsomspp-widget) + + if(PappsoMSpp_INCLUDE_DIRS AND PappsoMSppWidget_LIBRARY) + + mark_as_advanced(PappsoMSppWidget_LIBRARY) + + message(STATUS "~~~~~~~~~~~~~ ${PappsoMSppWidget_LIBRARY} ~~~~~~~~~~~~~~~") + + set(PappsoMSppWidget_FOUND TRUE) + + if(NOT TARGET PappsoMSpp::Widget) + + add_library(PappsoMSpp::Widget UNKNOWN IMPORTED) + + set_target_properties(PappsoMSpp::Widget PROPERTIES + IMPORTED_LOCATION "${PappsoMSppWidget_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIRS}") + + endif() + + endif() + + if(NOT PappsoMSpp_FIND_QUIETLY) + message(STATUS "Found PappsoMSppWidget_LIBRARY: ${PappsoMSppWidget_LIBRARY}") + endif() + +else() + + if(PappsoMSpp_FIND_REQUIRED) + + message(FATAL_ERROR "Could not find libpappsomspp. Please do specify the + PappsoMSpp_INCLUDE_DIRS and PappsoMSpp_LIBRARY variables using cmake!") + + endif() + +endif() diff --git a/CMakeStuff/modules/FindPappsomspp.cmake b/CMakeStuff/modules/FindPappsomspp.cmake deleted file mode 100644 index f40f53768a3fb5c74bb8b86610aa4aeb955de40d..0000000000000000000000000000000000000000 --- a/CMakeStuff/modules/FindPappsomspp.cmake +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright : Olivier Langella (CNRS) -# License : GPL-3.0+ -# Authors : Olivier Langella - -FIND_PATH( PAPPSOMSPP_INCLUDE_DIR pappsomspp/types.h - PATHS /usr/local/include /usr/include - PATH_SUFFIXES pappsomspp libpappsomspp ENV PATH) - - -FIND_LIBRARY(PAPPSOMSPP_QT5_LIBRARY NAMES pappsomspp) -IF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_QT5_LIBRARY) - mark_as_advanced(PAPPSOMSPP_INCLUDE_DIR) - mark_as_advanced(PAPPSOMSPP_QT5_LIBRARY) - MESSAGE(STATUS "XXXXXXXXXXXXX ${PAPPSOMSPP_QT5_LIBRARY} XXXXXXXXXXXXXXX") - SET(PAPPSOMSPP_QT5_FOUND TRUE) -ENDIF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_QT5_LIBRARY) - -IF (PAPPSOMSPP_QT5_FOUND) - # show which CppUnit was found only if not quiet - IF (NOT PAPPSOMSPP_FIND_QUIETLY) - MESSAGE(STATUS "Found PAPPSOMSPP_QT5_LIBRARY for Qt5: ${PAPPSOMSPP_QT5_LIBRARY}") - ENDIF (NOT PAPPSOMSPP_FIND_QUIETLY) - - - if(NOT TARGET Pappso::Core) - add_library(Pappso::Core UNKNOWN IMPORTED) - set_target_properties(Pappso::Core PROPERTIES - IMPORTED_LOCATION "${PAPPSOMSPP_QT5_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${PAPPSOMSPP_INCLUDE_DIR}") - endif() - - - - FIND_LIBRARY(PAPPSOMSPP_WIDGET_QT5_LIBRARY NAMES pappsomspp-widget) - IF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_WIDGET_QT5_LIBRARY) - MESSAGE(STATUS "XXXXXXXXXXXXX ${PAPPSOMSPP_WIDGET_QT5_LIBRARY} XXXXXXXXXXXXXXX") - SET(PAPPSOMSPP_WIDGET_QT5_FOUND TRUE) - mark_as_advanced(PAPPSOMSPP_WIDGET_QT5_LIBRARY) - - if(NOT TARGET Pappso::Widget) - add_library(Pappso::Widget UNKNOWN IMPORTED) - set_target_properties(Pappso::Widget PROPERTIES - IMPORTED_LOCATION "${PAPPSOMSPP_WIDGET_QT5_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${PAPPSOMSPP_INCLUDE_DIR}") - endif() - ENDIF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_WIDGET_QT5_LIBRARY) - -ENDIF (PAPPSOMSPP_QT5_FOUND) - - -IF (PAPPSOMSPP_QT5_FOUND) - # show which CppUnit was found only if not quiet - IF (NOT PAPPSOMSPP_FIND_QUIETLY) - MESSAGE(STATUS "Found PAPPSOMSPP_WIDGET_QT5_LIBRARY for Qt5: ${PAPPSOMSPP_WIDGET_QT5_LIBRARY}") - ENDIF (NOT PAPPSOMSPP_FIND_QUIETLY) - - -ENDIF (PAPPSOMSPP_QT5_FOUND) - - IF (NOT PAPPSOMSPP_QT5_FOUND) - # fatal error if CppUnit is required but not found - IF (PAPPSOMSPP_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find PAPPSOMSPP Qt5 please do specify the PAPPSOMSPP_INCLUDE_DIR and PAPPSOMSP_QT5_LIBRARY variables using ccmake!") - ENDIF (PAPPSOMSPP_FIND_REQUIRED) - ENDIF (NOT PAPPSOMSPP_QT5_FOUND) diff --git a/CMakeStuff/toolchains/unix-toolchain.cmake b/CMakeStuff/toolchains/unix-toolchain.cmake index 074e44f4a06c8e3df3f0ece8cfea55a0ae8b1b14..2e9abbe91ade48dab654027b715cbfa2e55a7d2f 100644 --- a/CMakeStuff/toolchains/unix-toolchain.cmake +++ b/CMakeStuff/toolchains/unix-toolchain.cmake @@ -5,7 +5,7 @@ message("cmake -G \"Unix Makefiles\" -DCMAKE_BUILD_TYPE=Debug ../development") set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /usr/include) set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /usr/include) -find_package( Odsstream REQUIRED ) +find_package( OdsStream REQUIRED ) find_package ( PappsoMSpp REQUIRED ) diff --git a/src/gui/lists/ms_identification_run_list_view/ms_identification_worker/msidlistworkerstatus.cpp b/src/gui/lists/ms_identification_run_list_view/ms_identification_worker/msidlistworkerstatus.cpp index 3c865363248977eca97cb4837c6ac392f2b74676..8afb6803562316c9f831f4390fbd3a6e0d9adaeb 100644 --- a/src/gui/lists/ms_identification_run_list_view/ms_identification_worker/msidlistworkerstatus.cpp +++ b/src/gui/lists/ms_identification_run_list_view/ms_identification_worker/msidlistworkerstatus.cpp @@ -166,7 +166,7 @@ MsIdListWorkerStatus::doComputeMsNumber( } void -MsIdListWorkerStatus::changeWaitingQueue(int row) +MsIdListWorkerStatus::changeWaitingQueue(int row [[maybe_unused]]) { m_waitingComputing.clear(); qDebug() << m_waitingComputing.size(); diff --git a/src/gui/lists/ms_identification_run_list_view/msidentificationlistwindow.cpp b/src/gui/lists/ms_identification_run_list_view/msidentificationlistwindow.cpp index 299104cd4641a8ea01c92d52f52dc4ed9e782f19..cc9dac180be190cf9abee7775dec814bdd5edda1 100644 --- a/src/gui/lists/ms_identification_run_list_view/msidentificationlistwindow.cpp +++ b/src/gui/lists/ms_identification_run_list_view/msidentificationlistwindow.cpp @@ -100,7 +100,7 @@ MsIdentificationListWindow::MsIdentificationListWindow(ProjectWindow *parent) mp_proxyModel->resteItemDelegates(); MsIdentificationListQActionColumn *p_action; - for(unsigned int i = 0; i < mp_msidTableModel->columnCount(); i++) + for(int i = 0; i < mp_msidTableModel->columnCount(); i++) { p_action = new MsIdentificationListQActionColumn( this, MsIdentificationTableModel::getMsIdentificationListColumn(i)); diff --git a/src/gui/lists/ms_identification_run_list_view/msidentificationtableproxymodel.cpp b/src/gui/lists/ms_identification_run_list_view/msidentificationtableproxymodel.cpp index d5ae73b6a2a23c4473fc4092b602b9fb587800d4..4c88e13a3d263ffbc8dbe0a9da9d8c01e7bb1980 100644 --- a/src/gui/lists/ms_identification_run_list_view/msidentificationtableproxymodel.cpp +++ b/src/gui/lists/ms_identification_run_list_view/msidentificationtableproxymodel.cpp @@ -62,14 +62,14 @@ MsIdentificationTableProxyModel::~MsIdentificationTableProxyModel() bool MsIdentificationTableProxyModel::filterAcceptsColumn( - int source_column, const QModelIndex &source_parent) const + int source_column, const QModelIndex &source_parent [[maybe_unused]]) const { return m_column_display[source_column]; } bool MsIdentificationTableProxyModel::filterAcceptsRow( - int source_row, const QModelIndex &source_parent) const + int source_row, const QModelIndex &source_parent [[maybe_unused]]) const { try { diff --git a/src/gui/peptide_detail_view/peptidewindow.cpp b/src/gui/peptide_detail_view/peptidewindow.cpp index e4dc699cfa2798a0d9fab8bad3127d6251f3691a..f19a55f800c758c3e8fc0934c5a9baa852b77b16 100644 --- a/src/gui/peptide_detail_view/peptidewindow.cpp +++ b/src/gui/peptide_detail_view/peptidewindow.cpp @@ -243,7 +243,7 @@ PeptideWindow::setMz(double mz) void PeptideWindow::doIdentificationGroupGrouped( - IdentificationGroup *p_identification_group) + IdentificationGroup *p_identification_group [[maybe_unused]]) { updateDisplay(); } diff --git a/src/gui/peptide_list_view/peptidelistwindow.cpp b/src/gui/peptide_list_view/peptidelistwindow.cpp index af3981a8f00545f903ccad542f3d08f6025c5973..ed31f871c4f7d5f5d0b874c837ce365c0399387f 100644 --- a/src/gui/peptide_list_view/peptidelistwindow.cpp +++ b/src/gui/peptide_list_view/peptidelistwindow.cpp @@ -210,7 +210,7 @@ PeptideListWindow::closeEvent(QCloseEvent *event) void PeptideListWindow::doIdentificationGroupGrouped( - IdentificationGroup *p_identification_group) + IdentificationGroup *p_identification_group [[maybe_unused]]) { } ProjectWindow * @@ -345,7 +345,7 @@ PeptideListWindow::doPeptideSearchEdit(QString protein_search_string) } void -PeptideListWindow::doModificationSearch(QString mod_search) +PeptideListWindow::doModificationSearch(QString mod_search [[maybe_unused]]) { //_p_proxy_model->setMsrunFileSearch(msr_run_file_search); emit peptideDataChanged(); diff --git a/src/gui/peptide_list_view/peptidetablemodel.cpp b/src/gui/peptide_list_view/peptidetablemodel.cpp index 7fc7a68216058f95ee92a35377eb8ccae619aa3d..5b9c3846337d864033b72ed0afa9d1b8cf5a49ac 100644 --- a/src/gui/peptide_list_view/peptidetablemodel.cpp +++ b/src/gui/peptide_list_view/peptidetablemodel.cpp @@ -136,7 +136,7 @@ PeptideTableModel::getProteinMatch() return _p_protein_match; } int -PeptideTableModel::rowCount(const QModelIndex &parent) const +PeptideTableModel::rowCount(const QModelIndex &parent [[maybe_unused]]) const { if(_p_protein_match != nullptr) { @@ -147,7 +147,7 @@ PeptideTableModel::rowCount(const QModelIndex &parent) const return 0; } int -PeptideTableModel::columnCount(const QModelIndex &parent) const +PeptideTableModel::columnCount(const QModelIndex &parent [[maybe_unused]]) const { return 43; } diff --git a/src/gui/peptide_list_view/peptidetableproxymodel.cpp b/src/gui/peptide_list_view/peptidetableproxymodel.cpp index 584a6ddc3400c59c2443131764bdd834858327ea..0e38194444b41a7bedf53abde22ca53835a3ff63 100644 --- a/src/gui/peptide_list_view/peptidetableproxymodel.cpp +++ b/src/gui/peptide_list_view/peptidetableproxymodel.cpp @@ -59,8 +59,9 @@ PeptideTableProxyModel::~PeptideTableProxyModel() } bool -PeptideTableProxyModel::filterAcceptsColumn( - int source_column, const QModelIndex &source_parent) const +PeptideTableProxyModel::filterAcceptsColumn(int source_column, + const QModelIndex &source_parent + [[maybe_unused]]) const { if(_column_display[source_column]) { @@ -83,7 +84,8 @@ PeptideTableProxyModel::filterAcceptsColumn( bool PeptideTableProxyModel::filterAcceptsRow(int source_row, - const QModelIndex &source_parent) const + const QModelIndex &source_parent + [[maybe_unused]]) const { try { @@ -188,7 +190,7 @@ PeptideTableProxyModel::filterAcceptsRow(int source_row, { return false; } - unsigned int subgroup = _peptide_search_string.toUInt(); + // unsigned int subgroup = _peptide_search_string.toUInt(); return false; } else if(_search_on == "modification") diff --git a/src/gui/project_view/projectwindow.cpp b/src/gui/project_view/projectwindow.cpp index 099f254a86517c5c48c75f17e053e12b2a8b225b..a2ef0c34048b612ed334d981759d750f7246c132 100644 --- a/src/gui/project_view/projectwindow.cpp +++ b/src/gui/project_view/projectwindow.cpp @@ -471,7 +471,7 @@ ProjectWindow::doDecoySelectionChanged() void ProjectWindow::doAutomaticFilterParametersChanged( - AutomaticFilterParameters parameters) + AutomaticFilterParameters parameters [[maybe_unused]]) { qDebug() << "ProjectWindow::doAutomaticFilterParametersChanged begin "; ui->apply_filter_button->setEnabled(true); @@ -801,7 +801,7 @@ ProjectWindow::setProjectSp(ProjectSp project_sp) // qDeleteAll(ui->identifications_widget->children()); QLayoutItem *wItem; - while(wItem = ui->identifications_widget->layout()->takeAt(0)) + while((wItem = ui->identifications_widget->layout()->takeAt(0))) { wItem->widget()->setVisible(false); delete wItem; diff --git a/src/gui/protein_list_view/proteinlistwindow.cpp b/src/gui/protein_list_view/proteinlistwindow.cpp index 88b1397be92c0eefba2dd23c653d0f125187f6ad..548e7f636b57b5ef56195c8a05c9141c15f4b9c3 100644 --- a/src/gui/protein_list_view/proteinlistwindow.cpp +++ b/src/gui/protein_list_view/proteinlistwindow.cpp @@ -237,7 +237,7 @@ ProteinListWindow::showContextMenu(const QPoint &pos) ProteinListQactionColumn *p_action; - for(unsigned int i = 0; i < _protein_table_model_p->columnCount(); i++) + for(int i = 0; i < _protein_table_model_p->columnCount(); i++) { p_action = new ProteinListQactionColumn( this, ProteinTableModel::getProteinListColumn(i)); @@ -353,19 +353,20 @@ ProteinListWindow::doSearchOn(QString search_on) } void -ProteinListWindow::doMsrunFileSearch(QString msr_run_file_search) +ProteinListWindow::doMsrunFileSearch(QString msr_run_file_search + [[maybe_unused]]) { //_p_proxy_model->setMsrunFileSearch(msr_run_file_search); emit proteinDataChanged(); } void -ProteinListWindow::doModificationSearch(QString mod_search) +ProteinListWindow::doModificationSearch(QString mod_search [[maybe_unused]]) { emit proteinDataChanged(); } void -ProteinListWindow::doScanNumberSearch(int scan_num) +ProteinListWindow::doScanNumberSearch(int scan_num [[maybe_unused]]) { emit proteinDataChanged(); } diff --git a/src/gui/protein_list_view/proteintablemodel.cpp b/src/gui/protein_list_view/proteintablemodel.cpp index cbe0d4ec5f2a45efc88689b8402ea446fc9c957c..422b3be1904b82cc91dbbda10036a45a70b65b4f 100644 --- a/src/gui/protein_list_view/proteintablemodel.cpp +++ b/src/gui/protein_list_view/proteintablemodel.cpp @@ -62,7 +62,7 @@ ProteinTableModel::setIdentificationGroup( int -ProteinTableModel::rowCount(const QModelIndex &parent) const +ProteinTableModel::rowCount(const QModelIndex &parent [[maybe_unused]]) const { // qDebug() << "ProteinTableModel::rowCount begin "; if(_p_identification_group != nullptr) @@ -74,7 +74,7 @@ ProteinTableModel::rowCount(const QModelIndex &parent) const return 0; } int -ProteinTableModel::columnCount(const QModelIndex &parent) const +ProteinTableModel::columnCount(const QModelIndex &parent [[maybe_unused]]) const { // qDebug() << "ProteinTableModel::columnCount begin "; if(_p_identification_group != nullptr) diff --git a/src/gui/protein_list_view/proteintableproxymodel.cpp b/src/gui/protein_list_view/proteintableproxymodel.cpp index 3ea4ba373d569425086afd60396f35722734984f..6c85dfe249c8c21175573dd103f821fd67097503 100644 --- a/src/gui/protein_list_view/proteintableproxymodel.cpp +++ b/src/gui/protein_list_view/proteintableproxymodel.cpp @@ -60,15 +60,17 @@ ProteinTableProxyModel::~ProteinTableProxyModel() // delete _percent_delegate; } bool -ProteinTableProxyModel::filterAcceptsColumn( - int source_column, const QModelIndex &source_parent) const +ProteinTableProxyModel::filterAcceptsColumn(int source_column, + const QModelIndex &source_parent + [[maybe_unused]]) const { return _column_display[source_column]; } bool ProteinTableProxyModel::filterAcceptsRow(int source_row, - const QModelIndex &source_parent) const + const QModelIndex &source_parent + [[maybe_unused]]) const { try { @@ -412,7 +414,8 @@ ProteinTableProxyModel::setSearchOn(QString search_on) } void -ProteinTableProxyModel::setMsrunFileSearch(QString msrun_file_search) +ProteinTableProxyModel::setMsrunFileSearch(QString msrun_file_search + [[maybe_unused]]) { } void diff --git a/src/gui/protein_view/proteinwindow.cpp b/src/gui/protein_view/proteinwindow.cpp index 333f307c5cb28c214178879f0d567ceb1f5d7c14..782e9aa2666386496cc5ff24c3f3d64c8e885457 100644 --- a/src/gui/protein_view/proteinwindow.cpp +++ b/src/gui/protein_view/proteinwindow.cpp @@ -107,7 +107,7 @@ ProteinWindow::~ProteinWindow() } void ProteinWindow::doIdentificationGroupGrouped( - IdentificationGroup *p_identification_group) + IdentificationGroup *p_identification_group [[maybe_unused]]) { updateDisplay(); } @@ -130,7 +130,7 @@ ProteinWindow::clearDbXrefLayout() } } void -ProteinWindow::browseUrl(int i) +ProteinWindow::browseUrl(int i [[maybe_unused]]) { } void diff --git a/src/gui/ptm_island_list_view/ptmislandproxymodel.cpp b/src/gui/ptm_island_list_view/ptmislandproxymodel.cpp index dfdeb4307284533b1b7a6166aa742e2d08fc66d0..2cb3ca3167f56a11d3e7b7620c6114b2efc4f7cd 100644 --- a/src/gui/ptm_island_list_view/ptmislandproxymodel.cpp +++ b/src/gui/ptm_island_list_view/ptmislandproxymodel.cpp @@ -51,7 +51,8 @@ PtmIslandProxyModel::~PtmIslandProxyModel() bool PtmIslandProxyModel::filterAcceptsRow(int source_row, - const QModelIndex &source_parent) const + const QModelIndex &source_parent + [[maybe_unused]]) const { try { diff --git a/src/gui/ptm_island_list_view/ptmislandtablemodel.cpp b/src/gui/ptm_island_list_view/ptmislandtablemodel.cpp index 9057339b4609e74b2b55246ac43768cc8861bda7..2f116c6c0458a40238b7950a302d3f9399dea183 100644 --- a/src/gui/ptm_island_list_view/ptmislandtablemodel.cpp +++ b/src/gui/ptm_island_list_view/ptmislandtablemodel.cpp @@ -156,7 +156,7 @@ PtmIslandTableModel::getPtmGroupingExperiment() const return _p_identification_group->getPtmGroupingExperiment(); } int -PtmIslandTableModel::rowCount(const QModelIndex &parent) const +PtmIslandTableModel::rowCount(const QModelIndex &parent [[maybe_unused]]) const { // qDebug() << "PtmIslandTableModel::rowCount begin "; if(getPtmGroupingExperiment() != nullptr) @@ -168,7 +168,8 @@ PtmIslandTableModel::rowCount(const QModelIndex &parent) const return 0; } int -PtmIslandTableModel::columnCount(const QModelIndex &parent) const +PtmIslandTableModel::columnCount(const QModelIndex &parent + [[maybe_unused]]) const { // qDebug() << "ProteinTableModel::columnCount begin "; if(getPtmGroupingExperiment() != nullptr) diff --git a/src/gui/ptm_peptide_list_view/ptmpeptidetablemodel.cpp b/src/gui/ptm_peptide_list_view/ptmpeptidetablemodel.cpp index 9ccc8b593e3b5c92263f20d6ccf57954771cb0a8..133154b2becc19f08ce7756661eec3ab0f70ce5a 100644 --- a/src/gui/ptm_peptide_list_view/ptmpeptidetablemodel.cpp +++ b/src/gui/ptm_peptide_list_view/ptmpeptidetablemodel.cpp @@ -33,7 +33,7 @@ #include <QStringList> PtmPeptideTableModel::PtmPeptideTableModel( - PtmPeptideListWindow *p_ptm_peptide_list_window) + PtmPeptideListWindow *p_ptm_peptide_list_window [[maybe_unused]]) { } @@ -176,13 +176,14 @@ PtmPeptideTableModel::getDescription(std::int8_t column) } int -PtmPeptideTableModel::rowCount(const QModelIndex &parent) const +PtmPeptideTableModel::rowCount(const QModelIndex &parent [[maybe_unused]]) const { qDebug() << "PtmPeptideTableModel::rowCount begin "; return _ptm_sample_scan_list.size(); } int -PtmPeptideTableModel::columnCount(const QModelIndex &parent) const +PtmPeptideTableModel::columnCount(const QModelIndex &parent + [[maybe_unused]]) const { // qDebug() << "ProteinTableModel::columnCount begin "; return 15; @@ -214,7 +215,7 @@ PtmPeptideTableModel::data(const QModelIndex &index, int role) const int col = index.column(); QStringList position_list; - if(row >= _ptm_sample_scan_list.size()) + if(row >= (int)_ptm_sample_scan_list.size()) return QVariant(); switch(role) { diff --git a/src/gui/ptm_peptide_list_view/ptmpeptidetableproxymodel.cpp b/src/gui/ptm_peptide_list_view/ptmpeptidetableproxymodel.cpp index e370564136dc0eccf7208453cdff35adb2401e18..9ca37d2f9466dee495cf82e8bd782e221523d721 100644 --- a/src/gui/ptm_peptide_list_view/ptmpeptidetableproxymodel.cpp +++ b/src/gui/ptm_peptide_list_view/ptmpeptidetableproxymodel.cpp @@ -47,10 +47,10 @@ PtmPeptideMenuQicon::~PtmPeptideMenuQicon() } void PtmPeptideMenuQicon::paint(QPainter *painter, - const QRect &rect, - Qt::Alignment alignment, - Mode mode, - State state) const + const QRect &rect [[maybe_unused]], + Qt::Alignment alignment [[maybe_unused]], + Mode mode [[maybe_unused]], + State state [[maybe_unused]]) const { // if (option.state & QStyle::State_Selected) @@ -111,7 +111,7 @@ PtmPeptideMenuQaction::PtmPeptideMenuQaction( #endif } void -PtmPeptideMenuQaction::doTriggered(bool triggered) +PtmPeptideMenuQaction::doTriggered(bool triggered [[maybe_unused]]) { PeptideEvidence *p_peptide_evidence = _peptide_match.getPeptideEvidence(); qDebug() << "PtmPeptideMenuQaction::doTriggered begin" @@ -218,7 +218,7 @@ PtmPeptideTableProxyModel::onTableClicked(const QModelIndex &index) //_protein_table_model_p->onTableClicked(this->mapToSource(index)); QModelIndex source_index(this->mapToSource(index)); int row = source_index.row(); - int col = source_index.column(); + // int col = source_index.column(); PtmSampleScanSp sp_ptm_sample_scan = _p_ptm_table_model->getPtmSampleScanSpList().at(row); diff --git a/src/gui/waiting_message_dialog/waitingmessagedialog.cpp b/src/gui/waiting_message_dialog/waitingmessagedialog.cpp index 6f37dcc3dcb57ffd6086b79336a1f193143616c4..65e02e2dfd71d2a8eaa0d3c79bef7947ce1a53f5 100644 --- a/src/gui/waiting_message_dialog/waitingmessagedialog.cpp +++ b/src/gui/waiting_message_dialog/waitingmessagedialog.cpp @@ -66,7 +66,7 @@ WaitingMessageDialog::~WaitingMessageDialog() } void -WaitingMessageDialog::toggledStopButton(bool pushed) +WaitingMessageDialog::toggledStopButton(bool pushed [[maybe_unused]]) { QMutexLocker mutex_locker(&_mutex); _asked_to_stop = true; diff --git a/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp b/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp index 50c9f139b6c04e362d913ee8020c54ae53f4b96f..dfd06d4242de3456e0f07133759ef7fca6ede319 100644 --- a/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp +++ b/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp @@ -230,7 +230,7 @@ AlignmentGroupsQMenu::checkGroupsOnSelectedIndexes() m_selectedIndexesChecks[1] = true; } - if(count_grouped == mp_msIdListWindow->getSelectedIndexes().size() == 1) + if(count_grouped == (mp_msIdListWindow->getSelectedIndexes().size() == 1)) { m_selectedIndexesChecks[2] = true; } diff --git a/src/gui/widgets/automatic_filter_widget/automaticfilterwidget.cpp b/src/gui/widgets/automatic_filter_widget/automaticfilterwidget.cpp index acd18feba3ab4b3f8ab2d2870ebb529b2160b10d..5c2a542b22202ea0487ea105a782c2d65c60f697 100644 --- a/src/gui/widgets/automatic_filter_widget/automaticfilterwidget.cpp +++ b/src/gui/widgets/automatic_filter_widget/automaticfilterwidget.cpp @@ -155,7 +155,7 @@ AutomaticFilterWidget::doPepreproChanged(int number) } void -AutomaticFilterWidget::doValueChanged(double value) +AutomaticFilterWidget::doValueChanged(double value [[maybe_unused]]) { doSetParameters(); } diff --git a/src/gui/widgets/contaminant_widget/contaminantwidget.cpp b/src/gui/widgets/contaminant_widget/contaminantwidget.cpp index 23721ef3d138aa3f2458cbf5e57b8b6f1dabbc52..5ac3ff83309350cbdb67939c958096bb0f4698b8 100644 --- a/src/gui/widgets/contaminant_widget/contaminantwidget.cpp +++ b/src/gui/widgets/contaminant_widget/contaminantwidget.cpp @@ -45,8 +45,8 @@ ContaminantWidget::ContaminantWidget(QWidget *parent) _emit_changed = false; _p_fasta_str_li = new QStandardItemModel(); ui->contaminant_database_listview->setModel(_p_fasta_str_li); - QItemSelectionModel *selection_model = - ui->contaminant_database_listview->selectionModel(); + // QItemSelectionModel *selection_model = + // ui->contaminant_database_listview->selectionModel(); ui->contaminant_database_listview->setSelectionMode( QAbstractItemView::MultiSelection); diff --git a/src/gui/widgets/decoy_widget/decoywidget.cpp b/src/gui/widgets/decoy_widget/decoywidget.cpp index b2289982aa8d74e6c1012354d66238d43859f2bf..e5ce85da1743d885b6620f0f267875182bcd5dfb 100644 --- a/src/gui/widgets/decoy_widget/decoywidget.cpp +++ b/src/gui/widgets/decoy_widget/decoywidget.cpp @@ -43,8 +43,8 @@ DecoyWidget::DecoyWidget(QWidget *parent) _emit_changed = false; _p_fasta_str_li = new QStandardItemModel(); ui->decoy_database_listview->setModel(_p_fasta_str_li); - QItemSelectionModel *selection_model = - ui->decoy_database_listview->selectionModel(); + // QItemSelectionModel *selection_model = + // ui->decoy_database_listview->selectionModel(); ui->decoy_database_listview->setSelectionMode( QAbstractItemView::MultiSelection); diff --git a/src/gui/xic_view/xic_box/xicbox.cpp b/src/gui/xic_view/xic_box/xicbox.cpp index 9989f1ebea05c9beaf0cbf147d2553252446e335..b12810b021cfe1bc43edb1115af9e14cd88c70f0 100644 --- a/src/gui/xic_view/xic_box/xicbox.cpp +++ b/src/gui/xic_view/xic_box/xicbox.cpp @@ -189,14 +189,15 @@ XicBox::~XicBox() } void -XicBox::onXicWidgetClick(double rt, double intensity) +XicBox::onXicWidgetClick(double rt [[maybe_unused]], + double intensity [[maybe_unused]]) { - qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__; + qDebug(); ui->xic_widget->clearXicPeakBorders(); std::vector<pappso::TracePeakCstSPtr> draw_peak_borders; for(XicBoxNaturalIsotope peak : _natural_isotope_list) { - qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__; + qDebug(); draw_peak_borders.push_back(peak.one_peak_sp); if(peak.one_peak_sp.get() != nullptr) { @@ -324,7 +325,7 @@ XicBox::setXic(std::vector<pappso::XicCstSPtr> xic_sp_list) { qDebug() << "XicBox::setXic begin " << xic_sp_list.size(); ui->xic_widget->clear(); - for(int i = 0; i < xic_sp_list.size(); i++) + for(std::size_t i = 0; i < xic_sp_list.size(); i++) { _natural_isotope_list[i].xic_sp = xic_sp_list[i]; } @@ -505,7 +506,7 @@ XicBox::setIsotopeMassList( { mass_list.push_back(natural_isotope_average.get()->getMz()); _natural_isotope_list.push_back( - {nullptr, natural_isotope_average, nullptr, nullptr}); + {nullptr, natural_isotope_average, nullptr, nullptr, {}}); } emit loadXic(_msrun_sp, diff --git a/src/gui/xic_view/xic_widgets/zivydialog.cpp b/src/gui/xic_view/xic_widgets/zivydialog.cpp index 5671bb6b37666f41517e09b3da647502c8700cc1..2e4a69cef0ac13092dbd3db4642117d9d1667882 100644 --- a/src/gui/xic_view/xic_widgets/zivydialog.cpp +++ b/src/gui/xic_view/xic_widgets/zivydialog.cpp @@ -31,7 +31,7 @@ #include <QVBoxLayout> #include <QDebug> -ZivyDialog::ZivyDialog(QWidget *parent) +ZivyDialog::ZivyDialog(QWidget *parent) : QDialog(parent) { _p_zivy_widget = new ZivyWidget(this); _p_button_box = diff --git a/src/gui/xic_view/xic_widgets/zivywidget.cpp b/src/gui/xic_view/xic_widgets/zivywidget.cpp index b23fa95d483b68b95d24ad16bc265319adea0e10..2a3a698d47ec22c8a8e35c58fb3ce2f2cc5ef835 100644 --- a/src/gui/xic_view/xic_widgets/zivywidget.cpp +++ b/src/gui/xic_view/xic_widgets/zivywidget.cpp @@ -125,7 +125,7 @@ ZivyWidget::getZivyParams() const } void -ZivyWidget::doSpinboxChanged(int value) +ZivyWidget::doSpinboxChanged(int value [[maybe_unused]]) { emit zivyChanged(getZivyParams()); } diff --git a/src/gui/xic_view/xicwindow.cpp b/src/gui/xic_view/xicwindow.cpp index 13500abd23ea769abae2a5d5366a8b56e2a633a7..6db88772235a0c1beb4f5638c5037af5d0c7a7e3 100644 --- a/src/gui/xic_view/xicwindow.cpp +++ b/src/gui/xic_view/xicwindow.cpp @@ -85,7 +85,7 @@ void XicWindow::clear() { QLayoutItem *wItem; - while(wItem = ui->xic_vertical_layout->layout()->takeAt(0)) + while((wItem = ui->xic_vertical_layout->layout()->takeAt(0))) { wItem->widget()->setVisible(false); ui->xic_vertical_layout->layout()->removeWidget(wItem->widget()); @@ -138,7 +138,7 @@ XicWindow::getXicExtractionMethod() const void -XicWindow::xicPrecisionChanged(pappso::PrecisionPtr precision) +XicWindow::xicPrecisionChanged(pappso::PrecisionPtr precision [[maybe_unused]]) { qDebug() << "XicWindow::xicPrecisionChanged begin"; qDebug() << "XicWindow::xicPrecisionChanged emit"; @@ -154,7 +154,7 @@ XicWindow::xicDetect(const pappso::Xic &xic, } void -XicWindow::rtUnitChanged(QAbstractButton *button) +XicWindow::rtUnitChanged(QAbstractButton *button [[maybe_unused]]) { qDebug() << "XicWindow::rtUnitChanged begin"; emit rtUnitChangeNeeded(); @@ -181,7 +181,8 @@ XicWindow::doAcceptedZivyDialog() void -XicWindow::doXicExtractionMethodChanged(pappso::XicExtractMethod xic_method) +XicWindow::doXicExtractionMethodChanged(pappso::XicExtractMethod xic_method + [[maybe_unused]]) { emit reExtractXicNeeded(); } diff --git a/src/gui/xic_view/xicworkerthread.cpp b/src/gui/xic_view/xicworkerthread.cpp index 910dbf4952ebbebe0d3e63f115ab97bf3414a3aa..d87f2df0e745781bdff5a9e704ebee28867190a5 100644 --- a/src/gui/xic_view/xicworkerthread.cpp +++ b/src/gui/xic_view/xicworkerthread.cpp @@ -34,7 +34,7 @@ #include <pappsomspp/exception/exceptionnotfound.h> #include <QDebug> -XicWorkerThread::XicWorkerThread(XicBox *parent) +XicWorkerThread::XicWorkerThread(XicBox *parent [[maybe_unused]]) { } XicWorkerThread::~XicWorkerThread()