comparison widgets/CommandHistory.cpp @ 1414:fa986b91d77f

Merge from branch fix-static-analysis

 
 #include <typeinfo>
 
 //#define DEBUG_COMMAND_HISTORY 1
 
-CommandHistory *CommandHistory::m_instance = 0;
+CommandHistory *CommandHistory::m_instance = nullptr;
 
 CommandHistory::CommandHistory() :
     m_undoLimit(50),
     m_redoLimit(50),
     m_menuLimit(15),
     m_savedAt(0),
-    m_currentCompound(0),
+    m_currentCompound(nullptr),
     m_executeCompound(false),
-    m_currentBundle(0),
+    m_currentBundle(nullptr),
     m_bundling(false),
-    m_bundleTimer(0),
+    m_bundleTimer(nullptr),
     m_bundleTimeout(3000)
 {
     IconLoader loader;
     QIcon undoIcon(loader.load("undo"));
     QIcon redoIcon(loader.load("redo"));

 #ifdef DEBUG_COMMAND_HISTORY
         cerr << "CommandHistory::closeBundle" << endl;
 #endif
         emit activity(m_currentBundle->getName());
     }
-    m_currentBundle = 0;
+    m_currentBundle = nullptr;
     m_currentBundleName = "";
 }
 
 void
 CommandHistory::bundleTimerTimeout()

 #ifdef DEBUG_COMMAND_HISTORY
     cerr << "CommandHistory::endCompoundOperation: " << m_currentCompound->getName() << endl;
 #endif
 
     MacroCommand *toAdd = m_currentCompound;
-    m_currentCompound = 0;
+    m_currentCompound = nullptr;
 
     if (toAdd->haveCommands()) {
 
         // We don't execute the macro command here, because we have
         // been executing the individual commands as we went along if