Author: jghali
Date: Mon Apr 20 12:17:51 2020
New Revision: 23628

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23628
Log:
Rename PageItem_NoteFrame's setNS() to setNoteStyle()

Modified:
    trunk/Scribus/scribus/pageitem_noteframe.cpp
    trunk/Scribus/scribus/pageitem_noteframe.h
    
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23628&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp        (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp        Mon Apr 20 12:17:51 2020
@@ -133,7 +133,7 @@
        deleteIt = false;
 }
 
-void PageItem_NoteFrame::setNS(NotesStyle *nStyle, PageItem_TextFrame* master)
+void PageItem_NoteFrame::setNoteStyle(NotesStyle *nStyle, PageItem_TextFrame* 
master)
 {
        m_nstyle = nStyle;
        if (master != nullptr)

Modified: trunk/Scribus/scribus/pageitem_noteframe.h
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23628&path=/trunk/Scribus/scribus/pageitem_noteframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.h  (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.h  Mon Apr 20 12:17:51 2020
@@ -28,7 +28,7 @@
        bool deleteIt;
 
        //used while reading SLA file
-       void setNS(NotesStyle* nStyle, PageItem_TextFrame* master = nullptr);
+       void setNoteStyle(NotesStyle* nStyle, PageItem_TextFrame* master = 
nullptr);
        //returns Notes Style
        NotesStyle* notesStyle() { return m_nstyle; }
 

Modified: 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23628&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp  
    (original)
+++ 
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp  
    Mon Apr 20 12:17:51 2020
@@ -7127,7 +7127,7 @@
                                PageItem* item = LinkID.value(eF.myID);
                                if ((item != nullptr) && item->isNoteFrame())
                                {
-                                       item->asNoteFrame()->setNS(NS);
+                                       item->asNoteFrame()->setNoteStyle(NS);
                                        if (NS->isEndNotes())
                                        {
                                                if (eF.NSrange == NSRdocument)


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to