From 756bca9f02044553a4b3a85aec60358601d00c26 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Sun, 21 Jan 2007 22:58:22 +0000
Subject: [PATCH]

---
 src/gui/qt/guiwrapper.cpp     |  4 ++--
 src/gui/qt/mainwindowimpl.cpp | 16 +++++++---------
 src/gui/qt/mainwindowimpl.h   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/gui/qt/guiwrapper.cpp b/src/gui/qt/guiwrapper.cpp
index 97224d87..2ba9b9e1 100644
--- a/src/gui/qt/guiwrapper.cpp
+++ b/src/gui/qt/guiwrapper.cpp
@@ -50,9 +50,9 @@ int GuiWrapper::getMaxQuantityPlayers() const { return myW->getMaxQuantityPlayer
 std::string GuiWrapper::getPlayerName(int id) const { 
 
 // 	if(id==0) {
-// 		return myConfig->readConfig("myname", "Human Player").toStdString() ; 
+// 		return myConfig->readConfigString("MyName", "Human Player") ; 
 // 	}
-// 	else {  return myConfig->readConfig("opponent"+QString::number(id)+"name", "Player "+QString::number(id)).toStdString() ; }
+// 	else {  return myConfig->readConfigString("Opponent"+QString::number(id)+"Name", "Player "+QString::number(id)) ; }
 
 }
 
diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp
index b7f33d64..bf432b68 100755
--- a/src/gui/qt/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindowimpl.cpp
@@ -59,15 +59,14 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent, const char *name)
 	
 	if ( !progDir1.exists() ) { progDir1.mkdir(progDir1.absPath()); }
 
-	myConfigFile = new ConfigFile;
+	myConfig = new ConfigFile;
 
 	setupUi(this);
 
 	int i;
-	bool ok;
 
 	//Toolbox verstecken?				
-// 	if (!myConfigFile->readConfig("showtoolbox", "1").toInt(&ok,10)) { groupBox_tools->hide(); }
+// 	if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); }
 
 		
 	pushButton_raise->setDisabled(TRUE);
@@ -196,8 +195,8 @@ void mainWindowImpl::callNewGameDialog() {
 	
 
 	//wenn Dialogfenster gezeigt werden soll
-	bool ok;
-// 	if(myConfigFile->readConfig("showgamesettingsdialogonnewgame", "1").toInt(&ok,10)) {
+
+// 	if(myConfig->readConfigInt("ShowGameSettingsDialogOnNewGame", 1)){
 
 		newGameDialogImpl *v = new newGameDialogImpl();
 		v->exec();
@@ -255,7 +254,7 @@ void mainWindowImpl::callNewGameDialog() {
 		label_Pot->setText("<p align='center'><span style='font-size:x-large; font-weight:bold'>Pot Total</span></p>");
 		label_Sets->setText("<p align='center'><span style='font-size:medium; font-weight:bold'>Sets:</span></p>");
 	
-		guiGameSpeed = 4/*myConfigFile->readConfig("gamespeed","4").toInt(&ok,10)*/;
+		guiGameSpeed = 4/*myConfig->readConfigInt("GameSpeed",4)*/;
 	// 	debugMode = v->checkBox_debugMode->isChecked();
 			
 		//Tools und Board aufhellen und enablen
@@ -272,7 +271,7 @@ void mainWindowImpl::callNewGameDialog() {
 		
 
 		//Start Game!!!
-// 		mySession->startGame(myConfigFile->readConfig("numberofplayers","5").toInt(&ok,10), myConfigFile->readConfig("startcash","2000").toInt(&ok,10), myConfigFile->readConfig("smallblind","10").toInt(&ok,10));
+// 		mySession->startGame(myConfig->readConfigInt("NumberOfPlayers",5), myConfig->readConfigInt("StartCash",2000), myConfig->readConfigInt("SmallBlind",10));
 		mySession->startGame(5, 2000, 10);
 
 
@@ -293,9 +292,8 @@ void mainWindowImpl::callSettingsDialog() {
 		
 	if (v->result()) {
 		
-		bool ok;
 		//Toolbox verstecken?
-// 		if (!myConfigFile->readConfig("showtoolbox", "1").toInt(&ok,10)) { groupBox_tools->hide(); }
+// 		if (!myConfig->readConfigInt("ShowToolBox", 1)) { groupBox_tools->hide(); }
 // 		else { groupBox_tools->show(); }
 	
 	}
diff --git a/src/gui/qt/mainwindowimpl.h b/src/gui/qt/mainwindowimpl.h
index 16cc35e8..154130d7 100755
--- a/src/gui/qt/mainwindowimpl.h
+++ b/src/gui/qt/mainwindowimpl.h
@@ -165,7 +165,7 @@ private:
 	HandInterface *actualHand;
 	Session *mySession;
 	Log *myLog;
-	ConfigFile *myConfigFile;
+	ConfigFile *myConfig;
 
 
 	QTimer *potDistributeTimer;