diff -r 8a60250175ba -r 993c46d7eb75 src/glRenderer.cpp
--- a/src/glRenderer.cpp	Sun May 08 16:26:16 2016 +0300
+++ b/src/glRenderer.cpp	Sun May 08 20:12:54 2016 +0300
@@ -43,7 +43,7 @@
 #include "documentmanager.h"
 #include "grid.h"
 
-const CameraInfo g_cameraInfo[ENUM_LIMIT(Camera, Count)] =
+const CameraInfo g_cameraInfo[EnumLimits<Camera>::Count] =
 {
 	{{  1,  0, 0 }, X, Z, false, false, false }, // top
 	{{  0,  0, 0 }, X, Y, false,  true, false }, // front
@@ -100,9 +100,9 @@
 	connect (m_toolTipTimer, SIGNAL (timeout()), this, SLOT (slot_toolTipTimer()));
 
 	// Init camera icons
-	for_enum(Camera, camera)
+	for (Camera camera : iterateEnum<Camera>())
 	{
-		const char* cameraIconNames[ENUM_LIMIT(Camera, Count)] =
+		const char* cameraIconNames[EnumLimits<Camera>::Count] =
 		{
 			"camera-top", "camera-front", "camera-left",
 			"camera-bottom", "camera-back", "camera-right",
@@ -1428,7 +1428,7 @@
 //
 void GLRenderer::initOverlaysFromObjects()
 {
-	for_enum(Camera, camera)
+	for (Camera camera : iterateEnum<Camera>())
 	{
 		if (camera == FreeCamera)
 			continue;
@@ -1457,7 +1457,7 @@
 //
 void GLRenderer::updateOverlayObjects()
 {
-	for_enum(Camera, camera)
+	for (Camera camera : iterateEnum<Camera>())
 	{
 		if (camera == FreeCamera)
 			continue;