fix error message, add some documentation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9202 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ccdc9bd9617a57dfb45211423024ba6aa36072b..b3e2e373e0bde2a74211f5a630954f49f3699141 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-07  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * converter.C (move): don't lie in the error message
+       * converter.h (isReachable, move): document
+
 2004-11-07  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * buffer.C: remove unused using lyx::support::atoi

diff --git a/src/converter.C b/src/converter.C
index 7ce839105aa506ca9198d7b5c0ce05ea5d73ff9f..4ec623c2db4bd97394518e7d0f2ca1fc5ae9a15e 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -438,8 +438,6 @@ bool Converters::convert(Buffer const * buffer,
 }
 
 
-// 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 +466,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 --git a/src/converter.h b/src/converter.h
index ce290766fce7975155932cc9959ab65fd65d4e8c..bfdb26f788ca7cd4e5a0bd0e944d7ea57b8b86e0 100644 (file)
--- a/src/converter.h
+++ b/src/converter.h
@@ -97,7 +97,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 +141,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);