Changes in preparation for the integration of the network server. GUI does not directly know Game and Hand any more, only Session. WARNING: This version crashes due to initialization order problems.

src/gui/qt/guiwrapper.h

@@ -30,23 +30,22 @@
 #include <string>
 #include <iostream>
 
-#include "handinterface.h"
-#include "session.h"
-#include "game.h"
-
+class Session;
 
 class GuiWrapper : public GuiInterface
 {
 public:
-    GuiWrapper();
+	GuiWrapper();
 
-    ~GuiWrapper();
+	~GuiWrapper();
 
 	void initGui(int speed);
 
-	void setGame(Game*);
-	void setHand(HandInterface*);
-	void setSession(Session*);	
+	Session &getSession();
+	void setSession(boost::shared_ptr<Session> session);
+
+	bool isNetworkServer() const;
+	void waitForNetworkAction(GameState state, unsigned uniquePlayerId);
 
 	void refreshSet() const;
 	void refreshCash() const;