From 924d6a38b704a4ce1a22106bea84397946600d61 Mon Sep 17 00:00:00 2001
From: floty <f.thauer@web.de>
Date: Mon, 3 Jan 2011 17:56:06 +0000
Subject: [PATCH] remove configFile from Log

---
 src/engine/log.cpp | 16 +++++++++-------
 src/engine/log.h   |  6 +++---
 src/session.cpp    |  4 +++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/engine/log.cpp b/src/engine/log.cpp
index 8f19015a..bf47eac1 100644
--- a/src/engine/log.cpp
+++ b/src/engine/log.cpp
@@ -29,19 +29,21 @@
 
 using namespace std;
 
-Log::Log(ConfigFile *c) : myConfig(c), curGameID(0)
+Log::Log(string logDirString, int logOnOffInt) : curGameID(0), logOnOff(false)
 {
 
     if(SQLITE_LOG) {
 
         // logging activated
-        if(myConfig->readConfigInt("LogOnOff")) {
+        if(logOnOffInt) {
+
+            logOnOff = true;
 
             DIR *logDir;
-            logDir = opendir(myConfig->readConfigString("LogDir").c_str());
+            logDir = opendir(logDirString.c_str());
 
             // check if logging path exist
-            if(myConfig->readConfigString("LogDir") != "" && logDir) {
+            if(logDirString != "" && logDir) {
 
                 int i;
                 string sql;
@@ -57,7 +59,7 @@ Log::Log(ConfigFile *c) : myConfig(c), curGameID(0)
                 strftime(curDate,11,"%Y-%m-%d",z);
                 strftime(curTime,9,"%H:%M:%S",z);
 
-                string mySqliteLogFileName = boost::lexical_cast<string>(myConfig->readConfigString("LogDir").c_str());
+                string mySqliteLogFileName = boost::lexical_cast<string>(logDirString.c_str());
                        mySqliteLogFileName += "pokerth-log-" + boost::lexical_cast<string>(curDateTime) + ".pdb";
 
                 // open sqlite-db
@@ -163,7 +165,7 @@ Log::logNewGameMsg(int gameID, int startCash, int startSmallBlind, unsigned deal
 
     if(SQLITE_LOG) {
 
-        if(myConfig->readConfigInt("LogOnOff")) {
+        if(logOnOff) {
             //if write logfiles is enabled
 
             PlayerListConstIterator it_c;
@@ -208,7 +210,7 @@ Log::logNewHandMsg(int handID, unsigned dealerPosition, int smallBlind, unsigned
 
     if(SQLITE_LOG) {
 
-        if(myConfig->readConfigInt("LogOnOff")) {
+        if(logOnOff) {
             //if write logfiles is enabled
 
             PlayerListConstIterator it_c;
diff --git a/src/engine/log.h b/src/engine/log.h
index b62e70d6..2769fa2e 100644
--- a/src/engine/log.h
+++ b/src/engine/log.h
@@ -22,9 +22,9 @@
 
 #include <boost/shared_ptr.hpp>
 #include <list>
+#include <iostream>
 
 struct sqlite3;
-class ConfigFile;
 class PlayerInterface;
 
 typedef boost::shared_ptr<std::list<boost::shared_ptr<PlayerInterface> > > PlayerList;
@@ -35,7 +35,7 @@ class Log
 {
 
 public:
-    Log(ConfigFile *c);
+    Log(std::string logDirString, int logOnOffInt);
 
     ~Log();
 
@@ -45,9 +45,9 @@ public:
 
 
 private:
-    ConfigFile *myConfig;
     sqlite3 *mySqliteLogDb;
     int curGameID;
+    bool logOnOff;
 
 };
 
diff --git a/src/session.cpp b/src/session.cpp
index b229b86e..b09a0295 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -46,7 +46,7 @@ Session::Session(GuiInterface *g, ConfigFile *c)
     : currentGameNum(0), myGui(g), myConfig(c), myLog(0), myGameType(GAME_TYPE_NONE)
 {
     myQtToolsInterface = CreateQtToolsWrapper();
-    myLog = new Log(myConfig);
+    myLog = new Log(myConfig->readConfigString("LogDir"),myConfig->readConfigInt("LogOnOff"));
 }
 
 
@@ -56,6 +56,8 @@ Session::~Session()
     terminateNetworkServer();
     delete myQtToolsInterface;
     myQtToolsInterface = 0;
+    delete myLog;
+    myLog = 0;
 }
 
 bool Session::init()