From: Richard Heck Date: Mon, 29 Mar 2010 21:31:17 +0000 (+0000) Subject: Make these const, too. I mean, why not? X-Git-Tag: 2.0.0~3646 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=29c93f87e6c86439f144367ff688eaaea8f61d33;p=features.git Make these const, too. I mean, why not? git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33934 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/LyX.cpp b/src/LyX.cpp index 233ee9be3e..9c419dff42 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -1238,14 +1238,14 @@ Movers & theSystemMovers() } -Messages & getMessages(string const & language) +Messages const & getMessages(string const & language) { LASSERT(singleton_, /**/); return singleton_->messages(language); } -Messages & getGuiMessages() +Messages const & getGuiMessages() { LASSERT(singleton_, /**/); return singleton_->pimpl_->messages_["GUI"]; diff --git a/src/LyX.h b/src/LyX.h index f4b7a62241..fdfe0c929a 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -123,8 +123,8 @@ private: friend ServerSocket & theServerSocket(); friend Converters & theConverters(); friend Converters & theSystemConverters(); - friend Messages & getMessages(std::string const & language); - friend Messages & getGuiMessages(); + friend Messages const & getMessages(std::string const & language); + friend Messages const & getGuiMessages(); friend KeyMap & theTopLevelKeymap(); friend Movers & theMovers(); friend Mover const & getMover(std::string const & fmt); diff --git a/src/support/Messages.h b/src/support/Messages.h index b7d8a52dc7..08500a9044 100644 --- a/src/support/Messages.h +++ b/src/support/Messages.h @@ -50,10 +50,10 @@ private: /// Access to the unique Messages object for the passed \p language. /// Implementation is in LyX.cpp. -extern Messages & getMessages(std::string const & language); +extern Messages const & getMessages(std::string const & language); /// Access to the unique Messages object used for GUI element. /// Implementation is in LyX.cpp. -extern Messages & getGuiMessages(); +extern Messages const & getGuiMessages(); } // namespace lyx diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index a10e958a50..b6e8aee555 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -44,13 +44,13 @@ namespace lyx { // Dummy translation support Messages messages_; -Messages & getMessages(std::string const &) +Messages const & getMessages(std::string const &) { return messages_; } -Messages & getGuiMessages() +Messages const & getGuiMessages() { return messages_; }