1 files changed, 9 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index 8431fa0d0a..99c738064e 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -44,8 +44,8 @@
 
 Q_DECLARE_METATYPE(Core::Internal::MenuActionContainer*)
 
-using namespace Core;
-using namespace Core::Internal;
+namespace Core {
+namespace Internal {
 
 /*!
     \class ActionContainer
@@ -381,14 +381,16 @@ void ActionContainerPrivate::update()
 */
 
 MenuActionContainer::MenuActionContainer(Id id)
-    : ActionContainerPrivate(id), m_menu(0)
+    : ActionContainerPrivate(id),
+      m_menu(new QMenu)
 {
+    m_menu->setObjectName(id.toString());
     setOnAllDisabledBehavior(Disable);
 }
 
-void MenuActionContainer::setMenu(QMenu *menu)
+MenuActionContainer::~MenuActionContainer()
 {
-    m_menu = menu;
+    delete m_menu;
 }
 
 QMenu *MenuActionContainer::menu() const
@@ -565,3 +567,5 @@ bool MenuBarActionContainer::canBeAddedToMenu() const
     return false;
 }
 
+} // namespace Internal
+} // namespace Core