Skip to content

Commit 295b152

Browse files
xzyferxzyfer
committed
Merge pull request #1411 from xzyfer/fix/windows-warning
Use namespaces for code clarity
2 parents 474943d + 0a93235 commit 295b152

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎src/units.cpp

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -56,70 +56,70 @@ namespace Sass {
5656
{
5757
switch (unit & 0xFF00)
5858
{
59-
case SIZE: return SIZE; break;
60-
case ANGLE: return ANGLE; break;
61-
case TIME: return TIME; break;
62-
case FREQUENCY: return FREQUENCY; break;
63-
case RESOLUTION: return RESOLUTION; break;
64-
default: return INCOMMENSURABLE; break;
59+
case SassUnitType::SIZE: return SassUnitType::SIZE; break;
60+
case SassUnitType::ANGLE: return SassUnitType::ANGLE; break;
61+
case SassUnitType::TIME: return SassUnitType::TIME; break;
62+
case SassUnitType::FREQUENCY: return SassUnitType::FREQUENCY; break;
63+
case SassUnitType::RESOLUTION: return SassUnitType::RESOLUTION; break;
64+
default: return SassUnitType::INCOMMENSURABLE; break;
6565
}
6666
};
6767

6868
SassUnit string_to_unit(const string& s)
6969
{
7070
// size units
71-
if (s == "px") return PX;
72-
else if (s == "pt") return PT;
73-
else if (s == "pc") return PC;
74-
else if (s == "mm") return MM;
75-
else if (s == "cm") return CM;
76-
else if (s == "in") return IN;
71+
if (s == "px") return SassUnit::PX;
72+
else if (s == "pt") return SassUnit::PT;
73+
else if (s == "pc") return SassUnit::PC;
74+
else if (s == "mm") return SassUnit::MM;
75+
else if (s == "cm") return SassUnit::CM;
76+
else if (s == "in") return SassUnit::IN;
7777
// angle units
78-
else if (s == "deg") return DEG;
79-
else if (s == "grad") return GRAD;
80-
else if (s == "rad") return RAD;
81-
else if (s == "turn") return TURN;
78+
else if (s == "deg") return SassUnit::DEG;
79+
else if (s == "grad") return SassUnit::GRAD;
80+
else if (s == "rad") return SassUnit::RAD;
81+
else if (s == "turn") return SassUnit::TURN;
8282
// time units
83-
else if (s == "s") return SEC;
84-
else if (s == "ms") return MSEC;
83+
else if (s == "s") return SassUnit::SEC;
84+
else if (s == "ms") return SassUnit::MSEC;
8585
// frequency units
86-
else if (s == "Hz") return HERTZ;
87-
else if (s == "kHz") return KHERTZ;
86+
else if (s == "Hz") return SassUnit::HERTZ;
87+
else if (s == "kHz") return SassUnit::KHERTZ;
8888
// resolutions units
89-
else if (s == "dpi") return DPI;
90-
else if (s == "dpcm") return DPCM;
91-
else if (s == "dppx") return DPPX;
89+
else if (s == "dpi") return SassUnit::DPI;
90+
else if (s == "dpcm") return SassUnit::DPCM;
91+
else if (s == "dppx") return SassUnit::DPPX;
9292
// for unknown units
93-
else return UNKNOWN;
93+
else return SassUnit::UNKNOWN;
9494
}
9595

9696
const char* unit_to_string(SassUnit unit)
9797
{
9898
switch (unit) {
9999
// size units
100-
case PX: return "px"; break;
101-
case PT: return "pt"; break;
102-
case PC: return "pc"; break;
103-
case MM: return "mm"; break;
104-
case CM: return "cm"; break;
105-
case IN: return "in"; break;
100+
case SassUnit::PX: return "px"; break;
101+
case SassUnit::PT: return "pt"; break;
102+
case SassUnit::PC: return "pc"; break;
103+
case SassUnit::MM: return "mm"; break;
104+
case SassUnit::CM: return "cm"; break;
105+
case SassUnit::IN: return "in"; break;
106106
// angle units
107-
case DEG: return "deg"; break;
108-
case GRAD: return "grad"; break;
109-
case RAD: return "rad"; break;
110-
case TURN: return "turn"; break;
107+
case SassUnit::DEG: return "deg"; break;
108+
case SassUnit::GRAD: return "grad"; break;
109+
case SassUnit::RAD: return "rad"; break;
110+
case SassUnit::TURN: return "turn"; break;
111111
// time units
112-
case SEC: return "s"; break;
113-
case MSEC: return "ms"; break;
112+
case SassUnit::SEC: return "s"; break;
113+
case SassUnit::MSEC: return "ms"; break;
114114
// frequency units
115-
case HERTZ: return "Hz"; break;
116-
case KHERTZ: return "kHz"; break;
115+
case SassUnit::HERTZ: return "Hz"; break;
116+
case SassUnit::KHERTZ: return "kHz"; break;
117117
// resolutions units
118-
case DPI: return "dpi"; break;
119-
case DPCM: return "dpcm"; break;
120-
case DPPX: return "dppx"; break;
118+
case SassUnit::DPI: return "dpi"; break;
119+
case SassUnit::DPCM: return "dpcm"; break;
120+
case SassUnit::DPPX: return "dppx"; break;
121121
// for unknown units
122-
default: return ""; break;;
122+
default: return ""; break;
123123
}
124124
}
125125

@@ -144,13 +144,13 @@ namespace Sass {
144144
// only process known units
145145
if (u1 != UNKNOWN && u2 != UNKNOWN) {
146146
switch (t1) {
147-
case SIZE: return size_conversion_factors[i1][i2]; break;
148-
case ANGLE: return angle_conversion_factors[i1][i2]; break;
149-
case TIME: return time_conversion_factors[i1][i2]; break;
150-
case FREQUENCY: return frequency_conversion_factors[i1][i2]; break;
151-
case RESOLUTION: return resolution_conversion_factors[i1][i2]; break;
147+
case SassUnitType::SIZE: return size_conversion_factors[i1][i2]; break;
148+
case SassUnitType::ANGLE: return angle_conversion_factors[i1][i2]; break;
149+
case SassUnitType::TIME: return time_conversion_factors[i1][i2]; break;
150+
case SassUnitType::FREQUENCY: return frequency_conversion_factors[i1][i2]; break;
151+
case SassUnitType::RESOLUTION: return resolution_conversion_factors[i1][i2]; break;
152152
// ToDo: should we throw error here?
153-
case INCOMMENSURABLE: return 0; break;
153+
case SassUnitType::INCOMMENSURABLE: return 0; break;
154154
}
155155
}
156156
// fallback

0 commit comments

Comments
 (0)