Use `FL_OVERRIDE` for all overridden virtual methods (#611)

FL_OVERRIDE is defined as `override` for C++11 and higher
FL_OVERRIDE is defined as `override` for VisualC 2015 and newer
Don't interfere with Fl_Widget::override()

3 files changed, 84 insertions, 84 deletions

diff --git a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
index 14d469dbe..8ef586624 100644
--- a/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
+++ b/src/drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
@@ -31,9 +31,9 @@ protected:
   Fl_Quartz_Copy_Surface_Driver(int w, int h);
   // implemented in Fl_cocoa.mm because uses Objective-c
   ~Fl_Quartz_Copy_Surface_Driver();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
+  void set_current() FL_OVERRIDE;
+  void translate(int x, int y) FL_OVERRIDE;
+  void untranslate() FL_OVERRIDE;
 };
 
 #endif /* Fl_Quartz_Copy_Surface_Driver_H */
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
index f5c9bd3a2..ca1ffce04 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
@@ -56,92 +56,92 @@ protected:
   CGLineJoin quartz_line_join_;
   CGFloat *quartz_line_pattern;
   int quartz_line_pattern_size;
-  virtual void cache_size(Fl_Image* img, int &width, int &height);
+  void cache_size(Fl_Image* img, int &width, int &height) FL_OVERRIDE;
 public:
   Fl_Quartz_Graphics_Driver();
-  virtual int has_feature(driver_feature mask) { return mask & NATIVE; }
-  virtual void gc(void *ctxt) { gc_ = (CGContextRef)ctxt; global_gc(); }
-  virtual void *gc() {return gc_;}
-  char can_do_alpha_blending();
+  int has_feature(driver_feature mask) FL_OVERRIDE { return mask & NATIVE; }
+  void gc(void *ctxt) FL_OVERRIDE { gc_ = (CGContextRef)ctxt; global_gc(); }
+  void *gc() FL_OVERRIDE {return gc_;}
+  char can_do_alpha_blending() FL_OVERRIDE;
 
   // --- bitmap stuff
   static CGImageRef create_bitmask(int w, int h, const uchar *array); // NOT virtual
-  virtual void delete_bitmask(fl_uintptr_t bm);
-  void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  void draw_bitmap(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy);
-  void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy);
-  void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0);
-  void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3);
-  void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0);
-  void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1);
-  void cache(Fl_Pixmap *img);
-  void cache(Fl_Bitmap *img);
-  void cache(Fl_RGB_Image *img);
-  void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_);
-  void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
+  void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE;
+  void draw_pixmap(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_bitmap(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_rgb(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) FL_OVERRIDE;
+  void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) FL_OVERRIDE;
+  void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) FL_OVERRIDE;
+  void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) FL_OVERRIDE;
+  void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) FL_OVERRIDE;
+  void cache(Fl_Pixmap *img) FL_OVERRIDE;
+  void cache(Fl_Bitmap *img) FL_OVERRIDE;
+  void cache(Fl_RGB_Image *img) FL_OVERRIDE;
+  void uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_uintptr_t &mask_) FL_OVERRIDE;
+  void copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) FL_OVERRIDE;
   void draw_CGImage(CGImageRef cgimg, int x, int y, int w, int h, int srcx, int srcy, int sw, int sh);
   static CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h);
-  void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h);
-  Fl_Region XRectangleRegion(int x, int y, int w, int h);
-  void XDestroyRegion(Fl_Region r);
+  void add_rectangle_to_region(Fl_Region r, int x, int y, int w, int h) FL_OVERRIDE;
+  Fl_Region XRectangleRegion(int x, int y, int w, int h) FL_OVERRIDE;
+  void XDestroyRegion(Fl_Region r) FL_OVERRIDE;
   void high_resolution(bool b) { high_resolution_ = b; }
 protected:
-  void point(int x, int y);
-  void rect(int x, int y, int w, int h);
-  void focus_rect(int x, int y, int w, int h);
-  void rectf(int x, int y, int w, int h);
-  void line(int x, int y, int x1, int y1);
-  void line(int x, int y, int x1, int y1, int x2, int y2);
-  void xyline(int x, int y, int x1);
-  void xyline(int x, int y, int x1, int y2);
-  void xyline(int x, int y, int x1, int y2, int x3);
-  void yxline(int x, int y, int y1);
-  void yxline(int x, int y, int y1, int x2);
-  void yxline(int x, int y, int y1, int x2, int y3);
-  void loop(int x0, int y0, int x1, int y1, int x2, int y2);
-  void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
-  void polygon(int x0, int y0, int x1, int y1, int x2, int y2);
-  void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
+  void point(int x, int y) FL_OVERRIDE;
+  void rect(int x, int y, int w, int h) FL_OVERRIDE;
+  void focus_rect(int x, int y, int w, int h) FL_OVERRIDE;
+  void rectf(int x, int y, int w, int h) FL_OVERRIDE;
+  void line(int x, int y, int x1, int y1) FL_OVERRIDE;
+  void line(int x, int y, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void xyline(int x, int y, int x1) FL_OVERRIDE;
+  void xyline(int x, int y, int x1, int y2) FL_OVERRIDE;
+  void xyline(int x, int y, int x1, int y2, int x3) FL_OVERRIDE;
+  void yxline(int x, int y, int y1) FL_OVERRIDE;
+  void yxline(int x, int y, int y1, int x2) FL_OVERRIDE;
+  void yxline(int x, int y, int y1, int x2, int y3) FL_OVERRIDE;
+  void loop(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
+  void polygon(int x0, int y0, int x1, int y1, int x2, int y2) FL_OVERRIDE;
+  void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3) FL_OVERRIDE;
   // --- clipping
-  void push_clip(int x, int y, int w, int h);
-  int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H);
-  int not_clipped(int x, int y, int w, int h);
-  void restore_clip();
-  void end_points();
-  void end_line();
-  void end_polygon();
-  void end_complex_polygon();
-  void circle(double x, double y, double r);
-  void arc(int x, int y, int w, int h, double a1, double a2);
-  void pie(int x, int y, int w, int h, double a1, double a2);
-  void line_style(int style, int width=0, char* dashes=0);
-  void color(Fl_Color c);
-  Fl_Color color() { return color_; }
-  void color(uchar r, uchar g, uchar b);
-  void draw(const char *str, int n, int x, int y);
-  void draw(const char *str, int n, float x, float y);
-  void draw(int angle, const char *str, int n, int x, int y);
+  void push_clip(int x, int y, int w, int h) FL_OVERRIDE;
+  int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H) FL_OVERRIDE;
+  int not_clipped(int x, int y, int w, int h) FL_OVERRIDE;
+  void restore_clip() FL_OVERRIDE;
+  void end_points() FL_OVERRIDE;
+  void end_line() FL_OVERRIDE;
+  void end_polygon() FL_OVERRIDE;
+  void end_complex_polygon() FL_OVERRIDE;
+  void circle(double x, double y, double r) FL_OVERRIDE;
+  void arc(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE;
+  void pie(int x, int y, int w, int h, double a1, double a2) FL_OVERRIDE;
+  void line_style(int style, int width=0, char* dashes=0) FL_OVERRIDE;
+  void color(Fl_Color c) FL_OVERRIDE;
+  Fl_Color color() FL_OVERRIDE { return color_; }
+  void color(uchar r, uchar g, uchar b) FL_OVERRIDE;
+  void draw(const char *str, int n, int x, int y) FL_OVERRIDE;
+  void draw(const char *str, int n, float x, float y) FL_OVERRIDE;
+  void draw(int angle, const char *str, int n, int x, int y) FL_OVERRIDE;
   double width(const UniChar* txt, int n);
-  void rtl_draw(const char *str, int n, int x, int y);
-  void font(Fl_Font face, Fl_Fontsize fsize);
-  double width(const char *str, int n);
-  double width(unsigned int c);
-  int height();
-  int descent();
+  void rtl_draw(const char *str, int n, int x, int y) FL_OVERRIDE;
+  void font(Fl_Font face, Fl_Fontsize fsize) FL_OVERRIDE;
+  double width(const char *str, int n) FL_OVERRIDE;
+  double width(unsigned int c) FL_OVERRIDE;
+  int height() FL_OVERRIDE;
+  int descent() FL_OVERRIDE;
   virtual bool high_resolution() { return high_resolution_; }
-  virtual void global_gc();
+  void global_gc() FL_OVERRIDE;
   void quartz_restore_line_style();
   inline Fl_Quartz_Font_Descriptor *valid_font_descriptor();
-  virtual const char* get_font_name(Fl_Font fnum, int* ap);
-  virtual int get_font_sizes(Fl_Font fnum, int*& sizep);
-  virtual const char *font_name(int num);
-  virtual void font_name(int num, const char *name);
-  Fl_Fontdesc* calc_fl_fonts(void);
+  const char* get_font_name(Fl_Font fnum, int* ap) FL_OVERRIDE;
+  int get_font_sizes(Fl_Font fnum, int*& sizep) FL_OVERRIDE;
+  const char *font_name(int num) FL_OVERRIDE;
+  void font_name(int num, const char *name) FL_OVERRIDE;
+  Fl_Fontdesc* calc_fl_fonts(void) FL_OVERRIDE;
 
-  virtual void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h);
-  virtual Fl_Font set_fonts(const char* xstarname);
+  void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h) FL_OVERRIDE;
+  Fl_Font set_fonts(const char* xstarname) FL_OVERRIDE;
   void set_fontname_in_fontdesc(Fl_Fontdesc *f);
-  virtual void uncache_pixmap(fl_uintptr_t p);
+  void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE;
 
 #if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
   enum {use_CoreText = 1, use_ATSU};
@@ -167,16 +167,16 @@ protected:
 #else
   void descriptor_init(const char* name, Fl_Fontsize Size, Fl_Quartz_Font_Descriptor *d);
 #endif
-  virtual void overlay_rect(int x, int y, int w , int h);
-  virtual float override_scale();
-  virtual void restore_scale(float);
-  virtual void antialias(int state);
-  virtual int antialias();
+  void overlay_rect(int x, int y, int w , int h) FL_OVERRIDE;
+  float override_scale() FL_OVERRIDE;
+  void restore_scale(float) FL_OVERRIDE;
+  void antialias(int state) FL_OVERRIDE;
+  int antialias() FL_OVERRIDE;
 };
 
 class Fl_Quartz_Printer_Graphics_Driver : public Fl_Quartz_Graphics_Driver {
 public:
-  virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); }
+  int has_feature(driver_feature mask) FL_OVERRIDE { return mask & (NATIVE | PRINTER); }
 };
 
 #endif // FL_QUARTZ_GRAPHICS_DRIVER_H
diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H
index f70a43ed6..b6f58ec8f 100644
--- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H
+++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H
@@ -21,15 +21,15 @@
 #include <FL/platform.H>
 
 class Fl_Quartz_Image_Surface_Driver : public Fl_Image_Surface_Driver {
-  virtual void end_current();
+  void end_current() FL_OVERRIDE;
 public:
   FLWindow *pre_window;
   Fl_Quartz_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off);
   ~Fl_Quartz_Image_Surface_Driver();
-  void set_current();
-  void translate(int x, int y);
-  void untranslate();
-  Fl_RGB_Image *image();
+  void set_current() FL_OVERRIDE;
+  void translate(int x, int y) FL_OVERRIDE;
+  void untranslate() FL_OVERRIDE;
+  Fl_RGB_Image *image() FL_OVERRIDE;
 };
 
 #endif // FL_QUARTZ_IMAGE_SURFACE_DRIVER_H