From f56d43c9f6ffe08a0d62668fec6120d9c800ed2e Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Wed, 18 Nov 2020 10:03:02 +0100 Subject: [PATCH] Rename private member function with trailing underscore. --- FL/Fl_Image.H | 2 +- FL/Fl_SVG_Image.H | 2 +- src/Fl_Graphics_Driver.cxx | 2 +- src/Fl_SVG_Image.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index 4b5419c70..daac00165 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -76,7 +76,7 @@ private: Fl_Image & operator=(const Fl_Image &); Fl_Image(const Fl_Image &); // Presently redefined in Fl_SVG_Image - virtual void cache_size(int &width, int &height) {} + virtual void cache_size_(int &width, int &height) {} protected: diff --git a/FL/Fl_SVG_Image.H b/FL/Fl_SVG_Image.H index a5ef519b3..5fec92274 100644 --- a/FL/Fl_SVG_Image.H +++ b/FL/Fl_SVG_Image.H @@ -146,7 +146,7 @@ private: float average_weight_; float svg_scaling_(int W, int H); void rasterize_(int W, int H); - virtual void cache_size(int &width, int &height); + virtual void cache_size_(int &width, int &height); void init_(const char *filename, const char *filedata, Fl_SVG_Image *copy_source); Fl_SVG_Image(Fl_SVG_Image *source); public: diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx index 988794c34..d0b9bf370 100644 --- a/src/Fl_Graphics_Driver.cxx +++ b/src/Fl_Graphics_Driver.cxx @@ -210,7 +210,7 @@ void Fl_Graphics_Driver::cache_size(Fl_Image *img, int &width, int &height) width = (width+1) * scale(); height = (height+1) * scale(); } - img->cache_size(width, height); + img->cache_size_(width, height); } /** Draws an Fl_Pixmap object using this graphics driver. diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index 6b241f841..8b9f01ce5 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -235,7 +235,7 @@ void Fl_SVG_Image::resize(int width, int height) { } -void Fl_SVG_Image::cache_size(int &width, int &height) { +void Fl_SVG_Image::cache_size_(int &width, int &height) { if (proportional) { // Keep the rasterized image proportional to its source-level width and height // while maintaining it large enough to allow image tiling.