cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 19b239229e15be2c37ff06efae81979a1d417fef..91d57fa612c2cdcf3d6cd030f6c079148adfc8b5 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -55,9 +55,9 @@
 #include "insets/insetinclude.h"
 #include "insets/insettext.h"
 
-#include "mathed/math_macrotemplate.h"
-#include "mathed/math_macrotable.h"
-#include "mathed/math_support.h"
+#include "mathed/MathMacroTemplate.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathSupport.h"
 
 #include "frontends/Alert.h"
 
@@ -113,7 +113,6 @@ using lyx::support::makeDisplayPath;
 using lyx::support::makeLatexName;
 using lyx::support::onlyFilename;
 using lyx::support::onlyPath;
-using lyx::support::Path;
 using lyx::support::quoteName;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
@@ -232,7 +231,8 @@ Buffer::~Buffer()
 
        if (!temppath().empty() && !destroyDir(temppath())) {
                Alert::warning(_("Could not remove temporary directory"),
-                       bformat(_("Could not remove the temporary directory %1$s"), temppath()));
+                       bformat(_("Could not remove the temporary directory %1$s"),
+                       lyx::from_utf8(temppath())));
        }
 
        // Remove any previewed LaTeX snippets associated with this buffer.
@@ -390,8 +390,8 @@ namespace {
 void unknownClass(string const & unknown)
 {
        Alert::warning(_("Unknown document class"),
-               bformat(_("Using the default document class, because the "
-                       "class %1$s is unknown."), unknown));
+                      bformat(_("Using the default document class, because the "
+                                             "class %1$s is unknown."), lyx::from_utf8(unknown)));
 }
 
 } // anon
@@ -445,17 +445,17 @@ int Buffer::readHeader(LyXLex & lex)
                                unknownClass(unknown);
                        } else {
                                ++unknown_tokens;
-                               string const s = bformat(_("Unknown token: "
-                                                          "%1$s %2$s\n"),
-                                                        token,
-                                                        lex.getString());
+                               docstring const s = bformat(_("Unknown token: "
+                                                                       "%1$s %2$s\n"),
+                                                        lyx::from_utf8(token),
+                                                        lyx::from_utf8(lex.getString()));
                                errorList.push_back(ErrorItem(_("Document header error"),
                                        s, -1, 0, 0));
                        }
                }
        }
        if (begin_header_line) {
-               string const s = _("\\begin_header is missing");
+               docstring const s = _("\\begin_header is missing");
                errorList.push_back(ErrorItem(_("Document header error"),
                        s, -1, 0, 0));
        }
@@ -475,7 +475,7 @@ bool Buffer::readDocument(LyXLex & lex)
        lex.next();
        string const token = lex.getString();
        if (token != "\\begin_document") {
-               string const s = _("\\begin_document is missing");
+               docstring const s = _("\\begin_document is missing");
                errorList.push_back(ErrorItem(_("Document header error"),
                        s, -1, 0, 0));
        }
@@ -487,8 +487,8 @@ bool Buffer::readDocument(LyXLex & lex)
        if (!params().getLyXTextClass().load(filePath())) {
                string theclass = params().getLyXTextClass().name();
                Alert::error(_("Can't load document class"), bformat(
-                                    "Using the default document class, because the "
-                                    " class %1$s could not be loaded.", theclass));
+                       _("Using the default document class, because the "
+                                    " class %1$s could not be loaded."), lyx::from_utf8(theclass)));
                params().textclass = 0;
        }
 
@@ -600,7 +600,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 
        if (!lex.isOK()) {
                Alert::error(_("Document could not be read"),
-                            bformat(_("%1$s could not be read."), filename));
+                            bformat(_("%1$s could not be read."), lyx::from_utf8(filename)));
                return false;
        }
 
@@ -609,7 +609,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 
        if (!lex.isOK()) {
                Alert::error(_("Document could not be read"),
-                            bformat(_("%1$s could not be read."), filename));
+                            bformat(_("%1$s could not be read."), lyx::from_utf8(filename)));
                return false;
        }
 
@@ -619,7 +619,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
 
                Alert::error(_("Document format failure"),
                             bformat(_("%1$s is not a LyX document."),
-                                      filename));
+                                      lyx::from_utf8(filename)));
                return false;
        }
 
@@ -641,8 +641,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
                                     bformat(_("%1$s is from an earlier"
                                              " version of LyX, but a temporary"
                                              " file for converting it could"
-                                             " not be created."),
-                                             filename));
+                                                           " not be created."),
+                                             lyx::from_utf8(filename)));
                        return false;
                }
                string const lyx2lyx = libFileSearch("lyx2lyx", "lyx2lyx");
@@ -651,8 +651,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
                                     bformat(_("%1$s is from an earlier"
                                               " version of LyX, but the"
                                               " conversion script lyx2lyx"
-                                              " could not be found."),
-                                              filename));
+                                                           " could not be found."),
+                                              lyx::from_utf8(filename)));
                        return false;
                }
                ostringstream command;
@@ -671,8 +671,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
                        Alert::error(_("Conversion script failed"),
                                     bformat(_("%1$s is from an earlier version"
                                              " of LyX, but the lyx2lyx script"
-                                             " failed to convert it."),
-                                             filename));
+                                                           " failed to convert it."),
+                                             lyx::from_utf8(filename)));
                        return false;
                } else {
                        bool const ret = readFile(tmpfile);
@@ -685,8 +685,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename)
        if (readDocument(lex)) {
                Alert::error(_("Document format failure"),
                             bformat(_("%1$s ended unexpectedly, which means"
-                                      " that it is probably corrupted."),
-                                      filename));
+                                                   " that it is probably corrupted."),
+                                      lyx::from_utf8(filename)));
        }
 
        //lyxerr << "removing " << MacroTable::localMacros().size()
@@ -721,9 +721,9 @@ bool Buffer::save() const
                }
                catch (fs::filesystem_error const & fe) {
                        Alert::error(_("Backup failure"),
-                               bformat(_("LyX was not able to make a backup copy in %1$s.\n"
-                                         "Please check if the directory exists and is writeable."),
-                                         fs::path(s).branch_path().native_directory_string()));
+                                    bformat(_("LyX was not able to make a backup copy in %1$s.\n"
+                                                           "Please check if the directory exists and is writeable."),
+                                         lyx::from_utf8(fs::path(s).branch_path().native_directory_string())));
                        lyxerr[Debug::DEBUG] << "Fs error: "
                                             << fe.what() << endl;
                }
@@ -1075,7 +1075,7 @@ int Buffer::runChktex()
        string const path = temppath();
        string const org_path = filePath();
 
-       Path p(path); // path to LaTeX file
+       lyx::support::Path p(path); // path to LaTeX file
        message(_("Running chktex..."));
 
        // Generate the LaTeX file if neccessary
@@ -1385,7 +1385,7 @@ Language const * Buffer::getLanguage() const
 }
 
 
-string const Buffer::B_(string const & l10n) const
+docstring const Buffer::B_(string const & l10n) const
 {
        if (pimpl_->messages.get()) {
                return pimpl_->messages->get(l10n);
@@ -1599,9 +1599,9 @@ void Buffer::getSourceCode(ostream & os, lyx::pit_type par_begin, lyx::pit_type
 
        if (full_source) {
                os << "% Preview source code\n\n";
-               if (isLatex()) 
+               if (isLatex())
                        writeLaTeXSource(os, filePath(), runparams, true, true);
-               else 
+               else
                        writeDocBookSource(os, fileName(), runparams, false);
        } else {
                runparams.par_begin = par_begin;