diff -r eacf1b165d2d -r f19bbd639726 mapeditor.h --- a/mapeditor.h Wed Jun 20 11:58:47 2007 +0000 +++ b/mapeditor.h Thu Jun 21 14:27:46 2007 +0000 @@ -2,6 +2,7 @@ #define MAPEDITOR_H #include +#include #include "mapcenterobj.h" #include "file.h" @@ -308,7 +309,8 @@ void importDir(); void followXLink (int); void editXLink (int); - void testFunction(); // just testing new stuff + void testFunction1(); // just testing new stuff + void testFunction2(); // just testing new stuff // set /mainwindo/showTestMenu=true... protected: @@ -330,6 +332,7 @@ private slots: void autosave (); + void newClient(); private: State state; // State of MapEditor @@ -399,6 +402,9 @@ QPoint exportOffset; // set before export, used in save BranchObj::HideTmpMode hidemode; // true while exporting to hide some stuff + QTcpServer *tcpServer; // Act as server in conference mode (experimental) + QList clientList; + int timerId; // animation timer QList animObjList;// list with animated objects };