Mercurial > hg > svgui
diff widgets/CommandHistory.cpp @ 922:26da827e8fb5 tonioni
Merge from cxx11 branch
author | Chris Cannam |
---|---|
date | Mon, 23 Mar 2015 11:26:28 +0000 |
parents | 4a578a360011 |
children | c91878670297 |
line wrap: on
line diff
--- a/widgets/CommandHistory.cpp Mon Mar 23 10:04:51 2015 +0000 +++ b/widgets/CommandHistory.cpp Mon Mar 23 11:26:28 2015 +0000 @@ -420,14 +420,14 @@ CommandHistory::documentSaved() { closeBundle(); - m_savedAt = m_undoStack.size(); + m_savedAt = int(m_undoStack.size()); } void CommandHistory::clipCommands() { - if ((int)m_undoStack.size() > m_undoLimit) { - m_savedAt -= (m_undoStack.size() - m_undoLimit); + if (int(m_undoStack.size()) > m_undoLimit) { + m_savedAt -= (int(m_undoStack.size()) - m_undoLimit); } clipStack(m_undoStack, m_undoLimit);