Removed all shadow lint in header files (STR #2714).

4 files changed, 11 insertions, 10 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 95464c81e..df9a55846 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -146,6 +146,7 @@ Changes in FLTK 1.4.0					Released: ??? ?? 2019
   Bug Fixes
 
   - (add new items here)
+  - Removed all shadow lint in header files (STR #2714).
   - Fixed pulldown menu position when at the bottom of the screen (STR #2880).
   - Fixed missing item handling in Fl_Chekc_Browser (STR #3480).
   - Fixed Delete key in Fl_Input deleting entire widgets in Fluid (STR #2841).
diff --git a/FL/Fl_Scrollbar.H b/FL/Fl_Scrollbar.H
index c2b9abe08..5563dcce1 100644
--- a/FL/Fl_Scrollbar.H
+++ b/FL/Fl_Scrollbar.H
@@ -76,8 +76,8 @@ public:
     Sets the position, size and range of the slider in the scrollbar.
     \param[in] pos   position, first line displayed
     \param[in] windowSize  number of lines displayed
-    \param[in] first number of first line
-    \param[in] total total number of lines
+    \param[in] first_line number of first line
+    \param[in] total_lines total number of lines
 
     You should call this every time your window changes size, your data
     changes size, or your scroll position changes (even if in response
@@ -86,8 +86,8 @@ public:
 
     Calls Fl_Slider::scrollvalue(int pos, int size, int first, int total).
   */
-  int value(int pos, int windowSize, int first, int total) {
-    return scrollvalue(pos, windowSize, first, total);
+  int value(int pos, int windowSize, int first_line, int total_lines) {
+    return scrollvalue(pos, windowSize, first_line, total_lines);
   }
 
   /**
diff --git a/nanosvg/nanosvg.h b/nanosvg/nanosvg.h
index a5bec7eac..f8e38e8fe 100644
--- a/nanosvg/nanosvg.h
+++ b/nanosvg/nanosvg.h
@@ -286,7 +286,7 @@ static void nsvg__parseElement(char* s,
 
 	// Get attribs
 	while (!end && *s && nattr < NSVG_XML_MAX_ATTRIBS-3) {
-		char* name = NULL;
+		char* tag = NULL;
 		char* value = NULL;
 
 		// Skip white space before the attrib name
@@ -296,7 +296,7 @@ static void nsvg__parseElement(char* s,
 			end = 1;
 			break;
 		}
-		name = s;
+		tag = s;
 		// Find end of the attrib name.
 		while (*s && !nsvg__isspace(*s) && *s != '=') s++;
 		if (*s) { *s++ = '\0'; }
@@ -311,8 +311,8 @@ static void nsvg__parseElement(char* s,
 		if (*s) { *s++ = '\0'; }
 
 		// Store only well formed attributes
-		if (name && value) {
-			attr[nattr++] = name;
+		if (tag && value) {
+			attr[nattr++] = tag;
 			attr[nattr++] = value;
 		}
 	}
diff --git a/test/keyboard.cxx b/test/keyboard.cxx
index a0326d7e6..27107de3e 100644
--- a/test/keyboard.cxx
+++ b/test/keyboard.cxx
@@ -101,8 +101,8 @@ int main(int argc, char** argv) {
     const char *str;
     
     // update all the buttons with the current key and shift state:
-    for (int i = 0; i < window->children(); i++) {
-      Fl_Widget* b = window->child(i);
+    for (int c = 0; c < window->children(); c++) {
+      Fl_Widget* b = window->child(c);
       if (b->callback() == (Fl_Callback*)key_cb) {
 	int i = b->argument();
 	if (!i) i = b->label()[0];