--- a/src/colors.h Tue Oct 22 22:14:32 2013 +0300 +++ b/src/colors.h Thu Dec 05 13:51:52 2013 +0200 @@ -28,18 +28,18 @@ { public: str name, hexcode; QColor faceColor, edgeColor; - short index; + int index; }; void initColors(); int luma (QColor& col); // Safely gets a color with the given number or null if no such color. -LDColor* getColor (short colnum); -void setColor (short colnum, LDColor* col); +LDColor* getColor (int colnum); +void setColor (int colnum, LDColor* col); // Main and edge color identifiers -static const short maincolor = 16; -static const short edgecolor = 24; +static const int maincolor = 16; +static const int edgecolor = 24; #endif // LDFORGE_COLORS_H