add GuiView parent to QToc for proper memory management.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17753 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 051b587b13533dbed8f5ba67325272e7a4e075d8..594dba645a5abb2a57735eaa72d234d6a311aaad 100644 (file)
--- a/src/frontends/qt4/Dialogs.C
+++ b/src/frontends/qt4/Dialogs.C
@@ -304,9 +304,9 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
 #endif
        } else if (name == "toc") {
-               QToc * qtoc = new QToc(*dialog);
-               dialog->setController(qtoc);
                GuiView & gui_view = static_cast<GuiView &>(lyxview_);
+               QToc * qtoc = new QToc(*dialog, &gui_view);
+               dialog->setController(qtoc);
                dialog->setView(new DockView<QToc, TocWidget>(
                        *dialog, qtoc, &gui_view, _("Toc")));
                dialog->bc().bp(new OkCancelPolicy);

diff --git a/src/frontends/qt4/QToc.C b/src/frontends/qt4/QToc.C
index 6888f01e29806bdf47f8fb81c50c972e552f7cef..7fa122c83965c031a915126afec018cc591d18a2 100644 (file)
--- a/src/frontends/qt4/QToc.C
+++ b/src/frontends/qt4/QToc.C
@@ -33,8 +33,8 @@ namespace lyx {
 namespace frontend {
 
 
-QToc::QToc(Dialog & parent)
-       : ControlToc(parent)
+QToc::QToc(Dialog & dialog, QObject * parent)
+       : QObject(parent), ControlToc(dialog)
 {
 }
 

diff --git a/src/frontends/qt4/QToc.h b/src/frontends/qt4/QToc.h
index 5580e950019b997a6357c4499b1d00c95c76cdcf..7f32a8bfeae6b37f265215443562b83502362acb 100644 (file)
--- a/src/frontends/qt4/QToc.h
+++ b/src/frontends/qt4/QToc.h
@@ -31,7 +31,7 @@ class QToc : public QObject, public ControlToc
        Q_OBJECT
 public:
 
-       QToc(Dialog &);
+       QToc(Dialog &, QObject * parent = 0);
        virtual ~QToc() {}
 
        /// \c ControlToc inherited method.