Small changes that I found in my tree. This is going in tomorrow.
Georg
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/ChangeLog lyx-1.4-cvs/src/ChangeLog
--- lyx-1.4-clean/src/ChangeLog 2004-11-07 17:23:42.000000000 +0100
+++ lyx-1.4-cvs/src/ChangeLog 2004-11-07 17:37:29.000000000 +0100
@@ -1,3 +1,8 @@
+2004-11-07 Georg Baum <[EMAIL PROTECTED]>
+
+ * converter.C (move): don't lie in the error message
+ * converter.h (isReachable, move): document
+
2004-11-07 Lars Gullik Bjonnes <[EMAIL PROTECTED]>
* buffer.C: remove unused using lyx::support::atoi
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/converter.C lyx-1.4-cvs/src/converter.C
--- lyx-1.4-clean/src/converter.C 2004-10-27 21:04:02.000000000 +0200
+++ lyx-1.4-cvs/src/converter.C 2004-11-07 20:29:08.000000000 +0100
@@ -438,8 +453,6 @@ bool Converters::convert(Buffer const *
}
-// If from = /path/file.ext and to = /path2/file2.ext2 then this method
-// moves each /path/file*.ext file to /path2/file2*.ext2'
bool Converters::move(string const & fmt,
string const & from, string const & to, bool copy)
{
@@ -468,7 +481,9 @@ bool Converters::move(string const & fmt
: mover.rename(from2, to2);
if (!moved && no_errors) {
Alert::error(_("Cannot convert file"),
- bformat(_("Could not move a temporary file from %1$s to %2$s."),
+ bformat(copy ?
+ _("Could not copy a temporary file from %1$s to %2$s.") :
+ _("Could not move a temporary file from %1$s to %2$s."),
from2, to2));
no_errors = false;
}
diff -p -r -U 3 -X excl.tmp lyx-1.4-clean/src/converter.h lyx-1.4-cvs/src/converter.h
--- lyx-1.4-clean/src/converter.h 2004-10-27 21:04:02.000000000 +0200
+++ lyx-1.4-cvs/src/converter.h 2004-11-07 20:31:49.000000000 +0100
@@ -97,7 +99,7 @@ public:
std::vector<Format const *> const
getReachable(std::string const & from, bool only_viewable,
bool clear_visited);
- ///
+ /// Does a conversion path from format \p from to format \p to exist?
bool isReachable(std::string const & from, std::string const & to);
///
Graph::EdgePath const getPath(std::string const & from, std::string const & to);
@@ -141,7 +143,8 @@ private:
ConverterList converterlist_;
///
std::string latex_command_;
- ///
+ /// If \p from = /path/file.ext and \p to = /path2/file2.ext2 then
+ /// this method moves each /path/file*.ext file to /path2/file2*.ext2
bool move(std::string const & fmt,
std::string const & from, std::string const & to,
bool copy);
