Mercurial > ldforge / file diff

--- a/src/GLRenderer.h	Wed Mar 05 03:45:49 2014 +0200
+++ b/src/GLRenderer.h	Wed Mar 05 05:30:36 2014 +0200
@@ -93,7 +93,7 @@
 //
 class GLRenderer : public QGLWidget
 {
-	typedefs:
+	public:
 		enum EFixedCamera
 		{
 			ETopCamera,
@@ -125,13 +125,12 @@
 			EFixedCamera	cam;
 		};
 
-	properties:
 		Q_OBJECT
-		PROPERTY (public,		bool,					DrawOnly,	BOOL_OPS,	STOCK_WRITE)
-		PROPERTY (public,		MessageManager*,	MessageLog, NO_OPS,		STOCK_WRITE)
-		PROPERTY (private,	bool,					Picking,		BOOL_OPS,	STOCK_WRITE)
-		PROPERTY (public,		LDDocument*,		File,			NO_OPS,		CUSTOM_WRITE)
-		PROPERTY (public,		EditMode,			EditMode,	NO_OPS,		CUSTOM_WRITE)
+		PROPERTY (public,	bool,				isDrawOnly,	setDrawOnly,	STOCK_WRITE)
+		PROPERTY (public,	MessageManager*,	messageLog, setMessageLog,	STOCK_WRITE)
+		PROPERTY (private,	bool,				isPicking,	setPicking,		STOCK_WRITE)
+		PROPERTY (public,	LDDocument*,		document,	setDocument,	CUSTOM_WRITE)
+		PROPERTY (public,	EditMode,			editMode,	setEditMode,	CUSTOM_WRITE)
 
 	public:
 		GLRenderer (QWidget* parent = null);
@@ -187,7 +186,7 @@
 	private:
 		CameraIcon					m_cameraIcons[7];
 		QTimer*						m_toolTipTimer;
-		Qt::MouseButtons				m_lastButtons;
+		Qt::MouseButtons			m_lastButtons;
 		Qt::KeyboardModifiers		m_keymods;
 		Vertex						m_hoverpos;
 		double						m_virtWidth,
@@ -254,7 +253,7 @@
 
 		LDGLData& currentDocumentData() const
 		{
-			return *getFile()->getGLData();
+			return *document()->getGLData();
 		}
 
 		// Get a rotation value