Mercurial > octave-nkf

diff libgui/graphics/GLCanvas.cc @ 19659:2f4406e9dad6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 23 Jan 2015 16:40:25 -0500
parents dbb207d10d7c 6b2d7a5dc62a
children 5d0663bff506
line wrap: on
line diff
--- a/libgui/graphics/GLCanvas.cc	Fri Jan 23 15:37:56 2015 +0000
+++ b/libgui/graphics/GLCanvas.cc	Fri Jan 23 16:40:25 2015 -0500
@@ -37,8 +37,8 @@
 namespace QtHandles
 {
 
-GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& xhandle)
-  : QGLWidget (xparent), Canvas (xhandle)
+GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& gh)
+  : QGLWidget (xparent), Canvas (gh)
 {
   setFocusPolicy (Qt::ClickFocus);
 }
@@ -47,9 +47,9 @@
 {
 }
 
-void GLCanvas::draw (const graphics_handle& xhandle)
+void GLCanvas::draw (const graphics_handle& gh)
 {
-  graphics_object go = gh_manager::get_object (xhandle);
+  graphics_object go = gh_manager::get_object (gh);
 
   if (go)
     {