From 7b6be9d7504869ad841f4031e0b1957cc6cd71d1 Mon Sep 17 00:00:00 2001 From: doitux Date: Sat, 5 May 2007 20:11:49 +0000 Subject: [PATCH] buggy!!! --- src/config/configfile.cpp | 12 +++++++++--- src/config/configfile.h | 7 ++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index f02e16ec..a036c3cd 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -112,14 +112,20 @@ ConfigFile::ConfigFile(bool configFirstStart) if (configFirstStart) { //Prüfen ob Configfile existiert --> sonst anlegen TiXmlDocument doc(configFileName); - if(!doc.LoadFile()){ createDefaultConfig(); } + if(!doc.LoadFile()){ + CONFIGSTATE = INEXISTENT; + updateConfig(CONFIGSTATE); + } else { //Prüfen ob die Revision stimmt ansonsten löschen und neue anlegen int temp = 0; TiXmlHandle docHandle( &doc ); TiXmlElement* conf = docHandle.FirstChild( "PokerTH" ).FirstChild( "Configuration" ).FirstChild( "ConfigRevision" ).ToElement(); if ( conf ) { conf->QueryIntAttribute("value", &temp ); } - if (temp < configRev) { /*löschen()*/ createDefaultConfig() ;} + if (temp < configRev) { /*löschen()*/ + CONFIGSTATE = OLD; + updateConfig(CONFIGSTATE) ; + } } } } @@ -129,7 +135,7 @@ ConfigFile::~ConfigFile() { } -void ConfigFile::createDefaultConfig() { +void ConfigFile::updateConfig(CONFIGSTATE) { QtToolsInterface *myQtToolsInterface = new QtToolsWrapper; diff --git a/src/config/configfile.h b/src/config/configfile.h index 7c17f678..bacfb975 100644 --- a/src/config/configfile.h +++ b/src/config/configfile.h @@ -23,15 +23,15 @@ #include "tinyxml.h" #include - +enum CONFIGSTATE { Inexistens, Old }; class ConfigFile{ public: ConfigFile(bool configFirstStart =0); ~ConfigFile(); - - void createDefaultConfig(); + + void updateConfig(CONFIGSTATE); std::string readConfigString(std::string varName); void writeConfigString(std::string varName, std::string varCont); @@ -45,6 +45,7 @@ private: std::string logDir; std::string dataDir; int configRev; + };