fix "make dist" target

[lyx.git] / src / layout.C

diff --git a/src/layout.C b/src/layout.C
index 0132a875f69af0861854207930c33727d31ccd20..1c2069649fe0c6dbfce5cd3c658827151e159228 100644 (file)
--- a/src/layout.C
+++ b/src/layout.C
@@ -30,6 +30,8 @@ using std::pair;
 using std::make_pair;
 using std::sort;
 using std::endl;
+using std::find_if;
+using std::remove_if;
 
 // Global variable: textclass table.
 LyXTextClassList textclasslist;
@@ -186,7 +188,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
        while (!finished && lexrc.IsOK() && !error) {
                int le = lexrc.lex();
                // See comment in lyxrc.C.
-               switch(le) {
+               switch (le) {
                case LyXLex::LEX_FEOF:
                        continue; 
 
@@ -196,7 +198,7 @@ bool LyXLayout::Read (LyXLex & lexrc, LyXTextClass const & tclass)
                        continue; 
                default: break;
                }
-               switch(static_cast<LayoutTags>(le)) {
+               switch (static_cast<LayoutTags>(le)) {
                case LT_END:            // end of structure
                        finished = true;
                        break;
@@ -427,7 +429,7 @@ void LyXLayout::readAlign(LyXLex & lexrc)
                return; 
        default: break;
        };
-       switch(static_cast<AlignTags>(le)) {
+       switch (static_cast<AlignTags>(le)) {
        case AT_BLOCK:
                align = LYX_ALIGN_BLOCK;
                break;
@@ -596,19 +598,25 @@ void LyXLayout::readLabelType(LyXLex & lexrc)
        }
 }
 
-static keyword_item endlabelTypeTags[] = {
+
+namespace {
+
+keyword_item endlabelTypeTags[] = {
        { "box",        END_LABEL_BOX },
        { "filled_box", END_LABEL_FILLED_BOX },
        { "no_label",   END_LABEL_NO_LABEL },
        { "static",     END_LABEL_STATIC }
 };
 
+} // namespace anon
+
+
 void LyXLayout::readEndLabelType(LyXLex & lexrc)
 {
        pushpophelper pph(lexrc, endlabelTypeTags,
                          END_LABEL_ENUM_LAST-END_LABEL_ENUM_FIRST+1);
        int le = lexrc.lex();
-       switch(le) {
+       switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown labeltype tag `$$Token'");
                break;
@@ -639,7 +647,7 @@ void LyXLayout::readMargin(LyXLex & lexrc)
        pushpophelper pph(lexrc, marginTags, MARGIN_RIGHT_ADDRESS_BOX);
 
        int le = lexrc.lex();
-       switch(le) {
+       switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown margin type tag `$$Token'");
                return;
@@ -708,13 +716,13 @@ void LyXLayout::readSpacing(LyXLex & lexrc)
 
        pushpophelper pph(lexrc, spacingTags, ST_OTHER);
        int le = lexrc.lex();
-       switch(le) {
+       switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown spacing token `$$Token'");
                return;
        default: break;
        }
-       switch(static_cast<SpacingTags>(le)) {
+       switch (static_cast<SpacingTags>(le)) {
        case ST_SPACING_SINGLE:
                spacing.set(Spacing::Single);
                break;
@@ -833,7 +841,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
        // parsing
        while (lexrc.IsOK() && !error) {
                int le = lexrc.lex();
-               switch(le) {
+               switch (le) {
                case LyXLex::LEX_FEOF:
                        continue; 
 
@@ -843,7 +851,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        continue; 
                default: break;
                }
-               switch(static_cast<TextClassTags>(le)) {
+               switch (static_cast<TextClassTags>(le)) {
                case TC_OUTPUTTYPE:   // output type definition
                        readOutputType(lexrc);
                        break;
@@ -899,7 +907,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        
                case TC_SIDES:
                        if (lexrc.next()) {
-                               switch(lexrc.GetInteger()) {
+                               switch (lexrc.GetInteger()) {
                                case 1: sides_ = OneSide; break;
                                case 2: sides_ = TwoSides; break;
                                default:
@@ -1001,7 +1009,7 @@ void LyXTextClass::readOutputType(LyXLex & lexrc)
        pushpophelper pph(lexrc, outputTypeTags, LITERATE);
 
        int le = lexrc.lex();
-       switch(le) {
+       switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown output type `$$Token'");
                return;
@@ -1051,7 +1059,7 @@ void LyXTextClass::readMaxCounter(LyXLex & lexrc)
 
        pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
        int le = lexrc.lex();
-       switch(le) {
+       switch (le) {
        case LyXLex::LEX_UNDEF:
                lexrc.printError("Unknown MaxCounter tag `$$Token'");
                return; 
@@ -1144,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();
 }
 
@@ -1154,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);
 }
 
@@ -1165,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);
 }
 
@@ -1175,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);
@@ -1210,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));
@@ -1235,7 +1243,7 @@ LyXTextClassList::NumberOfLayout(LyXTextClassList::size_type textclass,
                                 string const & name) const
 {
        classlist[textclass].load();
-       for(unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) {
+       for (unsigned int i = 0; i < classlist[textclass].numLayouts(); ++i) {
                if (classlist[textclass][i].name() == name)
                        return make_pair(true, i);
        }
@@ -1266,7 +1274,7 @@ LyXTextClassList::NameOfClass(LyXTextClassList::size_type number) const
        if (classlist.size() == 0) {
                return dummy;
        }
-       Assert(number < classlist.size());
+       lyx::Assert(number < classlist.size());
        return classlist[number].name();
 }
 
@@ -1280,7 +1288,7 @@ LyXTextClassList::LatexnameOfClass(LyXTextClassList::size_type number) const
        if (classlist.size() == 0) {
                return dummy;
        }
-       Assert(number < classlist.size());
+       lyx::Assert(number < classlist.size());
        return classlist[number].latexname();
 }
 
@@ -1293,7 +1301,7 @@ LyXTextClassList::DescOfClass(LyXTextClassList::size_type number) const
        if (classlist.size() == 0) {
                return dummy;
        }
-       Assert(number < classlist.size());
+       lyx::Assert(number < classlist.size());
        return classlist[number].description();
 }