* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 439317d9f1142173ea467b3c4eab1f909ddb6ba9..8208bb2103d240b3632203685e0692ac3c14e77b 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -1033,7 +1033,7 @@ int LyXRC::read(LyXLex & lexrc)
                        if (lexrc.next()) {
                                command = lexrc.getString();
                        }
-                       movers.set(fmt, command);
+                       setMover(fmt, command);
                        break;
                }
 
@@ -1052,9 +1052,9 @@ int LyXRC::read(LyXLex & lexrc)
                                flags = lexrc.getString();
                        }
                        if (command.empty()) {
-                               converters.erase(from, to);
+                               theConverters().erase(from, to);
                        } else {
-                               converters.add(from, to, command, flags);
+                               theConverters().add(from, to, command, flags);
                        }
                        break;
                }
@@ -1118,7 +1118,7 @@ int LyXRC::read(LyXLex & lexrc)
                                               << format << "'." << endl;
                        }
                        if (prettyname.empty()) {
-                               if (converters.formatIsUsed(format)) {
+                               if (theConverters().formatIsUsed(format)) {
                                        lyxerr << "Can't delete format "
                                               << format << endl;
                                } else {
@@ -1208,8 +1208,8 @@ int LyXRC::read(LyXLex & lexrc)
        }
 
        /// Update converters data-structures
-       converters.update(formats);
-       converters.buildGraph();
+       theConverters().update(formats);
+       theConverters().buildGraph();
 
        return 0;
 }
@@ -1874,7 +1874,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                }
 
                os << "\n#\n"
-                  << "# ASCII EXPORT SECTION ##############################\n"
+                  << "# PLAIN TEXT EXPORT SECTION ##############################\n"
                   << "#\n\n";
 
        case RC_PLAINTEXT_ROFF_COMMAND:
@@ -2084,10 +2084,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
 
        case RC_CONVERTER:
                // Look for new converters
-               for (Converters::const_iterator cit = converters.begin();
-                    cit != converters.end(); ++cit) {
+               for (Converters::const_iterator cit = theConverters().begin();
+                    cit != theConverters().end(); ++cit) {
                        Converter const * converter =
-                               system_converters.getConverter(cit->from,
+                               theSystemConverters().getConverter(cit->from,
                                                               cit->to);
                        if (!converter ||
                            converter->command != cit->command ||
@@ -2099,9 +2099,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                }
 
                // New/modifed converters
-               for (Converters::const_iterator cit = system_converters.begin();
-                    cit != system_converters.end(); ++cit)
-                       if (!converters.getConverter(cit->from, cit->to))
+               for (Converters::const_iterator cit = theSystemConverters().begin();
+                    cit != theSystemConverters().end(); ++cit)
+                       if (!theConverters().getConverter(cit->from, cit->to))
                                os << "\\converter \"" << cit->from
                                   << "\" \"" << cit->to << "\" \"\" \"\"\n";
 
@@ -2111,12 +2111,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                   << "#\n\n";
 
                // Look for new movers
-               Movers::iterator const sysbegin = system_movers.begin();
-               Movers::iterator const sysend = system_movers.end();
+               Movers::const_iterator const sysbegin = theSystemMovers().begin();
+               Movers::const_iterator const sysend = theSystemMovers().end();
+               Movers::const_iterator it = theMovers().begin();
+               Movers::const_iterator end = theMovers().end();
 
-               for (Movers::iterator it = movers.begin(), end = movers.end();
-                    it != end; ++it) {
-                       Movers::iterator const sysit =
+               for (; it != end; ++it) {
+                       Movers::const_iterator const sysit =
                                std::find_if(sysbegin, sysend, SameMover(*it));
                        if (sysit == sysend) {
                                std::string const & fmt = it->first;
@@ -2177,7 +2178,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_PLAINTEXT_LINELEN:
-               str = _("This is the maximum line length of an exported text file (LaTeX, SGML or plain text). If set to 0, paragraphs are output in a single line; if the line length is != 0, paragraphs are separated by a blank line.");
+               str = _("The maximum line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.");
                break;
 
        case RC_AUTOREGIONDELETE: