Differential D19884 Diff 54322 plugins/textshape/TextDocumentStructureModel.cpp

Changeset View

Standalone View

View Options

plugins/textshape/TextDocumentStructureModel.cpp

Context not available.
295 295​
296void TextDocumentStructureModel::setTextDocument(QTextDocument* textDocument) 296​void TextDocumentStructureModel::setTextDocument(QTextDocument* textDocument)
297{ 297​{
298​ beginResetModel();
298 if (m_textDocument) { 299​ if (m_textDocument) {
299 m_textDocument->disconnect(this); 300​ m_textDocument->disconnect(this);
300 } 301​ }
Context not available.
305 connect(m_textDocument, SIGNAL(contentsChanged()), SLOT(onContentsChanged())); 306​ connect(m_textDocument, SIGNAL(contentsChanged()), SLOT(onContentsChanged()));
306 } 307​ }
307 308​
308 reset(); 309​ endResetModel();
dcalisteUnsubmitted
Not Done

I did the same changes in https://phabricator.kde.org/D15102 at another place and I put the begin and end at the start and end of the routine, like you did. But I remember that I got review asking not to risk to change signal order emission, in case, and put the begin/end just around the m_textDocument assignment.

I'm not completely sure that I remember correctly and I cannot find it in Phabricator anymore...

dcaliste: I did the same changes in https://phabricator.kde.org/D15102 at another place and I put the…
pvuorelaAuthorUnsubmitted
Not Done

Wouldn't expect much risk. modelAboutToBeReset is rarely used, grepping Calligra returns only text shape style dialog thing which only repeats the action, and relying on state between begin&end doesn't soud like a good idea.

pvuorela: Wouldn't expect much risk. modelAboutToBeReset is rarely used, grepping Calligra returns only…
dandersUnsubmitted
Not Done

Hmmm, cannot find the diff either, but I *think* it was about an emit, wasn' it?

danders: Hmmm, cannot find the diff either, but I *think* it was about an emit, wasn' it?
309} 310​}
310 311​
311int TextDocumentStructureModel::lineIndex(const QTextBlock &block, const QTextLine &line) const 312​int TextDocumentStructureModel::lineIndex(const QTextBlock &block, const QTextLine &line) const
Context not available.
365 366​
366void TextDocumentStructureModel::onContentsChanged() 367​void TextDocumentStructureModel::onContentsChanged()
367{ 368​{
368 reset(); 369​ beginResetModel();
370​ endResetModel();
369} 371​}
370 372​
371void TextDocumentStructureModel::onModelReset() 373​void TextDocumentStructureModel::onModelReset()
Context not available.