[Debichem-commits] [SCM] massXpert mass spectrometry suite: debian packaging branch, debian, updated. upstream/3.2.0-1-g5564507

Filippo Rusconi (Debian Maintainer) rusconi-debian at laposte.net
Thu Nov 24 21:28:29 UTC 2011


The following commit has been merged in the debian branch:
commit 55ae95ac071ea0cf9c151dcab27a3b587f7db9b2
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Wed May 4 00:24:58 2011 +0200

    Fixes with variables set but not used.

diff --git a/gui/calculatorWnd.cpp b/gui/calculatorWnd.cpp
index fcb1a49..2191eca 100644
--- a/gui/calculatorWnd.cpp
+++ b/gui/calculatorWnd.cpp
@@ -1186,8 +1186,6 @@ namespace massXpert
   int
   CalculatorWnd::accountFormula(const QString &formula, int times) 
   {
-    Application *application = static_cast<Application *>(qApp);
-    QLocale locale = application->locale();
     QString text;
     int count;
   
@@ -1266,8 +1264,6 @@ namespace massXpert
   int
   CalculatorWnd::accountMonomer()
   {
-    Application *application = static_cast<Application *>(qApp);
-    QLocale locale = application->locale();
     QString text;
   
     // Get to see if there is a necessity to account for the displayed
@@ -1315,8 +1311,6 @@ namespace massXpert
   int
   CalculatorWnd::accountModif ()
   {
-    Application *application = static_cast<Application *>(qApp);
-    QLocale locale = application->locale();
     QString text;
 
     // Get to see if there is a necessity to account for the displayed
@@ -1363,8 +1357,6 @@ namespace massXpert
   int
   CalculatorWnd::accountSequence()
   {
-    Application *application = static_cast<Application *>(qApp);
-    QLocale locale = application->locale();
     QString text;
 
     // Get to see if there is a necessity to account for the displayed
diff --git a/gui/massSearchDlg.cpp b/gui/massSearchDlg.cpp
index f0c6ffa..23230f8 100644
--- a/gui/massSearchDlg.cpp
+++ b/gui/massSearchDlg.cpp
@@ -453,7 +453,6 @@ namespace massXpert
   bool
   MassSearchDlg::checkTolerance(int type)
   {
-    int index = 0;
     double nominal = 0;
     bool ok = false;
 
@@ -461,12 +460,10 @@ namespace massXpert
 
     if (type & MXT_MASS_MONO)
       {
-	index = m_ui.monoToleranceComboBox->currentIndex();
 	text = m_ui.monoMassLineEdit->text();
       }
     else if (type & MXT_MASS_AVG)
       {
-	index = m_ui.avgToleranceComboBox->currentIndex();
 	text = m_ui.avgMassLineEdit->text();
       }
     else
@@ -1516,9 +1513,6 @@ namespace massXpert
     *mpa_resultsString += QObject::tr("\n---------------------------\n"
 				       "Mass Search: \n"
 				       "---------------------------\n");
-  
-    bool monoSearched = true;
-    bool avgSearched = true;
 
     // Should the oligomers have their sequence displayed?
     bool withSequence = m_ui.withSequenceCheckBox->isChecked();
@@ -1530,7 +1524,6 @@ namespace massXpert
 	*mpa_resultsString += QObject::tr("\nSearched mono masses:\n"
 					   "%1\n")
 	  .arg(masses);
-	monoSearched = false;
       }
   
     // The mono treeview:
@@ -1549,7 +1542,6 @@ namespace massXpert
 	*mpa_resultsString += QObject::tr("\nSearched average masses:\n"
 					   "%1\n")
 	  .arg(masses);
-	avgSearched = false;
       }
   
     // The avg treeview:
diff --git a/gui/monomerModificationDlg.cpp b/gui/monomerModificationDlg.cpp
index 75072e6..a9e9fdf 100644
--- a/gui/monomerModificationDlg.cpp
+++ b/gui/monomerModificationDlg.cpp
@@ -655,7 +655,6 @@ namespace massXpert
     // in the polymer chemistry definition, or perform a quick and dirty
     // modification definition in the dialog.
 
-    bool fromPolChemDef = false;
     QString text;
 
     Modif *modif =  new Modif(polymer->polChemDef(), 
@@ -706,7 +705,6 @@ namespace massXpert
 
 	// At this point the modification is correct. Set a bool to true
 	// to know later that the modif was from the polChemDef.
-	fromPolChemDef = true;
       }
   
     // Is the modification work with allowed overriding of the target
diff --git a/gui/sequenceEditorGraphicsViewKeySequenceHandling.cpp b/gui/sequenceEditorGraphicsViewKeySequenceHandling.cpp
index eaea8dd..53083fe 100644
--- a/gui/sequenceEditorGraphicsViewKeySequenceHandling.cpp
+++ b/gui/sequenceEditorGraphicsViewKeySequenceHandling.cpp
@@ -226,9 +226,6 @@ namespace massXpert
 
     positionCursor(MXT_END_OF_LINE);
 
-    QPointF point = 
-      mapFromScene(vignetteLocation(m_lastClickedVignette, MXT_CENTER));
-
     QScrollBar *vScrollBar = verticalScrollBar();
     int curVal = vScrollBar->value();
     vScrollBar->setValue(curVal -(visibleRows * m_requestedVignetteSize));
@@ -269,9 +266,6 @@ namespace massXpert
 
     positionCursor(MXT_END_OF_LINE);
 
-    QPointF point = 
-      mapFromScene(vignetteLocation(m_lastClickedVignette, MXT_CENTER));
-
     QScrollBar *vScrollBar = verticalScrollBar();
     int curVal = vScrollBar->value();
     vScrollBar->setValue(curVal +(visibleRows * m_requestedVignetteSize));
@@ -303,9 +297,6 @@ namespace massXpert
    
     positionCursor(MXT_START_OF_LINE);
 
-    QPointF point = 
-      mapFromScene(vignetteLocation(m_lastClickedVignette, MXT_CENTER));
-
     mp_editorWnd->updateSelectedSequenceMasses();
 
     return event->accept();
@@ -333,9 +324,6 @@ namespace massXpert
 
     positionCursor(MXT_END_OF_LINE);
 
-    QPointF point = 
-      mapFromScene(vignetteLocation(m_lastClickedVignette, MXT_CENTER));
-
     mp_editorWnd->updateSelectedSequenceMasses();
 
     return event->accept();
@@ -701,9 +689,6 @@ namespace massXpert
 
     positionCursor();
   
-    QPointF point = 
-      mapFromScene(vignetteLocation(m_lastClickedVignette, MXT_CENTER));
-
     QScrollBar *vScrollBar = verticalScrollBar();
     int curVal = vScrollBar->value();
     vScrollBar->setValue(curVal +(visibleRows * m_requestedVignetteSize));
@@ -766,9 +751,6 @@ namespace massXpert
   
     positionCursor();
   
-    QPointF point = 
-      mapFromScene(vignetteLocation(m_lastClickedVignette, MXT_CENTER));
-
     QScrollBar *vScrollBar = verticalScrollBar();
     int curVal = vScrollBar->value();
     vScrollBar->setValue(curVal -(visibleRows * m_requestedVignetteSize));

-- 
massXpert mass spectrometry suite: debian packaging



More information about the Debichem-commits mailing list