# include <sys/time.h>
#endif
+
+namespace lyx {
+
using boost::shared_ptr;
#ifndef CXX_GLOBAL_CSTD
namespace {
-class LaunchIspell : public lyx::support::ForkedProcess {
- typedef lyx::support::ForkedProcess ForkedProcess;
+class LaunchIspell : public support::ForkedProcess {
+ typedef support::ForkedProcess ForkedProcess;
public:
///
LaunchIspell(BufferParams const & p, string const & l,
string enc = (params.inputenc == "auto")
? params.language->encoding()->latexName()
: params.inputenc;
- string::size_type n = enc.length();
+ size_t const n = enc.length();
tmp = new char[3];
string("-T").copy(tmp, 2);
tmp[2] = '\0';
// This is what happens when goto gets banned.
if (pipe(pipein) == -1) {
- error_ = lyx::to_utf8(_("Can't create pipe for spellchecker."));
+ error_ = _("Can't create pipe for spellchecker.");
return;
}
if (pipe(pipeout) == -1) {
close(pipein[0]);
close(pipein[1]);
- error_ = lyx::to_utf8(_("Can't create pipe for spellchecker."));
+ error_ = _("Can't create pipe for spellchecker.");
return;
}
close(pipein[1]);
close(pipeout[0]);
close(pipeout[1]);
- error_ = lyx::to_utf8(_("Can't create pipe for spellchecker."));
+ error_ = _("Can't create pipe for spellchecker.");
return;
}
if ((out = fdopen(pipein[1], "w")) == 0) {
- error_ = lyx::to_utf8(_("Can't open pipe for spellchecker."));
+ error_ = _("Can't open pipe for spellchecker.");
return;
}
if ((in = fdopen(pipeout[0], "r")) == 0) {
- error_ = lyx::to_utf8(_("Can't open pipe for spellchecker."));
+ error_ = _("Can't open pipe for spellchecker.");
return;
}
if ((inerr = fdopen(pipeerr[0], "r")) == 0) {
- error_ = lyx::to_utf8(_("Can't open pipe for spellchecker."));
+ error_ = _("Can't open pipe for spellchecker.");
return;
}
LaunchIspell * li = new LaunchIspell(params, lang, pipein, pipeout, pipeerr);
child_.reset(li);
if (li->start() == -1) {
- error_ = lyx::to_utf8(_("Could not create an ispell process.\nYou may not have "
- "the right languages installed."));
+ error_ = _("Could not create an ispell process.\nYou may not have "
+ "the right languages installed.");
child_.reset(0);
return;
}
}
/* must have read something from stderr */
- error_ = buf;
+ error_ =from_utf8(buf);
} else {
// select returned error
- error_ = lyx::to_utf8(_("The ispell process returned an error.\nPerhaps "
- "it has been configured wrongly ?"));
+ error_ = _("The ispell process returned an error.\nPerhaps "
+ "it has been configured wrongly ?");
}
close(pipein[0]);
bool error = select(err_read);
if (error) {
- error_ = lyx::to_utf8(_("Could not communicate with the ispell spellchecker process."));
+ error_ = _("Could not communicate with the ispell spellchecker process.");
return UNKNOWN_WORD;
}
if (err_read) {
- error_ = buf;
+ error_ = from_utf8(buf);
return UNKNOWN_WORD;
}
}
-string const ISpell::error()
+docstring const ISpell::error()
{
return error_;
}
+
+
+} // namespace lyx