Buffer: Rename function names:

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 5b7cc8219a3a471c3a511b1326fe56b3ddbb1846..ad14807e10f4bc30a11d27b554f94eab00274dd4 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -3604,7 +3604,7 @@ vector<string> Buffer::backends() const
 }
 
 
-Buffer::ReadStatus Buffer::readFromVC(FileName const & fn)
+Buffer::ReadStatus Buffer::extractFromVC(FileName const & fn)
 {
        bool const found = LyXVC::file_not_found_hook(fn);
        if (!found)
@@ -3615,7 +3615,7 @@ Buffer::ReadStatus Buffer::readFromVC(FileName const & fn)
 }
 
 
-Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
+Buffer::ReadStatus Buffer::loadEmergency(FileName const & fn)
 {
        FileName const emergencyFile = getEmergencyFileNameFor(fn);
        if (!emergencyFile.exists() 
@@ -3625,40 +3625,45 @@ Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
        docstring const file = makeDisplayPath(fn.absFileName(), 20);
        docstring const text = bformat(_("An emergency save of the document "
                "%1$s exists.\n\nRecover emergency save?"), file);
-       int const ret = Alert::prompt(_("Load emergency save?"), text,
+       
+       int const load_emerg = Alert::prompt(_("Load emergency save?"), text,
                0, 2, _("&Recover"), _("&Load Original"), _("&Cancel"));
 
-       switch (ret)
+       switch (load_emerg)
        {
        case 0: {
-               // the file is not saved if we load the emergency file.
-               markDirty();
                docstring str;
-               bool res;
-               ReadStatus const ret_rf = readFile(emergencyFile);
-               if (res = (ret_rf == ReadSuccess)) {
+               ReadStatus const ret_llf = loadThisLyXFile(emergencyFile);
+               bool const success = (ret_llf == ReadSuccess);
+               if (success) {
                        saveCheckSum(fn);
+                       markDirty();
                        str = _("Document was successfully recovered.");
                } else
                        str = _("Document was NOT successfully recovered.");
                str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
                                        makeDisplayPath(emergencyFile.absFileName()));
 
-               if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
-                               _("&Remove"), _("&Keep"))) {
+               int const del_emerg = 
+                       Alert::prompt(_("Delete emergency file?"), str, 1, 1,
+                               _("&Remove"), _("&Keep"));
+               if (del_emerg == 0) {
                        emergencyFile.removeFile();
-                       if (res)
+                       if (success)
                                Alert::warning(_("Emergency file deleted"),
                                        _("Do not forget to save your file now!"), true);
                        }
-               return res ? ReadSuccess : ReadEmergencyFailure;
+               return success ? ReadSuccess : ReadEmergencyFailure;
        }
-       case 1:
-               if (!Alert::prompt(_("Delete emergency file?"),
+       case 1: {
+               int const del_emerg =
+                       Alert::prompt(_("Delete emergency file?"),
                                _("Remove emergency file now?"), 1, 1,
-                               _("&Remove"), _("&Keep")))
+                               _("&Remove"), _("&Keep"));
+               if (del_emerg == 0)
                        emergencyFile.removeFile();
                return ReadOriginal;
+       }
 
        default:
                break;
@@ -3667,7 +3672,7 @@ Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
 }
 
 
-Buffer::ReadStatus Buffer::readAutosave(FileName const & fn)
+Buffer::ReadStatus Buffer::loadAutosave(FileName const & fn)
 {
        // Now check if autosave file is newer.
        FileName const autosaveFile = getAutosaveFileNameFor(fn);
@@ -3684,9 +3689,9 @@ Buffer::ReadStatus Buffer::readAutosave(FileName const & fn)
        switch (ret)
        {
        case 0: {
-               ReadStatus const ret_rf = readFile(autosaveFile);
+               ReadStatus const ret_llf = loadThisLyXFile(autosaveFile);
                // the file is not saved if we load the autosave file.
-               if (ret_rf == ReadSuccess) {
+               if (ret_llf == ReadSuccess) {
                        markDirty();
                        saveCheckSum(fn);
                        return ReadSuccess;
@@ -3707,19 +3712,25 @@ Buffer::ReadStatus Buffer::readAutosave(FileName const & fn)
 Buffer::ReadStatus Buffer::loadLyXFile(FileName const & fn)
 {
        if (!fn.isReadableFile()) {
-               ReadStatus const ret_rvc = readFromVC(fn);
+               ReadStatus const ret_rvc = extractFromVC(fn);
                if (ret_rvc != ReadSuccess)
                        return ret_rvc;
        }
 
-       ReadStatus const ret_re = readEmergency(fn);
+       ReadStatus const ret_re = loadEmergency(fn);
        if (ret_re == ReadSuccess || ret_re == ReadCancel)
                return ret_re;
        
-       ReadStatus const ret_ra = readAutosave(fn);
+       ReadStatus const ret_ra = loadAutosave(fn);
        if (ret_ra == ReadSuccess || ret_ra == ReadCancel)
                return ret_ra;
 
+       return loadThisLyXFile(fn);
+}
+
+
+Buffer::ReadStatus Buffer::loadThisLyXFile(FileName const & fn)
+{
        return readFile(fn);
 }