summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMatthias Melcher <git@matthiasm.com>2019-02-02 17:47:55 +0100
committerMatthias Melcher <git@matthiasm.com>2019-02-02 17:47:55 +0100
commit452a410a3ea02f58930c4b3cc5a04bbb6b3e7070 (patch)
treed243cf51c8b20541b46ba051d646c91b5aad1825 /FL
parent76668c7cc11c80f337bd7d04d6adead49c8a636f (diff)
STR #2714: remove new shadow lint for MacOS
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Graphics_Driver.H10
-rw-r--r--FL/Fl_PostScript.H2
2 files changed, 6 insertions, 6 deletions
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
index d00082385..5cc5bab7a 100644
--- a/FL/Fl_Graphics_Driver.H
+++ b/FL/Fl_Graphics_Driver.H
@@ -360,13 +360,13 @@ public:
/** see fl_color(uchar, uchar, uchar) */
virtual void color(uchar r, uchar g, uchar b) {}
/** see fl_draw(const char *str, int n, int x, int y) */
- virtual void draw(const char *str, int n, int x, int y) {}
+ virtual void draw(const char *str, int nChars, int x, int y) {}
/** Draw the first \p n bytes of the string \p str starting at position \p x , \p y */
- virtual void draw(const char *str, int n, float x, float y) { draw(str, n, (int)(x+0.5), (int)(y+0.5));}
+ virtual void draw(const char *str, int nChars, float x, float y) { draw(str, nChars, (int)(x+0.5), (int)(y+0.5));}
/** see fl_draw(int angle, const char *str, int n, int x, int y) */
- virtual void draw(int angle, const char *str, int n, int x, int y) { draw(str, n, x, y); }
+ virtual void draw(int angle, const char *str, int nChars, int x, int y) { draw(str, nChars, x, y); }
/** see fl_rtl_draw(const char *str, int n, int x, int y) */
- virtual void rtl_draw(const char *str, int n, int x, int y) { draw(str, n, x, y); }
+ virtual void rtl_draw(const char *str, int nChars, int x, int y) { draw(str, nChars, x, y); }
/** Returns non-zero if the graphics driver possesses the \p feature */
virtual int has_feature(driver_feature feature) { return 0; }
/** see fl_font(Fl_Font, Fl_Fontsize) */
@@ -376,7 +376,7 @@ public:
/** Return the current font size */
virtual Fl_Fontsize size() {return size_; }
/** Compute the width of the first \p n bytes of the string \p str if drawn with current font */
- virtual double width(const char *str, int n) { return 0; }
+ virtual double width(const char *str, int nChars) { return 0; }
/** Compute the width of Unicode character \p c if drawn with current font */
virtual double width(unsigned int c) { char ch = (char)c; return width(&ch, 1); }
virtual void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h);
diff --git a/FL/Fl_PostScript.H b/FL/Fl_PostScript.H
index 6190d3f13..94acecca9 100644
--- a/FL/Fl_PostScript.H
+++ b/FL/Fl_PostScript.H
@@ -228,7 +228,7 @@ public:
~Fl_PostScript_Graphics_Driver();
// ---
Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; }
- virtual int has_feature(driver_feature mask) { return mask & PRINTER; }
+ virtual int has_feature(driver_feature feature_mask) { return feature_mask & PRINTER; }
};
/**