comparison 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
comparison
equal deleted inserted replaced
897:499b637f2a26 946:36cddc3de023
418 418
419 void 419 void
420 CommandHistory::documentSaved() 420 CommandHistory::documentSaved()
421 { 421 {
422 closeBundle(); 422 closeBundle();
423 m_savedAt = m_undoStack.size(); 423 m_savedAt = int(m_undoStack.size());
424 } 424 }
425 425
426 void 426 void
427 CommandHistory::clipCommands() 427 CommandHistory::clipCommands()
428 { 428 {
429 if ((int)m_undoStack.size() > m_undoLimit) { 429 if (int(m_undoStack.size()) > m_undoLimit) {
430 m_savedAt -= (m_undoStack.size() - m_undoLimit); 430 m_savedAt -= (int(m_undoStack.size()) - m_undoLimit);
431 } 431 }
432 432
433 clipStack(m_undoStack, m_undoLimit); 433 clipStack(m_undoStack, m_undoLimit);
434 clipStack(m_redoStack, m_redoLimit); 434 clipStack(m_redoStack, m_redoLimit);
435 } 435 }