This doesn't return a reference any more.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index b58e614e14256f5c79a7ccb5a3fd6b3db4c1de18..28345fc601f16d152abdf784d2fd84b016b15420 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -45,6 +45,7 @@
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 
+#include "support/assert.h"
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/ExceptionMessage.h"
@@ -204,14 +205,14 @@ void LyX::exit(int exit_code) const
 
 LyX & LyX::ref()
 {
-       BOOST_ASSERT(singleton_);
+       LASSERT(singleton_, /**/);
        return *singleton_;
 }
 
 
 LyX const & LyX::cref()
 {
-       BOOST_ASSERT(singleton_);
+       LASSERT(singleton_, /**/);
        return *singleton_;
 }
 
@@ -238,14 +239,14 @@ BufferList const & LyX::bufferList() const
 
 Session & LyX::session()
 {
-       BOOST_ASSERT(pimpl_->session_.get());
+       LASSERT(pimpl_->session_.get(), /**/);
        return *pimpl_->session_.get();
 }
 
 
 Session const & LyX::session() const
 {
-       BOOST_ASSERT(pimpl_->session_.get());
+       LASSERT(pimpl_->session_.get(), /**/);
        return *pimpl_->session_.get();
 }
 
@@ -264,52 +265,46 @@ LyXFunc const & LyX::lyxFunc() const
 
 Server & LyX::server()
 {
-       BOOST_ASSERT(pimpl_->lyx_server_.get());
+       LASSERT(pimpl_->lyx_server_.get(), /**/);
        return *pimpl_->lyx_server_.get();
 }
 
 
 Server const & LyX::server() const
 {
-       BOOST_ASSERT(pimpl_->lyx_server_.get());
+       LASSERT(pimpl_->lyx_server_.get(), /**/);
        return *pimpl_->lyx_server_.get();
 }
 
 
 ServerSocket & LyX::socket()
 {
-       BOOST_ASSERT(pimpl_->lyx_socket_.get());
+       LASSERT(pimpl_->lyx_socket_.get(), /**/);
        return *pimpl_->lyx_socket_.get();
 }
 
 
 ServerSocket const & LyX::socket() const
 {
-       BOOST_ASSERT(pimpl_->lyx_socket_.get());
+       LASSERT(pimpl_->lyx_socket_.get(), /**/);
        return *pimpl_->lyx_socket_.get();
 }
 
 
 frontend::Application & LyX::application()
 {
-       BOOST_ASSERT(pimpl_->application_.get());
+       LASSERT(pimpl_->application_.get(), /**/);
        return *pimpl_->application_.get();
 }
 
 
 frontend::Application const & LyX::application() const
 {
-       BOOST_ASSERT(pimpl_->application_.get());
+       LASSERT(pimpl_->application_.get(), /**/);
        return *pimpl_->application_.get();
 }
 
 
-KeyMap & LyX::topLevelKeymap()
-{
-       return pimpl_->toplevel_keymap_;
-}
-
-
 CmdDef & LyX::topLevelCmdDef()
 {
        return pimpl_->toplevel_cmddef_;
@@ -328,12 +323,6 @@ Converters & LyX::systemConverters()
 }
 
 
-KeyMap const & LyX::topLevelKeymap() const
-{
-       return pimpl_->toplevel_keymap_;
-}
-
-
 Messages & LyX::getMessages(string const & language)
 {
        map<string, Messages>::iterator it = pimpl_->messages_.find(language);
@@ -344,7 +333,7 @@ Messages & LyX::getMessages(string const & language)
        pair<map<string, Messages>::iterator, bool> result =
                        pimpl_->messages_.insert(make_pair(language, Messages(language)));
 
-       BOOST_ASSERT(result.second);
+       LASSERT(result.second, /**/);
        return result.first->second;
 }
 
@@ -490,7 +479,7 @@ void LyX::prepareExit()
 
 void LyX::earlyExit(int status)
 {
-       BOOST_ASSERT(pimpl_->application_.get());
+       LASSERT(pimpl_->application_.get(), /**/);
        // LyX::pimpl_::application_ is not initialised at this
        // point so it's safe to just exit after some cleanup.
        prepareExit();
@@ -991,7 +980,7 @@ bool LyX::readRcFile(string const & name)
 // Read the ui file `name'
 bool LyX::readUIFile(string const & name, bool include)
 {
-       enum Uitags {
+       enum {
                ui_menuset = 1,
                ui_toolbars,
                ui_toolbarset,
@@ -999,7 +988,7 @@ bool LyX::readUIFile(string const & name, bool include)
                ui_last
        };
 
-       struct keyword_item uitags[ui_last - 1] = {
+       LexerKeyword uitags[] = {
                { "include", ui_include },
                { "menuset", ui_menuset },
                { "toolbars", ui_toolbars },
@@ -1039,7 +1028,7 @@ bool LyX::readUIFile(string const & name, bool include)
        uifiles.push_back(name);
 
        LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
-       Lexer lex(uitags, ui_last - 1);
+       Lexer lex(uitags);
        lex.setFile(ui_path);
        if (!lex.isOK()) {
                lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
@@ -1338,7 +1327,7 @@ LyXFunc & theLyXFunc()
 Server & theServer()
 {
        // FIXME: this should not be use_gui dependent
-       BOOST_ASSERT(use_gui);
+       LASSERT(use_gui, /**/);
        return LyX::ref().server();
 }
 
@@ -1346,14 +1335,14 @@ Server & theServer()
 ServerSocket & theServerSocket()
 {
        // FIXME: this should not be use_gui dependent
-       BOOST_ASSERT(use_gui);
+       LASSERT(use_gui, /**/);
        return LyX::ref().socket();
 }
 
 
 KeyMap & theTopLevelKeymap()
 {
-       return LyX::ref().topLevelKeymap();
+       return LyX::ref().pimpl_->toplevel_keymap_;
 }