Minor code shuffle.

[lyx.git] / src / layout.C

diff --git a/src/layout.C b/src/layout.C
index 58fd7f1bb93ec9b31cc1b7a8965196533bbf3521..44e05f66a0865a26e8c9ec3d4b753fb816a33a2e 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *          Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ======================================================
  */
@@ -1152,7 +1152,7 @@ void LyXTextClass::readClassOptions(LyXLex & lexrc)
 bool LyXTextClass::hasLayout(string const & name) const
 {
        return find_if(layoutlist.begin(), layoutlist.end(),
-                      compare_memfun(&LyXLayout::name, name))
+                      lyx::compare_memfun(&LyXLayout::name, name))
                != layoutlist.end();
 }
 
@@ -1162,8 +1162,8 @@ LyXLayout const & LyXTextClass::GetLayout (string const & name) const
        LayoutList::const_iterator cit =
                find_if(layoutlist.begin(),
                        layoutlist.end(),
-                       compare_memfun(&LyXLayout::name, name));
-       Assert(cit != layoutlist.end()); // we require the name to exist
+                       lyx::compare_memfun(&LyXLayout::name, name));
+       lyx::Assert(cit != layoutlist.end()); // we require the name to exist
        return (*cit);
 }
 
@@ -1173,8 +1173,8 @@ LyXLayout & LyXTextClass::GetLayout(string const & name)
        LayoutList::iterator it =
                find_if(layoutlist.begin(),
                        layoutlist.end(),
-                       compare_memfun(&LyXLayout::name, name));
-       Assert(it != layoutlist.end()); // we require the name to exist
+                       lyx::compare_memfun(&LyXLayout::name, name));
+       lyx::Assert(it != layoutlist.end()); // we require the name to exist
        return (*it);
 }
 
@@ -1183,7 +1183,7 @@ bool LyXTextClass::delete_layout(string const & name)
 {
        LayoutList::iterator it =
                remove_if(layoutlist.begin(), layoutlist.end(),
-                         compare_memfun(&LyXLayout::name, name));
+                         lyx::compare_memfun(&LyXLayout::name, name));
        LayoutList::iterator end = layoutlist.end();
        bool const ret = (it != end);
        layoutlist.erase(it, end);
@@ -1218,7 +1218,7 @@ LyXTextClassList::NumberOfClass(string const & textclass) const
 {
        ClassList::const_iterator cit =
                find_if(classlist.begin(), classlist.end(),
-                       compare_memfun(&LyXTextClass::name, textclass));
+                       lyx::compare_memfun(&LyXTextClass::name, textclass));
        return cit != classlist.end() ?
                make_pair(true, size_type(cit - classlist.begin())) :
                make_pair(false, size_type(0));
@@ -1258,7 +1258,7 @@ string const &
 LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass,
                               LyXTextClass::size_type layout) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        classlist[textclass].load();
        if (layout < classlist[textclass].numLayouts())
                return classlist[textclass][layout].name();
@@ -1270,11 +1270,11 @@ LyXTextClassList::NameOfLayout(LyXTextClassList::size_type textclass,
 string const &
 LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        if (classlist.size() == 0) {
                return dummy;
        }
-       Assert(number < classlist.size());
+       lyx::Assert(number < classlist.size());
        return classlist[number].name();
 }
 
@@ -1283,12 +1283,12 @@ LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
 string const &
 LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        classlist[number].load();
        if (classlist.size() == 0) {
                return dummy;
        }
-       Assert(number < classlist.size());
+       lyx::Assert(number < classlist.size());
        return classlist[number].latexname();
 }
 
@@ -1297,11 +1297,11 @@ LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
 string const &
 LyXTextClassList::DescOfClass(LyXTextClassList::size_type number) const
 {
-       static string dummy("dummy");
+       static string const dummy("dummy");
        if (classlist.size() == 0) {
                return dummy;
        }
-       Assert(number < classlist.size());
+       lyx::Assert(number < classlist.size());
        return classlist[number].description();
 }