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

utf8 for logdir and datadir xml stream

Browse Source
This commit is contained in:
doitux
2007-04-21 20:42:50 +00:00
parent a8cce94d3b
commit 6230dc8581
15 changed files with 243 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/guiinterface.h
-3
View File
@@ -95,9 +95,6 @@ public:
virtual void logPlayerActionMsg(std::string playName, int action, int setValue) =0;
virtual void logNewGameHandMsg(int gameID, int HandID) =0;
//qthelper.cpp
virtual std::string stringToUtf8(const std::string &) =0;
};
#endif
src/gui/qt/guiwrapper.cpp
-3
View File
@@ -88,9 +88,6 @@ 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); }
src/gui/qt/guiwrapper.h
-4
View File
@@ -25,7 +25,6 @@
#include "log.h"
#include "mainwindowimpl.h"
#include "connecttoserverdialogimpl.h"
#include "qthelper.h"
#include "configfile.h"
#include <string>
@@ -89,8 +88,6 @@ public:
void logPlayerActionMsg(std::string playerName, int action, int setValue) ;
void logNewGameHandMsg(int gameID, int handID) ;
std::string stringToUtf8(const std::string &);
void SignalNetClientConnect(int actionID);
void SignalNetClientGameInfo(int actionID);
void SignalNetClientError(int errorID, int osErrorID);
@@ -104,7 +101,6 @@ private:
Log *myLog;
mainWindowImpl *myW;
ConfigFile *myConfig;
QtHelper *myQtHelper;
};
src/gui/qt/log/log.cpp
+2
View File
@@ -94,6 +94,8 @@ Log::Log(mainWindowImpl* w) : myW(w)
Log::~Log()
{
delete myConfig;
myConfig = 0;
}
void Log::logPlayerActionMsg(string playerName, int action, int setValue) {
src/gui/qt/mainwindow/mainwindowimpl.cpp
+5 -1
View File
@@ -547,7 +547,11 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
}
mainWindowImpl::~mainWindowImpl() {}
mainWindowImpl::~mainWindowImpl() {
delete myConfig;
myConfig = 0;
}
void mainWindowImpl::callNewGameDialog() {
src/gui/qt/qthelper/qthelper.cpp → src/gui/qt/qttools/qthelper/qthelper.cpp
View File
src/gui/qt/qthelper/qthelper.h → src/gui/qt/qttools/qthelper/qthelper.h
View File
src/gui/qt/qttools/qttoolswrapper.cpp
+5 -5
View File
@@ -20,21 +20,21 @@
#include "qttoolswrapper.h"
#include <appdirpath.h>
using namespace std;
QtToolsWrapper::QtToolsWrapper() : myAppDirPath(0)
QtToolsWrapper::QtToolsWrapper() : myQtHelper(0)
{
myAppDirPath = new AppDirPath();
myQtHelper = new QtHelper();
}
QtToolsWrapper::~QtToolsWrapper()
{
delete myQtHelper;
myQtHelper = 0;
}
std::string QtToolsWrapper::getMyAppDirPath() const { return myAppDirPath->getMyPath(); }
std::string QtToolsWrapper::stringToUtf8(const std::string &myString) { return myQtHelper->stringToUtf8(myString); }
src/gui/qt/qttools/qttoolswrapper.h
+4 -3
View File
@@ -21,11 +21,12 @@
#define QTTOOLSWRAPPER_H
#include <qttoolsinterface.h>
#include <qthelper.h>
#include <string>
#include <iostream>
class AppDirPath;
class QtHelper;
class QtToolsWrapper : public QtToolsInterface
{
@@ -34,11 +35,11 @@ public:
~QtToolsWrapper();
std::string getMyAppDirPath() const;
std::string stringToUtf8(const std::string &myString);
private:
AppDirPath *myAppDirPath;
QtHelper *myQtHelper;
};
src/gui/qttoolsinterface.cpp
+26
View File
@@ -0,0 +1,26 @@
/***************************************************************************
* Copyright (C) 2006 by FThauer FHammer *
* f.thauer@web.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "qttoolsinterface.h"
QtToolsInterface::~QtToolsInterface()
{
}
src/gui/qttoolsinterface.h
+35
View File
@@ -0,0 +1,35 @@
/***************************************************************************
* Copyright (C) 2006 by FThauer FHammer *
* f.thauer@web.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef QTTOOLSINTERFACE_H
#define QTTOOLSINTERFACE_H
#include <string>
class QtToolsInterface {
public:
virtual ~QtToolsInterface();
//qthelper.cpp
virtual std::string stringToUtf8(const std::string &) =0;
};
#endif