The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 593276f87d7856c4661957d8d1d365c073ede26e
Author: Stephan Witt <[email protected]>
Date:   Sun Oct 14 14:36:18 2012 +0200

    MenuTranslator::translate() should be const

diff --git a/src/frontends/qt4/GuiApplication.cpp 
b/src/frontends/qt4/GuiApplication.cpp
index bc570ed..acb76b9 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -492,7 +492,7 @@ public:
 
        QString translate(const char * /*context*/,
          const char * sourceText,
-         const char * /*comment*/ = 0)
+         const char * /*comment*/ = 0) const
        {
                string const s = sourceText;
                if (s == N_("About %1") || s == N_("Preferences")

commit 70ff68b5804a2d4a69f8fd36ca4fa5272a134c26
Author: Stephan Witt <[email protected]>
Date:   Sun Oct 14 14:34:46 2012 +0200

    Inset::setMouseHover() is const - InsetExternal::setMouseHover should be 
const too

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index ea51664..c0f7225 100644
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -392,7 +392,7 @@ InsetExternal::~InsetExternal()
 }
 
 
-bool InsetExternal::setMouseHover(BufferView const * bv, bool mouse_hover)
+bool InsetExternal::setMouseHover(BufferView const * bv, bool mouse_hover) 
const
 {
        mouse_hover_[bv] = mouse_hover;
        return true;
diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h
index fba0e74..bbe2162 100644
--- a/src/insets/InsetExternal.h
+++ b/src/insets/InsetExternal.h
@@ -113,7 +113,7 @@ public:
        ///
        std::string contextMenuName() const;
        ///
-       bool setMouseHover(BufferView const * bv, bool mouse_hover);
+       bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
        ///
        bool clickable(int, int) const { return true; }
 private:

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiApplication.cpp |    2 +-
 src/insets/InsetExternal.cpp         |    2 +-
 src/insets/InsetExternal.h           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to