From 6af47b53d52c29474bfc551700f8394dbf1dbc04 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 18 Mar 2021 19:50:34 +1100
Subject: Use unique_ptr for CaseFolderForEncoding to show transfer of
 ownership.

---
 cocoa/ScintillaCocoa.h  | 2 +-
 cocoa/ScintillaCocoa.mm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'cocoa')

diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 6d446a9bf..b94a30aa2 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -120,7 +120,7 @@ protected:
 	void Redraw() override;
 
 	void Init();
-	CaseFolder *CaseFolderForEncoding() override;
+	std::unique_ptr<CaseFolder> CaseFolderForEncoding() override;
 	std::string CaseMapString(const std::string &s, int caseMapping) override;
 	void CancelModes() override;
 
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);
 		}
 	}
 }
-- 
cgit v1.2.3