diff options
author | Murray Cumming <murrayc@murrayc.com> | 2016-02-09 10:13:48 +0100 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2016-02-09 10:13:48 +0100 |
commit | 80a6e536d13792e4e9f13606a0f1d2d2f6a73c2e (patch) | |
tree | afdd21a31f4f9a827658c15cc8373ae873c708dc | |
parent | 31bd70e245bafe909f69f8709103f81cd55cd346 (diff) |
C++11: Use override keyword on destructors.
-rw-r--r-- | cairomm/exception.h | 2 | ||||
-rw-r--r-- | cairomm/fontface.h | 2 | ||||
-rw-r--r-- | cairomm/pattern.h | 10 | ||||
-rw-r--r-- | cairomm/quartz_surface.h | 2 | ||||
-rw-r--r-- | cairomm/script.h | 2 | ||||
-rw-r--r-- | cairomm/script_surface.h | 2 | ||||
-rw-r--r-- | cairomm/surface.h | 10 | ||||
-rw-r--r-- | cairomm/win32_surface.h | 4 | ||||
-rw-r--r-- | cairomm/xlib_surface.h | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/cairomm/exception.h b/cairomm/exception.h index 766eea9..25731a9 100644 --- a/cairomm/exception.h +++ b/cairomm/exception.h @@ -36,7 +36,7 @@ class logic_error: public std::logic_error { public: explicit logic_error(ErrorStatus status); - virtual ~logic_error() noexcept; + ~logic_error() noexcept override; //virtual const char* what() const noexcept; ErrorStatus get_status_code() const; diff --git a/cairomm/fontface.h b/cairomm/fontface.h index 1b5f87f..4243b09 100644 --- a/cairomm/fontface.h +++ b/cairomm/fontface.h @@ -208,7 +208,7 @@ class UserFontFace : public FontFace { public: - virtual ~UserFontFace(); + ~UserFontFace() override; /* static RefPtr<UserFontFace> create(); diff --git a/cairomm/pattern.h b/cairomm/pattern.h index dcacd49..269fe0d 100644 --- a/cairomm/pattern.h +++ b/cairomm/pattern.h @@ -202,7 +202,7 @@ public: double blue, double alpha); //TODO?: SolidPattern(cairo_pattern_t *target); - virtual ~SolidPattern(); + ~SolidPattern() override; }; class SurfacePattern : public Pattern @@ -231,7 +231,7 @@ public: RefPtr<Surface> get_surface (); /// @} - virtual ~SurfacePattern(); + ~SurfacePattern() override; /** * Create a new Cairo::Pattern for the given surface. @@ -287,7 +287,7 @@ public: */ explicit Gradient(cairo_pattern_t* cobject, bool has_reference = false); - virtual ~Gradient(); + ~Gradient() override; /** * Adds an opaque color stop to a gradient pattern. The offset @@ -374,7 +374,7 @@ public: double &x1, double &y1) const; //TODO?: LinearGradient(cairo_pattern_t *target); - virtual ~LinearGradient(); + ~LinearGradient() override; /** * Create a new linear gradient Cairo::Pattern along the line defined by (x0, @@ -425,7 +425,7 @@ public: double& x1, double& y1, double& r1) const; //TODO?: RadialGradient(cairo_pattern_t *target); - virtual ~RadialGradient(); + ~RadialGradient() override; /** diff --git a/cairomm/quartz_surface.h b/cairomm/quartz_surface.h index c7cf987..4f9fcfb 100644 --- a/cairomm/quartz_surface.h +++ b/cairomm/quartz_surface.h @@ -53,7 +53,7 @@ public: * @since 1.4 */ explicit QuartzSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~QuartzSurface(); + ~QuartzSurface() override; /** Returns the CGContextRef associated with this surface, or NULL if none. Also * returns NULL if the surface is not a Quartz surface. diff --git a/cairomm/script.h b/cairomm/script.h index 3bd4778..8bc543e 100644 --- a/cairomm/script.h +++ b/cairomm/script.h @@ -69,7 +69,7 @@ public: * @since 1.12 */ explicit Script(cairo_device_t* cobject, bool has_reference = false); - virtual ~Script(); + ~Script() override; /** * Converts the record operations in recording_surface into a script. diff --git a/cairomm/script_surface.h b/cairomm/script_surface.h index ad73913..75bff7b 100644 --- a/cairomm/script_surface.h +++ b/cairomm/script_surface.h @@ -47,7 +47,7 @@ public: * @since 1.12 */ explicit ScriptSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~ScriptSurface(); + ~ScriptSurface() override; /** * Create a new surface that will emit its rendering through script. diff --git a/cairomm/surface.h b/cairomm/surface.h index c83eb24..dc72b08 100644 --- a/cairomm/surface.h +++ b/cairomm/surface.h @@ -451,7 +451,7 @@ public: */ explicit ImageSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~ImageSurface(); + ~ImageSurface() override; /** Gets the width of the ImageSurface in pixels */ @@ -615,7 +615,7 @@ public: * constructor will take an extra reference. */ explicit PdfSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~PdfSurface(); + ~PdfSurface() override; /** Creates a PdfSurface with a specified dimensions that will be saved as * the given filename @@ -718,7 +718,7 @@ public: * constructor will take an extra reference. */ explicit PsSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~PsSurface(); + ~PsSurface() override; /** Creates a PsSurface with a specified dimensions that will be saved as the * given filename @@ -873,7 +873,7 @@ public: * constructor will take an extra reference. */ explicit SvgSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~SvgSurface(); + ~SvgSurface() override; /** Creates a SvgSurface with a specified dimensions that will be saved as the @@ -962,7 +962,7 @@ public: */ explicit GlitzSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~GlitzSurface(); + ~GlitzSurface() override; /** Creates a new GlitzSurface * diff --git a/cairomm/win32_surface.h b/cairomm/win32_surface.h index 6184282..e8dae37 100644 --- a/cairomm/win32_surface.h +++ b/cairomm/win32_surface.h @@ -52,7 +52,7 @@ public: * constructor will take an extra reference. */ explicit Win32Surface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~Win32Surface(); + ~Win32Surface() override; /** Returns the HDC associated with this surface, or NULL if none. Also * returns NULL if the surface is not a win32 surface. @@ -128,7 +128,7 @@ class Win32PrintingSurface : public Surface { public: explicit Win32PrintingSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~Win32PrintingSurface(); + ~Win32PrintingSurface() override; /** Creates a cairo surface that targets the given DC. The DC will be queried * for its initial clip extents, and this will be used as the size of the diff --git a/cairomm/xlib_surface.h b/cairomm/xlib_surface.h index 9a304d2..37c8c9c 100644 --- a/cairomm/xlib_surface.h +++ b/cairomm/xlib_surface.h @@ -57,7 +57,7 @@ public: * constructor will take an extra reference. */ explicit XlibSurface(cairo_surface_t* cobject, bool has_reference = false); - virtual ~XlibSurface(); + ~XlibSurface() override; /** Creates an Xlib surface that draws to the given drawable. The way that * colors are represented in the drawable is specified by the provided |