diff --git a/libscience/isotope.cpp b/libscience/isotope.cpp --- a/libscience/isotope.cpp +++ b/libscience/isotope.cpp @@ -94,7 +94,6 @@ QString Isotope::abundance() const { return m_abundance.value().toString(); - return QString(); } double Isotope::halflife() const diff --git a/src/calculator/concCalculator.cpp b/src/calculator/concCalculator.cpp --- a/src/calculator/concCalculator.cpp +++ b/src/calculator/concCalculator.cpp @@ -288,7 +288,6 @@ case 1: // cannot be calculated (insufficient data) error(INSUFFICIENT_DATA_MOLE); return; - break; case 2: // molality specified numMoles = massSolvent() / 1000.0 * m_concentration; break; @@ -296,7 +295,6 @@ case 4: error(INSUFFICIENT_DATA_MOLE); return; - break; case 5: // mole fraction specified numMoles = m_concentration / (100.0 - m_concentration) * molesSolvent(); break; @@ -328,7 +326,6 @@ case 0: // molarity not sufficient error(INSUFFICIENT_DATA_EQT); return; - break; case 1: // normality specified numEqts = volumeSolvent() * m_concentration; break; @@ -338,7 +335,6 @@ case 5: error(INSUFFICIENT_DATA_EQT); return; - break; } if (type2 == 2) { // Amount of solute specified in moles, cannot calculate @@ -368,8 +364,7 @@ case 3: // mass fraction specified case 4: // volume fraction specified error(INSUFFICIENT_DATA_SOLVENT); - return; - break; // cannot be calculated (insufficient data) + return; // cannot be calculated (insufficient data) case 5: // mole fraction specified numMoles = (100.0 - m_concentration) / m_concentration * molesSolute(); break; @@ -623,6 +618,7 @@ break; case 2: volume = massSolute() / densitySolute(); + break; default: volume = 0; break;