aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ViewStyle.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-04-28 10:31:25 +1000
committerNeil <nyamatongwe@gmail.com>2018-04-28 10:31:25 +1000
commit06220b1501744c5cebc861e6e6e06449814b1d60 (patch)
tree2580e78f4473f8f3b756462484fc5506a581dd15 /src/ViewStyle.h
parent774bb684b2afbf1637f7fa29e13fd901d15681d6 (diff)
downloadscintilla-mirror-06220b1501744c5cebc861e6e6e06449814b1d60.tar.gz
Backport: Delete standard functions on classes where there could be attempts to copy.
Backport of changeset 6756:29866b0927e0.
Diffstat (limited to 'src/ViewStyle.h')
-rw-r--r--src/ViewStyle.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ViewStyle.h b/src/ViewStyle.h
index c2e052e03..2a4e7329a 100644
--- a/src/ViewStyle.h
+++ b/src/ViewStyle.h
@@ -32,7 +32,9 @@ public:
FontNames();
// FontNames objects can not be copied.
FontNames(const FontNames &) = delete;
+ FontNames(FontNames &&) = delete;
FontNames &operator=(const FontNames &) = delete;
+ FontNames &operator=(FontNames &&) = delete;
~FontNames();
void Clear();
const char *Save(const char *name);
@@ -44,7 +46,9 @@ public:
FontRealised();
// FontRealised objects can not be copied.
FontRealised(const FontRealised &) = delete;
+ FontRealised(FontRealised &&) = delete;
FontRealised &operator=(const FontRealised &) = delete;
+ FontRealised &operator=(FontRealised &&) = delete;
virtual ~FontRealised();
void Realise(Surface &surface, int zoomLevel, int technology, const FontSpecification &fs);
};
@@ -174,8 +178,10 @@ public:
ViewStyle();
ViewStyle(const ViewStyle &source);
+ ViewStyle(ViewStyle &&) = delete;
// Can only be copied through copy constructor which ensures font names initialised correctly
ViewStyle &operator=(const ViewStyle &) = delete;
+ ViewStyle &operator=(ViewStyle &&) = delete;
~ViewStyle();
void CalculateMarginWidthAndMask();
void Init(size_t stylesSize_=256);