sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stringToUtf8 added in guiinterface

Browse Source
This commit is contained in:
doitux
2007-04-08 16:46:50 +00:00
parent 2f5c8d7da1
commit e89b543a92
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth.pro
+17 -13
View File
@@ -22,6 +22,7 @@ DEPENDPATH += . \
src/gui/qt/createnetworkgamedialog \ src/gui/qt/createnetworkgamedialog \
src/gui/qt/joinnetworkgamedialog \ src/gui/qt/joinnetworkgamedialog \
src/gui/qt/log \ src/gui/qt/log \
src/gui/qt/qthelper \
src/gui/qt/newlocalgamedialog \ src/gui/qt/newlocalgamedialog \
src/gui/qt/settingsdialog \ src/gui/qt/settingsdialog \
src/gui/qt/startnetworkgamedialog \ src/gui/qt/startnetworkgamedialog \
@@ -36,6 +37,7 @@ INCLUDEPATH += . \
src/core/tinyxml \ src/core/tinyxml \
src/gui/qt \ src/gui/qt \
src/gui/qt/log \ src/gui/qt/log \
src/gui/qt/qthelper \
src/gui/qt/connecttoserverdialog \ src/gui/qt/connecttoserverdialog \
src/core \ src/core \
src/gui/qt/mainwindow \ src/gui/qt/mainwindow \
@@ -99,7 +101,8 @@ HEADERS += src/game.h \
src/gui/qt/newlocalgamedialog/newgamedialogimpl.h \ src/gui/qt/newlocalgamedialog/newgamedialogimpl.h \
src/gui/qt/settingsdialog/settingsdialogimpl.h \ src/gui/qt/settingsdialog/settingsdialogimpl.h \
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.h \
src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.h \
src/gui/qt/qthelper/qthelper.h
FORMS += src/gui/qt/mainwindow.ui \ FORMS += src/gui/qt/mainwindow.ui \
src/gui/qt/aboutpokerth.ui \ src/gui/qt/aboutpokerth.ui \
src/gui/qt/connecttoserverdialog.ui \ src/gui/qt/connecttoserverdialog.ui \
@@ -170,27 +173,28 @@ SOURCES += src/game.cpp \
src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp \ src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp \
src/gui/qt/settingsdialog/settingsdialogimpl.cpp \ src/gui/qt/settingsdialog/settingsdialogimpl.cpp \
src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \ src/gui/qt/startnetworkgamedialog/startnetworkgamedialogimpl.cpp \
src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp src/gui/qt/waitforservertostartgamedialog/waitforservertostartgamedialogimpl.cpp \
src/gui/qt/qthelper/qthelper.cpp
RESOURCES += src/gui/qt/resources.qrc RESOURCES += src/gui/qt/resources.qrc
TEMPLATE = vcapp TEMPLATE = vcapp
TEMPLATE = app TEMPLATE = app
win32 { win32{
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
SOURCES += src/core/win32/rand.cpp \ SOURCES += src/core/win32/rand.cpp \
src/net/win32/socket_helper.cpp \ src/net/win32/socket_helper.cpp \
src/net/win32/socket_startup.cpp src/net/win32/socket_startup.cpp
INCLUDEPATH += ../boost/ INCLUDEPATH += ../boost/
LIBPATH += ../boost/stage/lib LIBPATH += ../boost/stage/lib
LIBS += gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ole32.lib uuid.lib user32.lib msimg32.lib shell32.lib kernel32.lib ws2_32.lib advapi32.lib LIBS += gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib winspool.lib ole32.lib uuid.lib user32.lib msimg32.lib shell32.lib kernel32.lib ws2_32.lib advapi32.lib
RC_FILE = pokerth.rc RC_FILE = pokerth.rc
} }
!win32 { !win32{
DEPENDPATH += src/net/linux/ src/core/linux DEPENDPATH += src/net/linux/ src/core/linux
SOURCES += src/core/linux/rand.cpp \ SOURCES += src/core/linux/rand.cpp \
src/net/linux/socket_helper.cpp \ src/net/linux/socket_helper.cpp \
src/net/linux/socket_startup.cpp src/net/linux/socket_startup.cpp
LIBS += -lboost_thread -lcrypto LIBS += -lboost_thread -lcrypto
} }
CONFIG += qt release CONFIG += qt release
src/gui/guiinterface.h
+3
View File
@@ -98,6 +98,9 @@ public:
virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0; virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
virtual void logNewGameHandMsg(int gameID, int HandID) =0; virtual void logNewGameHandMsg(int gameID, int HandID) =0;
//qthelper.cpp
virtual std::string stringToUtf8(const std::string &) =0;
}; };
#endif #endif
src/gui/qt/guiwrapper.cpp
+3
View File
@@ -90,6 +90,9 @@ void GuiWrapper::meInAction() const { myW->meInAction(); }
void GuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) { myLog->logPlayerActionMsg(playerName, action, setValue); } 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); } void GuiWrapper::logNewGameHandMsg(int gameID, int handID) { myLog->logNewGameHandMsg(gameID, handID); }
std::string GuiWrapper::stringToUtf8(const std::string &myString) { myQtHelper->stringToUtf8(myString); }
void GuiWrapper::SignalNetClientConnect(int actionID) { myW->SignalNetClientConnect(actionID); } void GuiWrapper::SignalNetClientConnect(int actionID) { myW->SignalNetClientConnect(actionID); }
void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->SignalNetClientGameInfo(actionID); } void GuiWrapper::SignalNetClientGameInfo(int actionID) { myW->SignalNetClientGameInfo(actionID); }
void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->SignalNetClientError(errorID, osErrorID); } void GuiWrapper::SignalNetClientError(int errorID, int osErrorID) { myW->SignalNetClientError(errorID, osErrorID); }
src/gui/qt/guiwrapper.h
+4
View File
@@ -25,6 +25,7 @@
#include "log.h" #include "log.h"
#include "mainwindowimpl.h" #include "mainwindowimpl.h"
#include "connecttoserverdialogimpl.h" #include "connecttoserverdialogimpl.h"
#include "qthelper.h"
#include "configfile.h" #include "configfile.h"
#include <string> #include <string>
@@ -90,6 +91,8 @@ public:
void logPlayerActionMsg(std::string playerName, int action, int setValue) ; void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
void logNewGameHandMsg(int gameID, int handID) ; void logNewGameHandMsg(int gameID, int handID) ;
std::string stringToUtf8(const std::string &);
void SignalNetClientConnect(int actionID); void SignalNetClientConnect(int actionID);
void SignalNetClientGameInfo(int actionID); void SignalNetClientGameInfo(int actionID);
void SignalNetClientError(int errorID, int osErrorID); void SignalNetClientError(int errorID, int osErrorID);
@@ -102,6 +105,7 @@ private:
Log *myLog; Log *myLog;
mainWindowImpl *myW; mainWindowImpl *myW;
ConfigFile *myConfig; ConfigFile *myConfig;
QtHelper *myQtHelper;
}; };