aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #758 from poixen/game_created_fix

Browse source 
Fixed 5+ hour issue for new games
This commit is contained in:
poixen 2015-02-19 16:54:18 +01:00
commit edd3b75fe6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/gamesmodel.cpp
View file

@ -11,8 +11,8 @@
enum GameListColumn {ROOM, CREATED, DESCRIPTION, CREATOR, GAME_TYPE, RESTRICTIONS, PLAYERS, SPECTATORS}; enum GameListColumn {ROOM, CREATED, DESCRIPTION, CREATOR, GAME_TYPE, RESTRICTIONS, PLAYERS, SPECTATORS};
namespace { namespace {
const unsigned SECS_PER_MIN = 60; const int SECS_PER_MIN = 60;
const unsigned SECS_PER_HOUR = 60 * 60; const int SECS_PER_HOUR = 60 * 60;
/** /**
* Pretty print an integer number of seconds ago. Accurate to only one unit, * Pretty print an integer number of seconds ago. Accurate to only one unit,
@ -26,7 +26,7 @@ namespace {
* 91-300 minutes will return "Xhr ago" * 91-300 minutes will return "Xhr ago"
* 300+ minutes will return "5+ hr ago" * 300+ minutes will return "5+ hr ago"
*/ */
QString prettyPrintSecsAgo(unsigned int secs) { QString prettyPrintSecsAgo(int secs) {
if (secs < SECS_PER_MIN) { if (secs < SECS_PER_MIN) {
return QObject::tr("<1m ago"); return QObject::tr("<1m ago");
} }
@ -91,7 +91,7 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
case CREATED: { case CREATED: {
QDateTime then; QDateTime then;
then.setTime_t(g.start_time()); then.setTime_t(g.start_time());
unsigned int secs = then.secsTo(QDateTime::currentDateTime()); int secs = then.secsTo(QDateTime::currentDateTime());
switch (role) { switch (role) {
case Qt::DisplayRole: return prettyPrintSecsAgo(secs); case Qt::DisplayRole: return prettyPrintSecsAgo(secs);