Mercurial > octave-nkf

diff libinterp/corefcn/graphics.cc @ 18714:ee7b23a48947

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up a few compiler warnings. * octave-dock-widget.cc (octave_dock_widget::make_widget): Correct spelling in comment. * gl2ps-renderer.cc (draw_pixels): Declare loop variable i as int to avoid signed/unsigned comparison warning. * graphics.cc (gtk_manager::do_unregister_toolkit): Change local variable name to tk_name to avoid shadowing function input.
author Rik <rik@octave.org>
date Fri, 25 Apr 2014 20:10:23 -0700
parents f684f7075aee
children 44f0d1a53ead
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Fri Apr 25 15:49:03 2014 -0700
+++ b/libinterp/corefcn/graphics.cc	Fri Apr 25 20:10:23 2014 -0700
@@ -9881,12 +9881,13 @@
 
           while (pa != available_toolkits.end ())
             {
-              std::string name = *pa++;
-
-              if (name == "qt"
-                  || (name == "fltk"
-                      && available_toolkits.find ("qt") == available_toolkits.end ()))
-                dtk = name;
+              std::string tk_name = *pa++;
+
+              if (tk_name == "qt"
+                  || (tk_name == "fltk"
+                      && available_toolkits.find ("qt")
+                        == available_toolkits.end ()))
+                dtk = tk_name;
             }
         }
     }