- do not use std:: everywhere, it justs makes the code harder to read

- history.h: use forward declarations to reduce dependencies
 - history.cpp: fixed a compilation warning
This commit is contained in:
Olivier Teulière 2005-12-27 16:54:38 +00:00
parent 9aeeafa61b
commit 3ecf740432
3 changed files with 28 additions and 20 deletions

View file

@ -143,7 +143,7 @@ void History::removeLastTurn()
delete t;
}
// now we have the previous played round in back()
// Now we have the previous played round in back()
Turn* t = m_history.back();
t->setNum(0);
t->setPlayer(0);
@ -154,19 +154,19 @@ void History::removeLastTurn()
}
std::string History::toString() const
string History::toString() const
{
unsigned int i;
std::string rs = "";
string rs = "";
#ifdef DEBUG
char buff[20];
sprintf(buff,"%d",m_history.size());
rs = "history size = " + std::string(buff) + "\n\n";
sprintf(buff, "%ld", m_history.size());
rs = "history size = " + string(buff) + "\n\n";
#endif
for (i = 0; i < m_history.size(); i++)
{
Turn *t = m_history[i];
rs += t->toString() + std::string("\n");
rs += t->toString() + "\n";
}
return rs;
}

View file

@ -27,10 +27,16 @@
#ifndef _HISTORY_H
#define _HISTORY_H
#include <string>
#include <vector>
#include "pldrack.h"
#include "round.h"
#include "turn.h"
using std::string;
using std::vector;
class Round;
class Turn;
class PlayedRack;
/**
* History stores all the turns that have been played
@ -82,10 +88,10 @@ class History
void removeLastTurn();
/// String handling
std::string toString() const;
string toString() const;
private:
std::vector < Turn* > m_history;
vector<Turn*> m_history;
};
#endif

View file

@ -36,6 +36,8 @@
#include "duplicate.h"
#include "freegame.h"
#include "player.h"
#include "history.h"
#include "turn.h"
using namespace std;