comparison: src/colors.cc
src/colors.cc
- changeset 840
- d077dd19bf9a
- parent 806
- 4240f47aa2d4
- child 844
- 11587d419d2f
equal
deleted
inserted
replaced
| 839:5f822ad61875 | 840:d077dd19bf9a |
|---|---|
| 57 return g_LDConfigColors[24]; | 57 return g_LDConfigColors[24]; |
| 58 } | 58 } |
| 59 | 59 |
| 60 void LDColor::addLDConfigColor (qint32 index, LDColor color) | 60 void LDColor::addLDConfigColor (qint32 index, LDColor color) |
| 61 { | 61 { |
| 62 assert (index >= 0 && index < countof (g_LDConfigColors)); | 62 assert (index >= 0 and index < countof (g_LDConfigColors)); |
| 63 g_LDConfigColors[index] = color; | 63 g_LDConfigColors[index] = color; |
| 64 } | 64 } |
| 65 | 65 |
| 66 LDColor LDColor::fromIndex (qint32 index) | 66 LDColor LDColor::fromIndex (qint32 index) |
| 67 { | 67 { |
| 68 if (index < countof (g_LDConfigColors) && g_LDConfigColors[index] != null) | 68 if (index < countof (g_LDConfigColors) and g_LDConfigColors[index] != null) |
| 69 return g_LDConfigColors[index]; | 69 return g_LDConfigColors[index]; |
| 70 | 70 |
| 71 if (index > 0x2000000) | 71 if (index > 0x2000000) |
| 72 { | 72 { |
| 73 // Direct color | 73 // Direct color |
