]> git.lyx.org Git - features.git/commitdiff
The second argument of Systemcall::startscript is supposed to be encoded
authorEnrico Forestieri <forenr@lyx.org>
Sun, 25 Sep 2011 16:38:51 +0000 (16:38 +0000)
committerEnrico Forestieri <forenr@lyx.org>
Sun, 25 Sep 2011 16:38:51 +0000 (16:38 +0000)
in the filesystem encoding, i.e., the local 8 bit encoding.

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

src/support/Systemcall.cpp
src/support/Systemcall.h

index 7588d4aa3eb784dd3315602a0ae559ea7a71deba..f8db8b0b689d633657b1ef761964653658cacc91 100644 (file)
@@ -212,7 +212,7 @@ int Systemcall::startscript(Starttype how, string const & what,
                            string const & path, bool process_events)
 {
        string outfile;
-       QString cmd = toqstr(parsecmd(what, outfile));
+       QString cmd = QString::fromLocal8Bit(parsecmd(what, outfile).c_str());
 
        SystemcallPrivate d(outfile);
 
@@ -257,7 +257,7 @@ SystemcallPrivate::SystemcallPrivate(const std::string& of) :
        if (!out_file_.empty()) {
                // Check whether we have to simply throw away the output.
                if (out_file_ != os::nulldev())
-                       process_->setStandardOutputFile(toqstr(out_file_));
+                       process_->setStandardOutputFile(QString::fromLocal8Bit(out_file_.c_str()));
        }
 
        connect(process_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut()));
index 71e4c6237d4bd218fc3695dbf27dffaa350854a5..1d4c75374a68148aac48b8d65b0c6b8ec960cbff 100644 (file)
@@ -40,9 +40,10 @@ public:
 
        /** Start child process.
         *  The string "what" contains a commandline with arguments separated
-        *  by spaces. The string "path" contains the path to be prepended to
-        *  the TEXINPUTS environment variable. Unset "process_events" in
-        *  case UI should be blocked while processing the external command.
+        *  by spaces and encoded in the filesystem encoding. The string "path"
+        *  contains the path to be prepended to the TEXINPUTS environment
+        *  variable and encoded in utf-8. Unset "process_events" in case
+        *  UI should be blocked while processing the external command.
         */
        int startscript(Starttype how, std::string const & what,
                        std::string const & path = empty_string(),