rename variable: 'small' is a keyword on mingw/win32
authorRobin Gareus <robin@gareus.org>
Tue, 30 Sep 2014 16:50:41 +0000 (18:50 +0200)
committerRobin Gareus <robin@gareus.org>
Tue, 30 Sep 2014 17:08:16 +0000 (19:08 +0200)
gtk2_ardour/panner2d.cc

index abb47a98730a7f599b52e7726f10026d1aa862e0..be9581629a3ec67c29b2e967079845ae6f67eea2 100644 (file)
@@ -415,7 +415,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 {
        CartesianVector c;
        cairo_t* cr;
-       bool small = (height <= large_size_threshold);
+       bool xsmall = (height <= large_size_threshold);
        const double diameter = radius*2.0;
 
        cr = gdk_cairo_create (get_window()->gobj());
@@ -506,7 +506,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
 
                cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
 
-               if (small) {
+               if (xsmall) {
                        arc_radius = 4.0;
                } else {
                        cairo_set_font_size (cr, 10);
@@ -552,12 +552,12 @@ Panner2d::on_expose_event (GdkEventExpose *event)
                                        cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 0.8);
                                        cairo_stroke (cr);
 
-                                       if (!small && !signal->text.empty()) {
+                                       if (!xsmall && !signal->text.empty()) {
                                                cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, .9);
                                                /* the +/- adjustments are a hack to try to center the text in the circle
                                                 * TODO use pango get_pixel_size() -- see mono_panner.cc
                                                 */
-                                               if (small) {
+                                               if (xsmall) {
                                                        cairo_move_to (cr, c.x - 1, c.y + 1);
                                                } else {
                                                        cairo_move_to (cr, c.x - 4, c.y + 4);
@@ -592,7 +592,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
                                cairo_move_to (cr, c.x, c.y);
                                cairo_save (cr);
                                cairo_rotate (cr, -(sp.azi/360.0) * (2.0 * M_PI));
-                               if (small) {
+                               if (xsmall) {
                                        cairo_scale (cr, 0.8, 0.8);
                                } else {
                                        cairo_scale (cr, 1.2, 1.2);
@@ -610,7 +610,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
                                cairo_fill (cr);
                                cairo_restore (cr);
 
-                               if (!small) {
+                               if (!xsmall) {
                                        cairo_set_font_size (cr, 16);
 
                                        /* move the text in just a bit */