From 9b93a453740e890c8730bf6c5f191fa6b595e489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= <poenitz@gmx.net>
Date: Thu, 29 Nov 2007 07:41:23 +0000
Subject: [PATCH] cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21855 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/LyX.cpp | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 22b4116ba6..895cbcbfb6 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -159,9 +159,9 @@ struct LyX::Impl
 	///
 	BufferList buffer_list_;
 	///
-	boost::scoped_ptr<KeyMap> toplevel_keymap_;
+	KeyMap toplevel_keymap_;
 	///
-	boost::scoped_ptr<CmdDef> toplevel_cmddef_;
+	CmdDef toplevel_cmddef_;
 	///
 	boost::scoped_ptr<Server> lyx_server_;
 	///
@@ -314,15 +314,13 @@ frontend::Application const & LyX::application() const
 
 KeyMap & LyX::topLevelKeymap()
 {
-	BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
-	return *pimpl_->toplevel_keymap_.get();
+	return pimpl_->toplevel_keymap_;
 }
 
 
 CmdDef & LyX::topLevelCmdDef()
 {
-	BOOST_ASSERT(pimpl_->toplevel_cmddef_.get());
-	return *pimpl_->toplevel_cmddef_.get();
+	return pimpl_->toplevel_cmddef_;
 }
 
 
@@ -340,8 +338,7 @@ Converters & LyX::systemConverters()
 
 KeyMap const & LyX::topLevelKeymap() const
 {
-	BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
-	return *pimpl_->toplevel_keymap_.get();
+	return pimpl_->toplevel_keymap_;
 }
 
 
@@ -864,17 +861,15 @@ bool LyX::init()
 	//setGuiLanguage(lyxrc.gui_language);
 
 	// Set up command definitions
-	pimpl_->toplevel_cmddef_.reset(new CmdDef);
-	pimpl_->toplevel_cmddef_->read(lyxrc.def_file);
+	pimpl_->toplevel_cmddef_.read(lyxrc.def_file);
 
 	// Set up bindings
-	pimpl_->toplevel_keymap_.reset(new KeyMap);
-	pimpl_->toplevel_keymap_->read("site");
-	pimpl_->toplevel_keymap_->read(lyxrc.bind_file);
+	pimpl_->toplevel_keymap_.read("site");
+	pimpl_->toplevel_keymap_.read(lyxrc.bind_file);
 	// load user bind file user.bind
-	pimpl_->toplevel_keymap_->read("user");
+	pimpl_->toplevel_keymap_.read("user");
 
-	pimpl_->lyxfunc_.initKeySequences(pimpl_->toplevel_keymap_.get());
+	pimpl_->lyxfunc_.initKeySequences(&pimpl_->toplevel_keymap_);
 
 	// Read menus
 	if (!readUIFile(lyxrc.ui_file))