← Back to branch summary

~scottydelicious666/brewtarget/brewtarget

~scottydelicious666/brewtarget/brewtarget

« back to all changes in this revision

Viewing changes to src/SIVolumeUnitSystem.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.

files modified:
src/CelsiusTempUnitSystem.cpp

src/FahrenheitTempUnitSystem.cpp

src/ImperialVolumeUnitSystem.cpp

src/SIVolumeUnitSystem.cpp

src/SIWeightUnitSystem.cpp

src/TimeUnitSystem.cpp

src/USVolumeUnitSystem.cpp

src/USWeightUnitSystem.cpp

src/brewtarget.cpp

src/unit.h

Show diffs side-by-side

added added

removed removed

src/SIVolumeUnitSystem.cpp

31

31

32

32

void SIVolumeUnitSystem::loadMap()

33

33

{

34

scaleToUnit.insert(extrasmall, Units::milliliters);

35

scaleToUnit.insert(small, Units::liters);

34

scaleToUnit.insert(scaleExtraSmall, Units::milliliters);

35

scaleToUnit.insert(scaleSmall, Units::liters);

36

36

}

37

37

38

38

Unit* SIVolumeUnitSystem::thicknessUnit()

Older »