Actions can be removed before QtxActionMgr destructor. Guarded pointers were used.

diff --git a/src/Qtx/QtxActionMgr.h b/src/Qtx/QtxActionMgr.h
index 4cd9f2e38ce3fc59edbb5ce409db998745e48cfc..60fc342c04f3828b4bab0ab2d5715c31fe21e78e 100644 (file)
--- a/src/Qtx/QtxActionMgr.h
+++ b/src/Qtx/QtxActionMgr.h
@@ -26,6 +26,7 @@
 
 #include <qmap.h>
 #include <qobject.h>
+#include <qguardedptr.h>
 
 class QAction;
 class QDomNode;
@@ -81,7 +82,8 @@ protected:
   int              generateId() const;
 
 private:
-  typedef QMap<int, QAction*>  ActionMap;
+  typedef QGuardedPtr<QAction> ActionPtr;
+  typedef QMap<int, ActionPtr> ActionMap;
 
 private:
   bool             myUpdate;