Add a Buffer::fully_loaded member function, returning true only when

[lyx.git] / src / ispell.C

diff --git a/src/ispell.C b/src/ispell.C
index d9fcd9472043dc781c7e5414b8a86fb8d5d4049d..f1abc99bf013fc419307554498857b245ad9f765 100644 (file)
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -1,49 +1,56 @@
 /**
  * \file ispell.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author John Levon <levon@movementarian.org>
+ * \author Angus Leeming
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "LString.h"
-#include "lyxrc.h"
-#include "language.h"
+#include "ispell.h"
+
+#include "bufferparams.h"
 #include "debug.h"
 #include "encoding.h"
-#include "ispell.h"
-#include "WordLangTuple.h"
 #include "gettext.h"
+#include "language.h"
+#include "lyxrc.h"
+#include "WordLangTuple.h"
 
 #include "support/forkedcall.h"
-#include "support/lstrings.h"
 
+// HP-UX 11.x doesn't have this header
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
 #include <sys/time.h>
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strcpy;
 using std::strlen;
 using std::strpbrk;
-using std::strstr;
 #endif
 
 using std::endl;
 using std::max;
+using std::string;
+
 
 namespace {
 
-class LaunchIspell : public ForkedProcess {
+class LaunchIspell : public lyx::support::ForkedProcess {
 public:
        ///
        LaunchIspell(BufferParams const & p, string const & l,
                     int * in, int * out, int * err)
                : params(p), lang(l), pipein(in), pipeout(out), pipeerr(err) {}
        ///
-       virtual ForkedProcess * clone() const {
+       virtual lyx::support::ForkedProcess * clone() const {
                return new LaunchIspell(*this);
        }
        ///
@@ -63,7 +70,7 @@ private:
 
 int LaunchIspell::start()
 {
-       command_ = "ispell";
+       command_ = lyxrc.isp_command;
        return runNonBlocking();
 }
 
@@ -183,7 +190,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
 
        // static due to the setvbuf. Ugly.
        static char o_buf[BUFSIZ];
-       
+
        // We need to throw an exception not do this
        pipein[0] = pipein[1] = pipeout[0] = pipeout[1]
                = pipeerr[0] = pipeerr[1] = -1;
@@ -232,7 +239,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
        child_.reset(li);
        if (li->start() == -1) {
                error_ = _("Could not create an ispell process.\nYou may not have "
-                       " the right languages installed.");     
+                       "the right languages installed.");
                child_.reset(0);
                return;
        }
@@ -362,7 +369,7 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
        bool error = select(err_read);
 
        if (error) {
-               error_ = _("Could not communicate with the spell-checker program");
+               error_ = _("Could not communicate with the spell-checker program.");
                return UNKNOWN;
        }