diff -r 497f19b3c1fe -r 16d63fc9ae42 mapeditor.h
--- a/mapeditor.h	Tue Nov 06 13:54:41 2007 +0000
+++ b/mapeditor.h	Thu Nov 08 15:28:03 2007 +0000
@@ -4,8 +4,9 @@
 #include <QGraphicsView>
 #include <QtNetwork>
 
+#include "attribute.h"
+#include "file.h"
 #include "mapcenterobj.h"
-#include "file.h"
 #include "misc.h"
 #include "parser.h"
 #include "ornamentedobj.h"
@@ -15,7 +16,7 @@
 
 /*! \brief Main widget in vym to display and edit a map */
 
-class MapEditor : public QGraphicsView, public xmlObj {
+class MapEditor : public QGraphicsView, public XMLObj {
     Q_OBJECT
 
 public:
@@ -427,6 +428,10 @@
 	QPoint exportOffset;		// set before export, used in save
 	BranchObj::HideTmpMode hidemode;	// true while exporting to hide some stuff
 
+	QList <Attribute> attributes;	// List with attributes
+
+
+	// Network connections **Experimental**
 	NetState netstate;			// offline, client, server
 	QTcpServer *tcpServer;		// Act as server in conference mode (experimental)
 	QList <QTcpSocket*> clientList;		// List of connected clients
@@ -438,6 +443,7 @@
 	void displayClientError(QAbstractSocket::SocketError socketError);
 
 
+	// Animation data **experimental**
 	int timerId;				// animation timer
 	QList <MapObj*> animObjList;// list with animated objects
 };