1.1 --- a/vymmodel.h	Wed Jun 03 20:37:17 2009 +0000
     1.2 +++ b/vymmodel.h	Mon Jun 08 11:36:56 2009 +0000
     1.3 @@ -5,7 +5,7 @@
     1.4  #include <QtNetwork>
     1.5  
     1.6  #include "file.h"
     1.7 -#include "floatimageobj.h"
     1.8 +#include "imageitem.h"
     1.9  #include "mapeditor.h"
    1.10  #include "parser.h"
    1.11  #include "treeitem.h"
    1.12 @@ -107,8 +107,8 @@
    1.13      void addMapReplaceInt(const QString & undoSel, const QString & path);
    1.14      void addMapInsertInt (const QString & path, int pos);
    1.15  
    1.16 -	FloatImageObj* loadFloatImageInt (BranchItem *dst,QString);
    1.17 -	void saveFloatImageInt (FloatImageObj*, const QString &, const QString &);
    1.18 +	ImageItem* loadFloatImageInt (BranchItem *dst,QString);
    1.19 +	void saveFloatImageInt (ImageItem*, const QString &, const QString &);
    1.20  public:	
    1.21  	void loadFloatImage ();
    1.22  	void saveFloatImage ();
    1.23 @@ -151,8 +151,8 @@
    1.24  	  Returns heading of a branch or name of an object for use in comment
    1.25  	  of undo/redo history
    1.26  	*/ 
    1.27 -	QString getObjectName(const LinkableMapObj*);	
    1.28 -	QString getObjectName(const TreeItem*);	
    1.29 +	QString getObjectName(LinkableMapObj*);	
    1.30 +	QString getObjectName(TreeItem*);	
    1.31  
    1.32      void redo();						//!< Redo last action
    1.33  	bool isRedoAvailable();				//!< True, if redo is available
    1.34 @@ -282,7 +282,7 @@
    1.35  	// The create methods are used to quickly parse a XML file
    1.36  	BranchItem* createMapCenter();				//!< Create MapCenter 
    1.37  	BranchItem* createBranch(BranchItem *dst);	//!< Create Branch
    1.38 -	TreeItem* createImage(BranchItem *dst);		//!< Create image
    1.39 +	ImageItem* createImage(BranchItem *dst);		//!< Create image
    1.40  
    1.41  	/*! \brief Add new mapcenter
    1.42  
    1.43 @@ -323,11 +323,12 @@
    1.44  	*/	
    1.45  	bool relinkBranch (BranchItem* branch, BranchItem* dst, int pos =-1);	
    1.46  
    1.47 -    void deleteSelection();					//!< Delete selection
    1.48 -	void deleteKeepChildren();				//!< remove branch, but keep children
    1.49 -	void deleteChildren();					//!< keep branch, but remove children
    1.50 +    void deleteSelection();				//!< Delete selection
    1.51 +	void deleteKeepChildren();			//!< remove branch, but keep children
    1.52 +	void deleteChildren();				//!< keep branch, but remove children
    1.53  
    1.54  private:	
    1.55 +	TreeItem* deleteItem(TreeItem*);	//!< Delete item and return parent (if parent!= rootItem)
    1.56  	bool scrollBranch(BranchItem *);
    1.57  	bool unscrollBranch(BranchItem *);
    1.58  public:	
    1.59 @@ -578,11 +579,11 @@
    1.60  public:
    1.61  	TreeItem::Type selectionType();
    1.62  	LinkableMapObj* getSelectedLMO();
    1.63 -	BranchObj* getSelectedBranchObj();	// FIXME-2 replace by item...
    1.64 +	BranchObj* getSelectedBranchObj();	// FIXME-3 replace by item...
    1.65  	BranchItem* getSelectedBranchItem();
    1.66  	TreeItem* getSelectedItem();
    1.67  	QModelIndex getSelectedIndex();
    1.68 -	FloatImageObj* getSelectedFloatImage();
    1.69 +	ImageItem* getSelectedImageItem();
    1.70  	QString getSelectString ();
    1.71  	QString getSelectString (LinkableMapObj *lmo);
    1.72  	QString getSelectString (TreeItem *item);