diff -r 67cfa6e6b863 -r 7ced3733ba60 mapeditor.h
--- a/mapeditor.h	Tue Oct 24 15:36:38 2006 +0000
+++ b/mapeditor.h	Mon Oct 30 12:39:37 2006 +0000
@@ -20,7 +20,6 @@
 public:
     MapEditor(QWidget* parent=0,  const char* name=0, Qt::WFlags f=0);
 	~MapEditor();
-    QColor getColor();
     QColor getBackgroundColor();
     MapCenterObj* getMapCenter();
 	Q3Canvas* getCanvas();
@@ -32,16 +31,15 @@
 	void makeTmpDirs();		// create temporary directories
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     void saveStateComplete       (const QString &);					
-    void saveStateChangingPart (LinkableMapObj *, const QString &);
+    void saveStateChangingPart (LinkableMapObj *, LinkableMapObj *, const QString &, const QString &);
     void saveStateRemovingPart (LinkableMapObj *, const QString &);
-    void saveStateConstSelection (const QString &, const QString &, const QString &);
     void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
     void saveState(const QString &, const QString &, const QString &, const QString &, const QString &);
     void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *);
 public:	
     void parseAtom(const QString &);	
 private:
-    void addFloatImage(const QPixmap &img);
+    void addFloatImageInt(const QPixmap &img);
 
   private slots:
     void fetchImage(const QString &img);
@@ -123,16 +121,16 @@
     void selectRightBranch();
     void selectFirstBranch();
     void selectLastBranch();
-    void setColor(QColor);
     void selectBackgroundColor();
     void setBackgroundColor(QColor);
-    QColor pickColor();
-    void colorItem();
-    void colorBranch();
+    QColor getCurrentHeadingColor();
+    void colorItem(QColor);
+    void colorBranch(QColor);
 	void toggleStandardFlag(QString);
 	virtual void setViewCenter();			// needed for zooming
     BranchObj* findText(QString,bool);		// Find object
     void findReset();						// Reset Find 
+	void setURL(const QString &);			// set the URL
 	void editURL();							// edit the URL
 	QString getURL();						// returns URL of selection or ""
 	QStringList getURLs();					// returns URLs of subtree
@@ -143,9 +141,10 @@
 	void deleteVymLink();					// delete link to another map
 	QString getVymLink();					// return path to map
 	QStringList getVymLinks();				// return paths in subtree
+	void setHideExport(bool);				// toggle the export flag
 	void toggleHideExport();				// toggle the export flag
-	void removeBranchKeepChilds();			// remove but keep childs
-	void removeChilds();					// remove childs
+	void deleteKeepChilds();				// remove but keep childs
+	void deleteChilds();					// remove childs
 	void editMapInfo();						// dialog to enter author, ...
 	void updateActions();					// update e.g. format buttons
 	void updateNoteFlag();					// when TextEditor changes
@@ -198,7 +197,6 @@
 	bool adjustCanvasRequested;	// collect requests until end of user event
 	BranchObj *editingBO;		// entering Text into BO
 
-    QColor actColor;			// actual color
 	QColor defLinkColor;		// default color for links
 	QColor defXLinkColor;		// default color for xlinks
 	int defXLinkWidth;			// default width for xlinks