diff -r 28be7520cb21 -r be24af55da40 mapeditor.h --- a/mapeditor.h Fri Jun 29 09:43:53 2007 +0000 +++ b/mapeditor.h Fri Jun 29 09:43:53 2007 +0000 @@ -29,6 +29,15 @@ Idle, //!< Idle, waiting for user event EditHeading //!< Editing heading (dont't select another branch now) }; + /*! \brief Networking states + + In Network modus we want to switch of saveState, autosave, ... + */ + enum NetState { + Offline, //!< Offline + Client, //!< I am the client and connected to server + Server //!< I am the server + }; MapEditor(QWidget* parent=0); ~MapEditor(); MapCenterObj* getMapCenter(); //!< Return center of map @@ -336,10 +345,14 @@ public: void newServer(); + void connectToServer(); private slots: void newClient(); void sendData(const QString &s); + void readData(); + void displayNetworkError (QAbstractSocket::SocketError); + void autosave (); private: @@ -410,8 +423,16 @@ QPoint exportOffset; // set before export, used in save BranchObj::HideTmpMode hidemode; // true while exporting to hide some stuff + NetState netstate; // offline, client, server QTcpServer *tcpServer; // Act as server in conference mode (experimental) - QList clientList; + QList clientList; // List of connected clients + quint16 sendCounter; // Increased with every sent command + + QTcpSocket *clientSocket; // socket of this client + QString server; // server address of this client + int port; // server port of this client + void displayClientError(QAbstractSocket::SocketError socketError); + int timerId; // animation timer QList animObjList;// list with animated objects