Make string conversion work with non-ucs2-characters if using qt 4.2

[lyx.git] / src / ispell.h

diff --git a/src/ispell.h b/src/ispell.h
index 23a75eb6ce4fe95d93acfe578524d26925b95bf4..0fe77a15bc261f46b60e92dfdb897675b36b5d71 100644 (file)
--- a/src/ispell.h
+++ b/src/ispell.h
@@ -1,10 +1,13 @@
 // -*- C++ -*-
 /**
  * \file ispell.h
- * 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
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef SP_ISPELL_H
@@ -12,17 +15,22 @@
 
 #include "SpellBase.h"
 
+#include "support/docstring.h"
+
 #include <boost/scoped_ptr.hpp>
 
 #include <cstdio>
 
+namespace lyx {
+
 class BufferParams;
-class ForkedProcess;
+
+namespace support { class ForkedProcess; }
 
 /// i/a spell process-based spellchecker
 class ISpell : public SpellBase {
 public:
-       ISpell(BufferParams const & params, string const & lang);
+       ISpell(BufferParams const & params, std::string const & lang);
 
        ~ISpell();
 
@@ -38,11 +46,11 @@ public:
        /// accept the given word temporarily
        virtual void accept(WordLangTuple const & word);
 
-       /// return the next near miss after a MISSED result
-       virtual string const nextMiss();
+       /// return the next near miss after a SUGGESTED_WORDS result
+       virtual std::string const nextMiss();
 
        /// give an error message on messy exit
-       virtual string const error();
+       virtual docstring const error();
 
 private:
        /// read some data. Returns true on an error. Sets err_read
@@ -65,9 +73,9 @@ private:
        char buf[BUFSIZ];
 
        /// spell error
-       string error_;
+       docstring error_;
 
-       boost::scoped_ptr<ForkedProcess> child_;
+       boost::scoped_ptr<support::ForkedProcess> child_;
 
        // vileness below ... please FIXME
        /// str ???
@@ -77,4 +85,6 @@ private:
 
 };
 
+} // namespace lyx
+
 #endif // ISPELL_H