← Back to branch summary

~scottydelicious666/brewtarget/brewtarget

« back to all changes in this revision

Viewing changes to src/USVolumeUnitSystem.cpp

  • Committer: Philip G. Lee
  • Author(s): Mik Firestone
  • Date: 2015-01-31 16:51:51 UTC
  • Revision ID: git-v1:26744c4c22eb4ccf35390c1a0f33e8f98bbbe91d
MR114: unitScale enum items renamed

Closes issue 1407994.

Due to compilation issues, I had to rename the unitScales from extrasmall,
small, ... to scaleExtraSmall, scaleSmall, etc. The code compiles and runs.
This should get around the windows problem.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/USVolumeUnitSystem.cpp
30
30
 
31
31
void USVolumeUnitSystem::loadMap()
32
32
{
33
 
   scaleToUnit.insert(extrasmall,Units::us_teaspoons);
34
 
   scaleToUnit.insert(small,Units::us_tablespoons);
35
 
   scaleToUnit.insert(medium,Units::us_cups);
36
 
   scaleToUnit.insert(large,Units::us_quarts);
37
 
   scaleToUnit.insert(extralarge,Units::us_gallons);
38
 
   scaleToUnit.insert(huge,Units::us_barrels);
 
33
   scaleToUnit.insert(scaleExtraSmall,Units::us_teaspoons);
 
34
   scaleToUnit.insert(scaleSmall,Units::us_tablespoons);
 
35
   scaleToUnit.insert(scaleMedium,Units::us_cups);
 
36
   scaleToUnit.insert(scaleLarge,Units::us_quarts);
 
37
   scaleToUnit.insert(scaleExtraLarge,Units::us_gallons);
 
38
   scaleToUnit.insert(scaleHuge,Units::us_barrels);
39
39
}
40
40
 
41
41
Unit* USVolumeUnitSystem::thicknessUnit()