STR #2714: remove new shadow lint for MacOS

3 files changed, 12 insertions, 12 deletions

diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
index 7e1717650..9c4acee95 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
@@ -152,8 +152,8 @@ const char* Fl_Quartz_Graphics_Driver::get_font_name(Fl_Font fnum, int* ap) {
   Fl_Fontdesc *f = fl_fonts + fnum;
   if (!f->fontname[0]) {
     this->set_fontname_in_fontdesc(f);
-    const char* p = f->name;
-    if (!p || !*p) {if (ap) *ap = 0; return "";}
+    const char* thisFont = f->name;
+    if (!thisFont || !*thisFont) {if (ap) *ap = 0; return "";}
     int type = 0;
     if (strstr(f->name, "Bold")) type |= FL_BOLD;
     if (strstr(f->name, "Italic") || strstr(f->name, "Oblique")) type |= FL_ITALIC;
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
index 2427c2084..bb4240864 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx
@@ -310,8 +310,8 @@ void Fl_Quartz_Graphics_Driver::draw_CGImage(CGImageRef cgimg, int x, int y, int
   CGContextRestoreGState(gc_);
 }
 
-void Fl_Quartz_Graphics_Driver::uncache_pixmap(fl_uintptr_t p) {
-  CGImageRelease((CGImageRef)p);
+void Fl_Quartz_Graphics_Driver::uncache_pixmap(fl_uintptr_t pixmap_ref) {
+  CGImageRelease((CGImageRef)pixmap_ref);
 }
 
 //
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
index 88071d8df..1945ea55d 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx
@@ -56,8 +56,8 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
   char *d = dashes; 
   static CGFloat pattern[16];
   if (d && *d) {
-	CGFloat *p = pattern;
-    while (*d) { *p++ = (float)*d++; }
+    CGFloat *pDst = pattern;
+    while (*d) { *pDst++ = (float)*d++; }
     quartz_line_pattern = pattern;
     quartz_line_pattern_size = d-dashes;
   } else if (style & 0xff) {
@@ -71,14 +71,14 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
       dash = char(3*width);
       dot = gap = char(width);
     }
-	CGFloat *p = pattern;
+    CGFloat *pDst = pattern;
     switch (style & 0xff) {
-    case FL_DASH:       *p++ = dash; *p++ = gap; break;
-    case FL_DOT:        *p++ = dot; *p++ = gap; break;
-    case FL_DASHDOT:    *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; break;
-    case FL_DASHDOTDOT: *p++ = dash; *p++ = gap; *p++ = dot; *p++ = gap; *p++ = dot; *p++ = gap; break;
+    case FL_DASH:       *pDst++ = dash; *pDst++ = gap; break;
+    case FL_DOT:        *pDst++ = dot; *pDst++ = gap; break;
+    case FL_DASHDOT:    *pDst++ = dash; *pDst++ = gap; *pDst++ = dot; *pDst++ = gap; break;
+    case FL_DASHDOTDOT: *pDst++ = dash; *pDst++ = gap; *pDst++ = dot; *pDst++ = gap; *pDst++ = dot; *pDst++ = gap; break;
     }
-    quartz_line_pattern_size = p-pattern;
+    quartz_line_pattern_size = pDst-pattern;
     quartz_line_pattern = pattern;
   } else {
     quartz_line_pattern = 0;