Mercurial > hg > svgui
comparison widgets/ActivityLog.cpp @ 706:97ea68f62c1f imaf_enc
Merge from default branch
author | Chris Cannam |
---|---|
date | Thu, 05 Dec 2013 09:47:02 +0000 |
parents | 1a0dfcbffaf1 |
children | 34c1203d21b5 |
comparison
equal
deleted
inserted
replaced
678:26c5f7fd4807 | 706:97ea68f62c1f |
---|---|
53 ActivityLog::activityHappened(QString name) | 53 ActivityLog::activityHappened(QString name) |
54 { | 54 { |
55 name = name.replace("&", ""); | 55 name = name.replace("&", ""); |
56 // SVDEBUG << "ActivityLog::activityHappened(" << name << ")" << endl; | 56 // SVDEBUG << "ActivityLog::activityHappened(" << name << ")" << endl; |
57 if (name == m_prevName) { | 57 if (name == m_prevName) { |
58 // std::cerr << "(ignoring duplicate)" << std::endl; | 58 // cerr << "(ignoring duplicate)" << endl; |
59 return; | 59 return; |
60 } | 60 } |
61 m_prevName = name; | 61 m_prevName = name; |
62 int row = m_model->rowCount(); | 62 int row = m_model->rowCount(); |
63 name = tr("%1: %2").arg(QTime::currentTime().toString()).arg(name); | 63 name = tr("%1: %2").arg(QTime::currentTime().toString()).arg(name); |