diff --git a/src/engine/local_engine/localhand.cpp b/src/engine/local_engine/localhand.cpp index c59da6d9..e6a42abe 100755 --- a/src/engine/local_engine/localhand.cpp +++ b/src/engine/local_engine/localhand.cpp @@ -108,7 +108,7 @@ LocalHand::LocalHand(boost::shared_ptr f, GuiInterface *g, boost: //QSqlDatabase * test = myGui->getMyLog()->getMySqliteLogDb(); // if(!mySqliteLogDb->open()) { -// QMessageBox::critical(0, tr("ERROR"),mySqliteLogDb->lastError().text().toUtf8().data(), QMessageBox::Cancel); +// QMessageBox::critical(0, tr("ERROR"),mySqliteLogDb->lastError().text().toUtf8().c_str(), QMessageBox::Cancel); // } diff --git a/src/engine/local_engine/replay.cpp b/src/engine/local_engine/replay.cpp index 1480d93f..250e723d 100644 --- a/src/engine/local_engine/replay.cpp +++ b/src/engine/local_engine/replay.cpp @@ -26,7 +26,7 @@ Replay::Replay() : replaySqliteLogDb(0) // *replaySqliteLogDb = QSqlDatabase::addDatabase("QSQLITE"); //replaySqliteLogDb->setDatabaseName(myLogDir->absolutePath()+"/pokerth-log-"+currentTime.toString("yyyy-MM-dd_hh.mm.ss")+".pdb"); //if(!mySqliteLogDb->open()) { - // QMessageBox::critical(0, tr("ERROR"),mySqliteLogDb->lastError().text().toUtf8().data(), QMessageBox::Cancel); + // QMessageBox::critical(0, tr("ERROR"),mySqliteLogDb->lastError().text().toUtf8().c_str(), QMessageBox::Cancel); //} } diff --git a/src/engine/log.cpp b/src/engine/log.cpp index 16018195..f9dadcfa 100644 --- a/src/engine/log.cpp +++ b/src/engine/log.cpp @@ -25,8 +25,10 @@ #include #include #include +#include using namespace std; +using namespace boost::filesystem; Log::Log(ConfigFile *c) : mySqliteLogDb(0), myConfig(c), uniqueGameID(0), currentHandID(0), currentRound(GAME_STATE_PREFLOP), sql("") { @@ -66,11 +68,11 @@ Log::init() strftime(curDate,11,"%Y-%m-%d",z); strftime(curTime,9,"%H:%M:%S",z); - string mySqliteLogFileName = boost::lexical_cast((myConfig->readConfigString("LogDir")).c_str()); - mySqliteLogFileName += "/pokerth-log-" + boost::lexical_cast(curDateTime) + ".pdb"; + path mySqliteLogFileName(myConfig->readConfigString("LogDir")); + mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb"; // open sqlite-db - sqlite3_open(mySqliteLogFileName.data(), &mySqliteLogDb); + sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb); if( mySqliteLogDb != 0 ) { int i; @@ -313,8 +315,8 @@ Log::logPlayerAction(string playerName, PlayerActionLog action, int amount) string sql_select = "SELECT Seat FROM Player WHERE UniqueGameID=" + boost::lexical_cast(uniqueGameID); sql_select += " AND "; sql_select += "Player=\"" + playerName +"\""; - if(sqlite3_get_table(mySqliteLogDb,sql_select.data(),&result_Player,&nRow_Player,&nCol_Player,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql_select.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql_select.c_str(),&result_Player,&nRow_Player,&nCol_Player,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql_select.c_str() << "[" << errmsg << "]." << endl; } else { if(nRow_Player == 1) { logPlayerAction(boost::lexical_cast(result_Player[1]), action, amount); @@ -658,8 +660,8 @@ Log::exec_transaction() string sql_transaction = "BEGIN;" + sql + "COMMIT;"; sql = ""; - if(sqlite3_exec(mySqliteLogDb, sql_transaction.data(), 0, 0, &errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql_transaction.data() << "[" << errmsg << "]." << endl; + if(sqlite3_exec(mySqliteLogDb, sql_transaction.c_str(), 0, 0, &errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql_transaction.c_str() << "[" << errmsg << "]." << endl; sqlite3_free(errmsg); errmsg = NULL; } diff --git a/src/gui/qt/gametable/log/guilog.cpp b/src/gui/qt/gametable/log/guilog.cpp index 02090b2b..01d8d963 100644 --- a/src/gui/qt/gametable/log/guilog.cpp +++ b/src/gui/qt/gametable/log/guilog.cpp @@ -582,7 +582,7 @@ void guiLog::writeLogFileStream(string log_string, QFile *LogFile) QTextStream stream( LogFile ); stream.readAll(); - stream << log_string.data(); + stream << log_string.c_str(); } @@ -597,7 +597,7 @@ void guiLog::writeLog(string log_string, int modus) writeLogFileStream(log_string,myTxtLogFile); break; case 3: - tb->append(log_string.data()); + tb->append(log_string.c_str()); break; default: ; @@ -712,13 +712,13 @@ int guiLog::exportLog(QString fileStringPdb,int modus) // open sqlite log-db sqlite3 *mySqliteLogDb; - sqlite3_open(fileStringPdb.toStdString().data(), &mySqliteLogDb); + sqlite3_open(fileStringPdb.toStdString().c_str(), &mySqliteLogDb); if( mySqliteLogDb != 0 ) { // read session sql = "SELECT * FROM Session"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Session,&nRow_Session,&nCol_Session,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Session,&nRow_Session,&nCol_Session,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -795,8 +795,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) // read game sql = "SELECT * FROM Game"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Game,&nRow_Game,&nCol_Game,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Game,&nRow_Game,&nCol_Game,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -836,8 +836,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql = "SELECT Player,Seat FROM Player WHERE UniqueGameID="; sql += boost::lexical_cast(uniqueGameID); sql += " ORDER BY Seat;"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Player,&nRow_Player,&nCol_Player,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Player,&nRow_Player,&nCol_Player,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -848,8 +848,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) // read all hand id sql = "SELECT HandID FROM Hand WHERE UniqueGameID="; sql+= boost::lexical_cast(uniqueGameID); - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Hand_ID,&nRow_Hand_ID,&nCol_Hand,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Hand_ID,&nRow_Hand_ID,&nCol_Hand,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -886,8 +886,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql+= boost::lexical_cast(uniqueGameID); sql+= " AND HandID="; sql+= boost::lexical_cast(results.result_Hand_ID[hand_ctr]); - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Hand,&nRow_Hand,&nCol_Hand,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Hand,&nRow_Hand,&nCol_Hand,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -1002,8 +1002,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql += boost::lexical_cast(GAME_STATE_PREFLOP); sql += " AND (Action='posts small blind' OR Action='posts big blind' OR Action='starts as dealer')"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -1049,8 +1049,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql += boost::lexical_cast(results.result_Hand_ID[hand_ctr]); sql += " AND BeRo=0 AND Action='posts small blind'"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -1073,8 +1073,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql += boost::lexical_cast(results.result_Hand_ID[hand_ctr]); sql += " AND BeRo=0 AND Action='posts big blind'"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -1097,8 +1097,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql += boost::lexical_cast(results.result_Hand_ID[hand_ctr]); sql += " AND BeRo=0 AND Action='starts as dealer'"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -1218,8 +1218,8 @@ int guiLog::exportLog(QString fileStringPdb,int modus) sql += boost::lexical_cast(round_ctr); sql += " AND Action<>'starts as dealer' AND Action<>'posts big blind' AND Action<>'posts small blind'"; - if(sqlite3_get_table(mySqliteLogDb,sql.data(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { - cout << "Error in statement: " << sql.data() << "[" << errmsg << "]." << endl; + if(sqlite3_get_table(mySqliteLogDb,sql.c_str(),&results.result_Action,&nRow_Action,&nCol_Action,&errmsg) != SQLITE_OK) { + cout << "Error in statement: " << sql.c_str() << "[" << errmsg << "]." << endl; cleanUp(results, mySqliteLogDb); return 1; } @@ -1445,7 +1445,7 @@ int guiLog::convertCardStringToInt(string val, string col) int tmp; - switch(*col.data()) { + switch(*col.c_str()) { case 'd': tmp = 0; break; @@ -1462,7 +1462,7 @@ int guiLog::convertCardStringToInt(string val, string col) return -1; } - switch(*val.data()) { + switch(*val.c_str()) { case '2': tmp += 0; break;