From 06220b1501744c5cebc861e6e6e06449814b1d60 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 28 Apr 2018 10:31:25 +1000 Subject: Backport: Delete standard functions on classes where there could be attempts to copy. Backport of changeset 6756:29866b0927e0. --- src/XPM.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/XPM.h') diff --git a/src/XPM.h b/src/XPM.h index 2af0ae84e..92deb9e8a 100644 --- a/src/XPM.h +++ b/src/XPM.h @@ -25,6 +25,10 @@ class XPM { public: explicit XPM(const char *textForm); explicit XPM(const char *const *linesForm); + XPM(const XPM &) = delete; + XPM(XPM &&) = delete; + XPM &operator=(const XPM &) = delete; + XPM &operator=(XPM &&) = delete; ~XPM(); void Init(const char *textForm); void Init(const char *const *linesForm); @@ -50,7 +54,9 @@ public: explicit RGBAImage(const XPM &xpm); // Deleted so RGBAImage objects can not be copied. RGBAImage(const RGBAImage &) = delete; + RGBAImage(RGBAImage &&) = delete; RGBAImage &operator=(const RGBAImage &) = delete; + RGBAImage &operator=(RGBAImage &&) = delete; virtual ~RGBAImage(); int GetHeight() const { return height; } int GetWidth() const { return width; } @@ -72,6 +78,11 @@ class RGBAImageSet { mutable int width; ///< Memorize largest width of the set. public: RGBAImageSet(); + // Deleted so RGBAImageSet objects can not be copied. + RGBAImageSet(const RGBAImageSet &) = delete; + RGBAImageSet(RGBAImageSet &&) = delete; + RGBAImageSet &operator=(const RGBAImageSet &) = delete; + RGBAImageSet &operator=(RGBAImageSet &&) = delete; ~RGBAImageSet(); /// Remove all images. void Clear(); -- cgit v1.2.3