Using unique_ptr to simplify ownership of images, case folder, and list box.

1 files changed, 3 insertions, 9 deletions

diff --git a/src/Document.cxx b/src/Document.cxx
index b4ab37244..581358e52 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -95,7 +95,6 @@ int LexInterface::LineEndTypesSupported() {
 
 Document::Document() {
 	refCount = 0;
-	pcf = NULL;
 #ifdef _WIN32
 	eolMode = SC_EOL_CRLF;
 #else
@@ -118,7 +117,6 @@ Document::Document() {
 	durationStyleOneLine = 0.00001;
 
 	matchesValid = false;
-	regex = 0;
 
 	UTF8BytesOfLeadInitialise();
 
@@ -139,9 +137,6 @@ Document::~Document() {
 		delete pl;
 		pl = nullptr;
 	}
-	regex.release();
-	delete pcf;
-	pcf = 0;
 }
 
 void Document::Init() {
@@ -161,7 +156,7 @@ int Document::LineEndTypesSupported() const {
 bool Document::SetDBCSCodePage(int dbcsCodePage_) {
 	if (dbcsCodePage != dbcsCodePage_) {
 		dbcsCodePage = dbcsCodePage_;
-		SetCaseFolder(NULL);
+		SetCaseFolder(nullptr);
 		cb.SetLineEndTypes(lineEndBitSet & LineEndTypesSupported());
 		return true;
 	} else {
@@ -1802,12 +1797,11 @@ bool Document::MatchesWordOptions(bool word, bool wordStart, Sci::Position pos,
 }
 
 bool Document::HasCaseFolder() const {
-	return pcf != 0;
+	return pcf != nullptr;
 }
 
 void Document::SetCaseFolder(CaseFolder *pcf_) {
-	delete pcf;
-	pcf = pcf_;
+	pcf.reset(pcf_);
 }
 
 Document::CharacterExtracted Document::ExtractCharacter(Sci::Position position) const {