[LyX master] Fix monolithic build

[Vincent van Ravesteijn]

The branch, master, has been updated.

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

commit fdee77a6b5fd337556afee83015934ad4cc23ac4
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Sun Dec 2 15:47:23 2012 +0100

    Fix monolithic build

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index e4acd6b..4b57f55 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -229,21 +229,6 @@ FontInfo InsetArgument::getLabelfont() const
        return getLayout().labelfont();
 }
 
-namespace {
-
-InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
-{
-       if (support::compare_ascii_no_case(str, "classic") == 0)
-               return InsetLayout::CLASSIC;
-       if (support::compare_ascii_no_case(str, "minimalistic") == 0)
-               return InsetLayout::MINIMALISTIC;
-       if (support::compare_ascii_no_case(str, "conglomerate") == 0)
-               return InsetLayout::CONGLOMERATE;
-       return InsetLayout::DEFAULT;
-}
-
-}// namespace anon
-
 InsetLayout::InsetDecoration InsetArgument::decoration() const
 {
        InsetLayout::InsetDecoration dec = getLayout().decoration();
diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index a86bef2..15b3dee 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -47,8 +47,6 @@ InsetLayout::InsetLayout() :
 }
 
 
-namespace {
-
 InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
 {
        if (support::compare_ascii_no_case(str, "classic") == 0)
@@ -60,6 +58,8 @@ InsetLayout::InsetDecoration translateDecoration(std::string 
const & str)
        return InsetLayout::DEFAULT;
 }
 
+namespace {
+
 InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
 {
        if (support::compare_ascii_no_case(str, "command") == 0)
diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 25e58c9..6bad059 100644
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -272,6 +272,7 @@ private:
 
 ///
 InsetLayout::InsetLyXType translateLyXType(std::string const & str);
+InsetLayout::InsetDecoration translateDecoration(std::string const & str);
 
 } // namespace lyx
 

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

Summary of changes:
 src/insets/InsetArgument.cpp |   15 ---------------
 src/insets/InsetLayout.cpp   |    4 ++--
 src/insets/InsetLayout.h     |    1 +
 3 files changed, 3 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository