diff -r 41c3d7f9f532 -r 557239819c45 mapeditor.h --- a/mapeditor.h Tue Aug 29 08:31:42 2006 +0000 +++ b/mapeditor.h Wed Aug 30 12:16:25 2006 +0000 @@ -2,14 +2,14 @@ #define MAPEDITOR_H #include +//#include +//#include +#include +#include #include -//#include +#include +#include #include -//#include -#include -#include -#include -#include #include #include #include @@ -46,7 +46,8 @@ void saveStatePart (LinkableMapObj *, const QString &); void saveStateConstSelection (const QString &, const QString &, const QString &); void saveStateX (LinkableMapObj *, const QString &, const QString &); - void saveState(const SaveMode&, const QString &, LinkableMapObj *, const QString &, LinkableMapObj *, const QString &); + void saveStateComData (LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &, LinkableMapObj *); + void saveState(const SaveMode&, LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &, LinkableMapObj *); void parseAtom(const QString &); void addFloatImage(const QPixmap &img); @@ -99,7 +100,6 @@ void move(const int &,const int&); void moveBranchUp(); void moveBranchDown(); - void editHeading(); // Start editing heading QString getHeading (bool &,QPoint &); // Get heading, ok if selection is branch void setHeading(const QString &); private: @@ -113,7 +113,8 @@ LinkableMapObj* getSelection(); // returns selection void unselect(); // before changing current noteedit void reselect(); // after changing current noteedit - bool select(const QString &); // Select + bool select(const QString &); // Select by string + QString getSelectString(); private: void selectInt(LinkableMapObj*); void selectNextBranchInt(); // Increment number of branch @@ -137,12 +138,14 @@ void findReset(); // Reset Find void editURL(); // edit the URL QString getURL(); // returns URL of selection or "" + QStringList getURLs(); // returns URLs of subtree void editHeading2URL(); // copy heading to URL void editBugzilla2URL(); // create URL to Bugzilla void editFATE2URL(); // create URL to FATE void editVymLink(); // edit link to another map void deleteVymLink(); // delete link to another map QString getVymLink(); // return path to map + QStringList getVymLinks(); // return paths in subtree void toggleHideExport(); // toggle the export flag void removeBranchKeepChilds(); // remove but keep childs void removeChilds(); // remove childs