diff -r 2d4cc445a86a -r ee6b0f3a4c2f ornamentedobj.h --- a/ornamentedobj.h Mon Mar 23 09:06:51 2009 +0000 +++ b/ornamentedobj.h Thu Mar 26 07:49:17 2009 +0000 @@ -53,12 +53,6 @@ virtual void moveBy (QPointF); virtual void move2RelPos (QPointF); // move relativly to parent^ virtual void move2RelPos (double,double); - virtual void setNote(QString); // set note - virtual void setNote(NoteObj); // set note - virtual QString getNote(); // returns note (HTML) - virtual QString getNoteASCII(const QString &indent, const int &width); // returns note (ASCII) - virtual QString getNoteASCII(); // returns note (ASCII) - virtual QString getNoteOpenDoc(); // returns note (OpenDoc) virtual void setURL (QString); virtual QString getURL (); @@ -76,18 +70,16 @@ virtual bool isSetStandardFlag(QString); virtual QString getSystemFlagName (const QPointF &p); virtual bool isActiveFlag(const QString&); // check if flag is set - virtual void updateNoteFlag(); - virtual void getNoteFromTextEditor (); + virtual void updateSystemFlags(); + //virtual void getNoteFromTextEditor ();// FIXME should move to vymview?! virtual void updateFlagsToolbar(); virtual void setHideInExport(bool); // set export of object (and children) - virtual bool hideInExport(); - virtual bool isHidden (); + virtual bool hideInExport(); // FIXME moved to treeitem + virtual bool isHidden (); // FIXME moved to treeitem virtual QString getOrnXMLAttr(); // get attributes for saveToDir protected: HeadingObj *heading; // Heading - NoteObj note; // Notes - bool isNoteInEditor; // true if TextEditor has this note FlagRowObj *systemFlags; // System Flags FlagRowObj *standardFlags; // Standard Flags FrameObj *frame; // frame around object @@ -97,7 +89,7 @@ QList attributes; // List with attributes bool hideExport; // hide in exports if set - bool hidden; // true if temporary hidden + bool hidden; // true if temporary hidden // FIXME moved to treeitem needs to move }; #endif