aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaCocoa.mm
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2021-03-18 19:50:34 +1100
committerNeil <nyamatongwe@gmail.com>2021-03-18 19:50:34 +1100
commit6af47b53d52c29474bfc551700f8394dbf1dbc04 (patch)
tree12306e8c4586c60ebcc64acac5018b570b69605f /cocoa/ScintillaCocoa.mm
parent402e089842d5aa2bb3774a665e26c42dc91fa5b4 (diff)
downloadscintilla-mirror-6af47b53d52c29474bfc551700f8394dbf1dbc04.tar.gz
Use unique_ptr for CaseFolderForEncoding to show transfer of ownership.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
-rw-r--r--cocoa/ScintillaCocoa.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index b4e9375c2..657651908 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -585,14 +585,14 @@ public:
}
};
-CaseFolder *ScintillaCocoa::CaseFolderForEncoding() {
+std::unique_ptr<CaseFolder> ScintillaCocoa::CaseFolderForEncoding() {
if (pdoc->dbcsCodePage == SC_CP_UTF8) {
- return new CaseFolderUnicode();
+ return std::make_unique<CaseFolderUnicode>();
} else {
CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
vs.styles[STYLE_DEFAULT].characterSet);
if (pdoc->dbcsCodePage == 0) {
- CaseFolderTable *pcf = new CaseFolderTable();
+ std::unique_ptr<CaseFolderTable> pcf = std::make_unique<CaseFolderTable>();
pcf->StandardASCII();
// Only for single byte encodings
for (int i=0x80; i<0x100; i++) {
@@ -615,7 +615,7 @@ CaseFolder *ScintillaCocoa::CaseFolderForEncoding() {
}
return pcf;
} else {
- return new CaseFolderDBCS(encoding);
+ return std::make_unique<CaseFolderDBCS>(encoding);
}
}
}