startwindow refactoring. BROKEN

src/gui/qt/guiwrapper.cpp

@@ -29,17 +29,13 @@
 using namespace std;
 
 
-GuiWrapper::GuiWrapper(ConfigFile *c) : myLog(NULL), myW(NULL), myConfig(c)
+GuiWrapper::GuiWrapper(ConfigFile *c, startWindowImpl *s) : myLog(NULL), myW(NULL), myConfig(c), myStartWindow(s)
 {
 
 
 	myW = new gameTableImpl(myConfig);
-// 	myW->show();
 	myLog = new Log(myW, myConfig);
 
-	myStartWindow = boost::shared_ptr<startWindowImpl>(new startWindowImpl(myW, myConfig));
-	myStartWindow->show();
-
 	myW->setStartWindow(myStartWindow);
 }
 

src/gui/qt/guiwrapper.h

@@ -31,10 +31,11 @@ class Log;
 class Chat;
 class ConfigFile;
 
+
 class GuiWrapper : public GuiInterface
 {
 public:
-	GuiWrapper(ConfigFile*);
+	GuiWrapper(ConfigFile*, startWindowImpl*);
 
 	~GuiWrapper();
 

src/gui/qt/startwindow/startwindowimpl.cpp

@@ -25,6 +25,7 @@
 
 #include "session.h"
 #include "game.h"
+#include "guiwrapper.h"
 
 #include "configfile.h"
 #include "gametableimpl.h"
@@ -43,11 +44,18 @@
 #include "timeoutmsgboximpl.h"
 #include "lobbychat.h"
 
-
+startWindowImpl::startWindowImpl(ConfigFile *c)
-
+    : myW(NULL), myConfig(c)
-startWindowImpl::startWindowImpl(gameTableImpl *w, ConfigFile *c)
-    : myW(w), myConfig(c)
 {
+
+	boost::shared_ptr<GuiInterface> myGuiInterface(new GuiWrapper(myConfig, this));
+	{
+		boost::shared_ptr<Session> session(new Session(myGuiInterface.get(), myConfig));
+		session->init(); // TODO handle error
+		myGuiInterface->setSession(session);
+	}
+
+
 // #ifdef __APPLE__
 // 	setWindowModality(Qt::ApplicationModal);
 // 	setWindowFlags(Qt::WindowSystemMenuHint | Qt::CustomizeWindowHint | Qt::Dialog);
@@ -123,6 +131,7 @@ startWindowImpl::startWindowImpl(gameTableImpl *w, ConfigFile *c)
 	connect(this, SIGNAL(signalIrcError(int)), myGameLobbyDialog->getLobbyChat(), SLOT(chatError(int)));
 	connect(this, SIGNAL(signalIrcServerError(int)), myGameLobbyDialog->getLobbyChat(), SLOT(chatServerError(int)));
 	
+	this->show();
 
 }
 

src/gui/qt/startwindow/startwindowimpl.h

@@ -25,6 +25,7 @@
 #include "game_defs.h"
 
 class GuiInterface;
+class GuiWrapper;
 class Session;
 class Game;
 
@@ -46,7 +47,7 @@ class timeoutMsgBoxImpl;
 class startWindowImpl: public QMainWindow, public Ui::startWindow {
 Q_OBJECT
 public:
-    startWindowImpl(gameTableImpl *w = 0, ConfigFile *c =0);
+    startWindowImpl(ConfigFile *c =0);
 
 	void setSession(boost::shared_ptr<Session> session) { mySession = session; }
 	Session &getSession() { assert(mySession.get()); return *mySession; }

src/pokerth.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #include "session.h"
-#include "guiwrapper.h"
+#include "startwindowimpl.h"
 #include "configfile.h"
 #include "startsplash.h"
 #include "game_defs.h"
@@ -65,7 +65,7 @@
 
 using namespace std;
 
-class GuiWrapper;
+class startWindowImpl;
 class Game;
 
 int main( int argc, char **argv )
@@ -133,12 +133,13 @@ int main( int argc, char **argv )
 	///////////////////////////////////////////////////	
 
 
-	boost::shared_ptr<GuiInterface> myGuiInterface(new GuiWrapper(myConfig));
+	boost::shared_ptr<startWindowImpl>(new startWindowImpl(myConfig));
-	{
+// 	boost::shared_ptr<GuiInterface> myGuiInterface(new GuiWrapper(myConfig));
-		boost::shared_ptr<Session> session(new Session(myGuiInterface.get(), myConfig));
+// 	{
-		session->init(); // TODO handle error
+// 		boost::shared_ptr<Session> session(new Session(myGuiInterface.get(), myConfig));
-		myGuiInterface->setSession(session);
+// 		session->init(); // TODO handle error
-	}
+// 		myGuiInterface->setSession(session);
+// 	}
 	
 	int retVal = a.exec();