r23678 by craig - Cleanup initialisation in noteframe
scribus-commit
scribus-commit at lists.scribus.net
Sun May 3 15:28:15 UTC 2020
Author: craig
Date: Sun May 3 15:28:15 2020
New Revision: 23678
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23678
Log:
Cleanup initialisation in noteframe
Modified:
trunk/Scribus/scribus/pageitem_noteframe.cpp
trunk/Scribus/scribus/pageitem_noteframe.h
Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23678&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp Sun May 3 15:28:15 2020
@@ -18,7 +18,6 @@
: PageItem_TextFrame(doc, x, y, w, h, w2, fill, outline)
{
m_nstyle = nStyle;
- m_masterFrame = nullptr;
itemText.clear();
m_itemName = generateUniqueCopyName(nStyle->isEndNotes() ? tr("Endnote frame ") + m_nstyle->name() : tr("Footnote frame ") + m_nstyle->name(), false);
@@ -65,8 +64,6 @@
PageItem_NoteFrame::PageItem_NoteFrame(ScribusDoc *doc, double x, double y, double w, double h, double w2, const QString& fill, const QString& outline)
: PageItem_TextFrame(doc, x, y, w, h, w2, fill, outline)
{
- m_nstyle = nullptr;
- m_masterFrame = nullptr;
m_textFlowMode = TextFlowUsesFrameShape;
deleteIt = false;
}
Modified: trunk/Scribus/scribus/pageitem_noteframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23678&path=/trunk/Scribus/scribus/pageitem_noteframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.h (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.h Sun May 3 15:28:15 2020
@@ -61,8 +61,8 @@
private:
QList<TextNote*> m_notes;
- NotesStyle* m_nstyle;
- PageItem_TextFrame *m_masterFrame;
+ NotesStyle* m_nstyle {nullptr};
+ PageItem_TextFrame *m_masterFrame {nullptr};
//insert note at end of text in noteframe
void insertNote(TextNote* note);
More information about the scribus-commit
mailing list