1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtextengine: use RAII more

Browse Source 
replace new/delete with unique_ptr

Change-Id: Iac36885041ee15bd2ecf6bb487dacf613e126475
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-09-05 11:20:12 +03:00
parent d8b7c03cc5
commit 02e2a3f123
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/text/qtextengine.cpp
View File

@ -36,15 +36,10 @@ public:
Itemizer(const QString &string, const QScriptAnalysis *analysis, QScriptItemArray &items) Itemizer(const QString &string, const QScriptAnalysis *analysis, QScriptItemArray &items)
: m_string(string), : m_string(string),
m_analysis(analysis), m_analysis(analysis),
m_items(items), m_items(items)
m_splitter(nullptr)
{ {
} }
~Itemizer() ~Itemizer() = default;
{
delete m_splitter;
}
/// generate the script items /// generate the script items
/// The caps parameter is used to choose the algorithm of splitting text and assigning roles to the textitems /// The caps parameter is used to choose the algorithm of splitting text and assigning roles to the textitems
void generate(int start, int length, QFont::Capitalization caps) void generate(int start, int length, QFont::Capitalization caps)
@ -101,7 +96,7 @@ private:
return; return;
if (!m_splitter) if (!m_splitter)
m_splitter = new QTextBoundaryFinder(QTextBoundaryFinder::Word, m_splitter = std::make_unique<QTextBoundaryFinder>(QTextBoundaryFinder::Word,
m_string.constData(), m_string.size(), m_string.constData(), m_string.size(),
/*buffer*/nullptr, /*buffer size*/0); /*buffer*/nullptr, /*buffer size*/0);
@ -171,7 +166,7 @@ private:
const QString &m_string; const QString &m_string;
const QScriptAnalysis * const m_analysis; const QScriptAnalysis * const m_analysis;
QScriptItemArray &m_items; QScriptItemArray &m_items;
QTextBoundaryFinder *m_splitter; std::unique_ptr<QTextBoundaryFinder> m_splitter;
}; };
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------