diff widgets/CommandHistory.cpp @ 946:36cddc3de023 alignment_view

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 4a578a360011
children c91878670297
line wrap: on
line diff
--- a/widgets/CommandHistory.cpp	Thu Jan 15 16:00:53 2015 +0000
+++ b/widgets/CommandHistory.cpp	Mon Apr 20 09:19:52 2015 +0100
@@ -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);