From 44c874b731f9f58c2f50c3c6076371058cbe26e3 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Fri, 30 Dec 2022 19:14:36 +0100 Subject: 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() --- src/drivers/Unix/Fl_Unix_System_Driver.H | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/drivers/Unix/Fl_Unix_System_Driver.H') diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.H b/src/drivers/Unix/Fl_Unix_System_Driver.H index 7234cc360..8bc365515 100644 --- a/src/drivers/Unix/Fl_Unix_System_Driver.H +++ b/src/drivers/Unix/Fl_Unix_System_Driver.H @@ -23,27 +23,27 @@ class Fl_RGB_Image; class Fl_Unix_System_Driver : public Fl_Posix_System_Driver { public: - virtual int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args); - virtual int clocale_vsscanf(const char *input, const char *format, va_list args); - virtual int clocale_vprintf(FILE *output, const char *format, va_list args); - virtual int filename_list(const char *d, dirent ***list, + int clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) FL_OVERRIDE; + int clocale_vsscanf(const char *input, const char *format, va_list args) FL_OVERRIDE; + int clocale_vprintf(FILE *output, const char *format, va_list args) FL_OVERRIDE; + int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **), - char *errmsg=NULL, int errmsg_sz=0); - virtual int open_uri(const char *uri, char *msg, int msglen); - virtual int use_tooltip_timeout_condition() {return 1;} - virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon); - virtual void newUUID(char *uuidBuffer); - virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, - const char *application); - virtual int preferences_need_protection_check() {return 1;} - virtual int utf8locale(); - virtual const char *filename_name(const char *buf); - virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); - virtual void add_fd(int fd, Fl_FD_Handler cb, void* = 0); - virtual void remove_fd(int, int when); - virtual void remove_fd(int); - double wait(double time_to_wait); - int ready(); + char *errmsg=NULL, int errmsg_sz=0) FL_OVERRIDE; + int open_uri(const char *uri, char *msg, int msglen) FL_OVERRIDE; + int use_tooltip_timeout_condition() FL_OVERRIDE {return 1;} + int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) FL_OVERRIDE; + void newUUID(char *uuidBuffer) FL_OVERRIDE; + char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, + const char *application) FL_OVERRIDE; + int preferences_need_protection_check() FL_OVERRIDE {return 1;} + int utf8locale() FL_OVERRIDE; + const char *filename_name(const char *buf) FL_OVERRIDE; + void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void add_fd(int fd, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE; + void remove_fd(int, int when) FL_OVERRIDE; + void remove_fd(int) FL_OVERRIDE; + double wait(double time_to_wait) FL_OVERRIDE; + int ready() FL_OVERRIDE; static unsigned char *create_bmp(const unsigned char *data, int W, int H, int *return_size); static Fl_RGB_Image *own_bmp_to_RGB(char *bmp); static void read_int(uchar *c, int& i); -- cgit v1.2.3