# HG changeset patch # User Teemu Piippo # Date 1487070125 -7200 # Node ID c5791a3aa1ba6b6109b92e4a8af4a8ca74b3c0c4 # Parent 51303023d651d2fc6f55766ca2247a109a939fa7 Removed the GLCamera::FreeToken name diff -r 51303023d651 -r c5791a3aa1ba src/glcamera.cpp --- a/src/glcamera.cpp Tue Feb 14 12:58:53 2017 +0200 +++ b/src/glcamera.cpp Tue Feb 14 13:02:05 2017 +0200 @@ -35,7 +35,7 @@ /* * Constructs a free camera. */ -GLCamera::GLCamera(QString name, FreeToken) : +GLCamera::GLCamera(QString name, decltype(FreeCamera)) : m_name {name}, m_isFree {true} {} diff -r 51303023d651 -r c5791a3aa1ba src/glcamera.h --- a/src/glcamera.h Tue Feb 14 12:58:53 2017 +0200 +++ b/src/glcamera.h Tue Feb 14 13:02:05 2017 +0200 @@ -41,10 +41,10 @@ public: // This is used to construct the free camera - enum FreeToken { FreeCamera }; + enum { FreeCamera }; GLCamera(QString name, FixedCameraParameters&& bag); - GLCamera(QString name, FreeToken); + GLCamera(QString name, decltype(FreeCamera)); Axis axisX() const; Axis axisY() const;