--- a/src/colors.h	Wed Oct 23 13:14:17 2013 +0300
+++ b/src/colors.h	Mon Jan 20 15:04:26 2014 +0200
@@ -1,6 +1,6 @@
 /*
  *  LDForge: LDraw parts authoring CAD
- *  Copyright (C) 2013 Santeri Piippo
+ *  Copyright (C) 2013, 2014 Santeri Piippo
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,26 +20,27 @@
 #define LDFORGE_COLORS_H
 
 #include <QColor>
-#include "common.h"
+#include "main.h"
 
 #define MAX_COLORS 512
 
 class LDColor
-{	public:
-		str name, hexcode;
+{
+	public:
+		QString 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