diff options
Diffstat (limited to 'qt/ScintillaEditBase')
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 8 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index 707862416..374027bd0 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -557,15 +557,15 @@ public: } }; -CaseFolder *ScintillaQt::CaseFolderForEncoding() +std::unique_ptr<CaseFolder> ScintillaQt::CaseFolderForEncoding() { if (pdoc->dbcsCodePage == SC_CP_UTF8) { - return new CaseFolderUnicode(); + return std::make_unique<CaseFolderUnicode>(); } else { const char *charSetBuffer = CharacterSetIDOfDocument(); if (charSetBuffer) { if (pdoc->dbcsCodePage == 0) { - CaseFolderTable *pcf = new CaseFolderTable(); + std::unique_ptr<CaseFolderTable> pcf = std::make_unique<CaseFolderTable>(); pcf->StandardASCII(); QTextCodec *codec = QTextCodec::codecForName(charSetBuffer); // Only for single byte encodings @@ -583,7 +583,7 @@ CaseFolder *ScintillaQt::CaseFolderForEncoding() } return pcf; } else { - return new CaseFolderDBCS(QTextCodec::codecForName(charSetBuffer)); + return std::make_unique<CaseFolderDBCS>(QTextCodec::codecForName(charSetBuffer)); } } return nullptr; diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index ef326e2e3..5a6f9efa1 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -135,7 +135,7 @@ private: const char *CharacterSetIDOfDocument() const; QString StringFromDocument(const char *s) const; QByteArray BytesForDocument(const QString &text) const; - CaseFolder *CaseFolderForEncoding() override; + std::unique_ptr<CaseFolder> CaseFolderForEncoding() override; std::string CaseMapString(const std::string &s, int caseMapping) override; void CreateCallTipWindow(PRectangle rc) override; |