diff -r 85dec6a8c12c -r 9db215a4ad53 vymmodel.h
--- a/vymmodel.h	Mon Jul 27 12:53:17 2009 +0000
+++ b/vymmodel.h	Mon Jul 27 12:53:17 2009 +0000
@@ -3,8 +3,11 @@
 
 #include <QGraphicsScene>
 #include <QtNetwork>
-#include <QtDBus/QDBusConnection>
 
+#include <QtDBus/QDBusAbstractAdaptor>
+#include <QtDBus/QDBusVariant>
+
+#include "adaptormodel.h"
 #include "file.h"
 #include "imageitem.h"
 #include "mapeditor.h"
@@ -15,14 +18,15 @@
 class BranchItem;
 class MapEditor;
 
-class VymModel : public TreeModel {		
+class VymModel :  public TreeModel {		
 	Q_OBJECT
+	Q_CLASSINFO("D-Bus Interface", "org.insilmaril.vym.VymModel-h")
+
 
 ////////////////////////////////////////////
 // General housekeeping
 ////////////////////////////////////////////
 private:
-	QGraphicsScene *mapScene;
 	QString version;	//!< version string saved in vym file
 	QString author;
 	QString comment;
@@ -215,6 +219,8 @@
 ////////////////////////////////////////////
 // unsorted so far
 ////////////////////////////////////////////
+private:
+	QGraphicsScene *mapScene;
 public:
 	void setScene(QGraphicsScene *s);
 	QGraphicsScene *getScene();
@@ -236,13 +242,13 @@
 	int branchCount();
 
 public:	
-	void setHeading(const QString &);		//!< Set heading of branch	
-//	QString getHeading (bool &ok,QPoint &p); //!< Get heading, ok if selection is branch
+	void setHeading(const QString &);		//!< Set heading of item	
+	QString getHeading ();					//!< Get heading of item
 
 private:
-	BranchItem* findCurrent;		// next object in find process
-	BranchItem* findPrevious;		// next object in find process
-	bool EOFind;				// true, if search failed
+	BranchItem* findCurrent;				// next object in find process
+	BranchItem* findPrevious;				// next object in find process
+	bool EOFind;							// true, if search failed
 public:
     BranchItem* findText(QString,bool);		// Find object
     void findReset();						// Reset Search
@@ -272,17 +278,17 @@
 private:	
     void pasteNoSave(const int &n);		//!< paste clipboard to branch
 public:	
-    void paste();		//!< Paste clipboard to branch and backup
-    void cut();			//!< Cut to clipboard (and copy)
+    void paste();			//!< Paste clipboard to branch and backup
+    void cut();				//!< Cut to clipboard (and copy)
 
-    void moveUp();	//!< Move branch up
-    void moveDown();	//!< Move branch down
+    void moveUp();			//!< Move branch up
+    void moveDown();		//!< Move branch down
 	void sortChildren();	//!< Sort children lexically
 
 	// The create methods are used to quickly parse a XML file
 	BranchItem* createMapCenter();				//!< Create MapCenter 
 	BranchItem* createBranch(BranchItem *dst);	//!< Create Branch
-	ImageItem* createImage(BranchItem *dst);		//!< Create image
+	ImageItem* createImage(BranchItem *dst);	//!< Create image
 
 	/*! \brief Add new mapcenter
 
@@ -421,7 +427,6 @@
 	void updateNoteFlag();				//!< Signal origination in TextEditor
     void updateRelPositions();
 
-	QRectF getTotalBBox();
 	void reposition();					//!< Call reposition for all MCOs
 	void setHideTmpMode (TreeItem::HideTmpMode mode);	
 
@@ -444,9 +449,6 @@
 	LinkableMapObj::ColorHint linkcolorhint;// use heading color or own color
 	LinkableMapObj::Style linkstyle;		// default style for links
 
-private:
-    QPixmap getPixmap();
-
 public:
 	void setMapLinkStyle (const QString &);	// Set style of link
 	LinkableMapObj::Style getMapLinkStyle ();	// requested in LMO
@@ -531,9 +533,12 @@
 	void readData();
 	void displayNetworkError (QAbstractSocket::SocketError);
 
-private:	
-	void displayClientError(QAbstractSocket::SocketError socketError);
+////////////////////////////////////////////
+// DBUS related 
+////////////////////////////////////////////
 
+private:
+AdaptorModel *adaptorModel; //FIXME-3
 
 ////////////////////////////////////////////
 // Selection related