X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpspell.h;h=0080348797d1762726762a8628615464f37136b5;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=deb096c95ac6de26fbe541c12eb1e1a9459ef7e0;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/pspell.h b/src/pspell.h
index deb096c95a..0080348797 100644
--- a/src/pspell.h
+++ b/src/pspell.h
@@ -13,9 +13,12 @@
 #ifndef LYX_PSPELL_H
 #define LYX_PSPELL_H
 
+#include "SpellBase.h"
+
 #include <map>
 
-#include "SpellBase.h"
+
+namespace lyx {
 
 class PspellManager;
 class PspellStringEmulation;
@@ -30,7 +33,7 @@ public:
 	/**
 	 * Initialise the spellchecker with the given buffer params and language.
 	 */
-	PSpell(BufferParams const & params, string const & lang);
+	PSpell(BufferParams const & params, std::string const & lang);
 
 	virtual ~PSpell();
 
@@ -49,22 +52,22 @@ public:
 	/// accept the given word temporarily
 	virtual void accept(WordLangTuple const &);
 
-	/// 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:
 	/// add a manager of the given language
-	void addManager(string const & lang);
+	void addManager(std::string const & lang);
 
 	struct Manager {
 		PspellManager * manager;
 		PspellConfig * config;
 	};
 
-	typedef std::map<string, struct Manager> Managers;
+	typedef std::map<std::string, struct Manager> Managers;
 
 	/// the managers
 	Managers managers_;
@@ -75,4 +78,7 @@ private:
 	PspellCanHaveError * spell_error_object;
 };
 
-#endif // PSPELL_H
+
+} // namespace lyx
+
+#endif // LYX_PSPELL_H