Back to rev. 347

2007-04-20 23:14:08 +00:00
parent 57927b7d73
commit a8cce94d3b
32 changed files with 315 additions and 333 deletions
@@ -24,13 +24,16 @@
 using namespace std;


-GuiWrapper::GuiWrapper(Session *session) : myLog(0), myW(0)
+GuiWrapper::GuiWrapper() : myLog(0), myW(0)
 {
-	myW = new mainWindowImpl(session);
+
+
+	myW = new mainWindowImpl;
 	myW->show();

 	myLog = new Log(myW);
-	
+	myConfig = new ConfigFile;
+
 }


@@ -85,6 +88,9 @@ void GuiWrapper::meInAction() const { myW->meInAction(); }
 void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->logPlayerActionMsg(playerName, action, setValue); }
 void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->logNewGameHandMsg(gameID, handID); }

+std::string GuiWrapper::stringToUtf8(const std::string &myString) { return myQtHelper->stringToUtf8(myString); }
+
+
 void GuiWrapper::SignalNetClientConnect(int actionID) { myW->SignalNetClientConnect(actionID); }
 void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->SignalNetClientGameInfo(actionID); }
 void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->SignalNetClientError(errorID, osErrorID); }