Mercurial > hg > octave-nkf

changeset 18865:92f91183630b gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Silence some compiler warnings in libgui. * ContextMenu.cc (ContextMenu::ContextMenu): Delete unused variable up. * gl-select.cc (opengl_selector::init_marker): Use 'sz' instead of 'size' to avoid shadowed variable warning.
author Rik <rik@octave.org>
date Mon, 28 Apr 2014 11:38:56 -0700
parents 1a5dabbaa559
children 908523bd79b4
files libgui/graphics/ContextMenu.cc libgui/graphics/gl-select.cc
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/ContextMenu.cc
+++ b/libgui/graphics/ContextMenu.cc
@@ -50,8 +50,6 @@
 ContextMenu::ContextMenu (const graphics_object& go, QMenu* menu)
     : Object (go, menu)
 {
-  uicontextmenu::properties& up = properties<uicontextmenu> ();
-
   menu->setAutoFillBackground (true);
 
   connect (menu, SIGNAL (aboutToShow (void)), SLOT (aboutToShow (void)));
--- a/libgui/graphics/gl-select.cc
+++ b/libgui/graphics/gl-select.cc
@@ -51,9 +51,9 @@
 }
 
 void
-opengl_selector::init_marker (const std::string& m, double size, float width)  
+opengl_selector::init_marker (const std::string& m, double sz, float width)  
 {
-  opengl_renderer::init_marker (m, size, width);
+  opengl_renderer::init_marker (m, sz, width);
   apply_pick_matrix ();
 }