From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 3 Apr 2007 13:07:38 +0000 (+0000)
Subject: Still trying to solve the Toc panel crash with stdlib-debug enabled gcc.
X-Git-Tag: 1.6.10~10355
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9aed8cf115d190a789c6ba00942cc989f2187992;p=features.git

Still trying to solve the Toc panel crash with stdlib-debug enabled gcc.

* ControlToc::update(): get rid of the pure virutal method.
* QToc::initialiseParams(): overload ControlToc method.


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

diff --git a/src/frontends/controllers/ControlToc.C b/src/frontends/controllers/ControlToc.C
index d16bd5ecb0..e5f084d620 100644
--- a/src/frontends/controllers/ControlToc.C
+++ b/src/frontends/controllers/ControlToc.C
@@ -77,7 +77,6 @@ bool ControlToc::initialiseParams(string const & data)
 		}
 	}
 
-	update();
 	return true;
 }
 
diff --git a/src/frontends/controllers/ControlToc.h b/src/frontends/controllers/ControlToc.h
index 987df9707d..640e9a5815 100644
--- a/src/frontends/controllers/ControlToc.h
+++ b/src/frontends/controllers/ControlToc.h
@@ -32,7 +32,7 @@ public:
 	virtual ~ControlToc() {}
 
 	/// \c ControlCommand inherited method.
-	bool initialiseParams(std::string const & data);
+	virtual bool initialiseParams(std::string const & data);
 
 	///
 	TocList const & tocs() const;
@@ -63,10 +63,6 @@ public:
 	///
 	void updateBackend();
 
-public:
-	/// Update the model data if needed.
-	virtual void update() = 0;
-
 private:
 	/// Return the guiname from a given cmdName of the TOC param
 	docstring const getGuiName(std::string const & type) const;
diff --git a/src/frontends/qt4/QToc.C b/src/frontends/qt4/QToc.C
index de1c48d76b..6888f01e29 100644
--- a/src/frontends/qt4/QToc.C
+++ b/src/frontends/qt4/QToc.C
@@ -107,6 +107,15 @@ void QToc::goTo(int type, QModelIndex const & index)
 }
 
 
+bool QToc::initialiseParams(std::string const & data)
+{
+	if (!ControlToc::initialiseParams(data))
+		return false;
+	update();
+	return true;
+}
+
+
 void QToc::update()
 {
 	updateType();
diff --git a/src/frontends/qt4/QToc.h b/src/frontends/qt4/QToc.h
index f7875b9003..5580e95001 100644
--- a/src/frontends/qt4/QToc.h
+++ b/src/frontends/qt4/QToc.h
@@ -32,7 +32,11 @@ class QToc : public QObject, public ControlToc
 public:
 
 	QToc(Dialog &);
+	virtual ~QToc() {}
 
+	/// \c ControlToc inherited method.
+	virtual bool initialiseParams(std::string const & data);
+	///
 	void update();
 	///
 	void updateToc();