don't leak actions

svn path=/trunk/kdebase/konsole/; revision=68591
wilder-portage
Stephan Kulow 26 years ago
parent 6470f87ec4
commit 39fe856c77
  1. 2
      include/sessionaction.h
  2. 6
      src/konsole.C
  3. 4
      src/sessionaction.C

@ -8,7 +8,7 @@ class NewSessionAction : public KAction
Q_OBJECT
public:
NewSessionAction(const QObject *recvr = 0, const char *slot = 0);
NewSessionAction(const QObject *recvr = 0, const char *slot = 0, QObject *parent = 0);
int plug( QWidget *w, int index = -1 );

@ -275,7 +275,7 @@ void Konsole::makeMenu()
m_toolbarSessionsCommands = new KPopupMenu(this);
connect(m_toolbarSessionsCommands, SIGNAL(activated(int)), SLOT(newSession(int)));
NewSessionAction *newsession = new NewSessionAction(this, SLOT(newSession()));
NewSessionAction *newsession = new NewSessionAction(this, SLOT(newSession()), this);
newsession->setPopup(m_toolbarSessionsCommands);
newsession->plug(toolBar());
toolBar()->insertLineSeparator();
@ -318,10 +318,10 @@ void Konsole::makeMenu()
renameSession->plug(m_options);
m_options->insertSeparator();
// Menubar on/off
showMenubar = KStdAction::showMenubar(this, SLOT(slotToggleMenubar()));
showMenubar = KStdAction::showMenubar(this, SLOT(slotToggleMenubar()), this);
showMenubar->plug(m_options);
// Toolbar on/off
showToolbar = KStdAction::showToolbar(this, SLOT(slotToggleToolbar()));
showToolbar = KStdAction::showToolbar(this, SLOT(slotToggleToolbar()), this);
showToolbar->plug(m_options);
// Frame on/off
showFrame = new KToggleAction(i18n("Show &Frame"), 0,

@ -6,9 +6,9 @@
#include <kpopupmenu.h>
#include <ktoolbar.h>
NewSessionAction::NewSessionAction(const QObject *recvr, const char *slot):
NewSessionAction::NewSessionAction(const QObject *recvr, const char *slot, QObject *parent):
KAction(i18n("&New"), "filenew",
KStdAccel::key(KStdAccel::New), recvr, slot, 0L,
KStdAccel::key(KStdAccel::New), recvr, slot, parent,
KStdAction::stdName(KStdAction::New))
{
m_popup = 0;

Loading…
Cancel
Save