Remove saveCheckSum from Buffer::reload again. Now, the saveCheckSum call is already in Buffer::readFile, so it is not needed here anymore.

Also move the saveCheckSum declaration to the section of functions involving reading/writing. And note that it should be made private.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35925 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-10-29 23:51:13 +00:00
parent 8e0ebf12f3
commit 3bb31a04dd
2 changed files with 4 additions and 6 deletions

View File

@ -4123,7 +4123,6 @@ Buffer::ReadStatus Buffer::reload()
changed(true);
updateTitles();
markClean();
saveCheckSum();
message(bformat(_("Document %1$s reloaded."), disp_fn));
} else {
message(bformat(_("Could not reload document %1$s."), disp_fn));

View File

@ -200,11 +200,13 @@ public:
bool readString(std::string const &);
/// Reloads the LyX file
ReadStatus reload();
//FIXME: The following function should be private
//FIXME: The following two functions should be private
//private:
/// read the header, returns number of unknown tokens
int readHeader(Lexer & lex);
/// save timestamp and checksum of the given file.
void saveCheckSum() const;
private:
/// read a new file
ReadStatus readFile(support::FileName const & fn);
@ -328,9 +330,6 @@ public:
/// whether or not disk file has been externally modified
bool isExternallyModified(CheckMethod method) const;
/// save timestamp and checksum of the given file.
void saveCheckSum() const;
/// mark the main lyx file as not needing saving
void markClean() const;