X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Faspell_local.h;h=1b45c704513e3fcf23a9cd9104d9bc93bf62858b;hb=095625dc3cd0542d13d8cc62362aa71c896eb3e0;hp=c256bc0fde8e9af64b0db256e9afc3f84576afd4;hpb=99215ea58fc2b6088a71e71c02a4af9af5548133;p=lyx.git

diff --git a/src/aspell_local.h b/src/aspell_local.h
index c256bc0fde..1b45c70451 100644
--- a/src/aspell_local.h
+++ b/src/aspell_local.h
@@ -1,24 +1,32 @@
+// -*- C++ -*-
 /**
  * \file aspell_local.h
- * Copyright 2001 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 Kevin Atkinson
- * \author John Levon <levon@movementarian.org>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_ASPELL_H
 #define LYX_ASPELL_H
 
+#include "SpellBase.h"
+
+#include "support/docstring.h"
+
 #include <map>
 
-#include "SpellBase.h"
 
 class AspellSpeller;
 class AspellStringEnumeration;
 class AspellCanHaveError;
 class AspellConfig;
 
+namespace lyx {
+
 class BufferParams;
 
 
@@ -27,7 +35,7 @@ public:
 	/**
 	 * Initialise the spellchecker with the given buffer params and language.
 	 */
-	ASpell(BufferParams const & params, string const & lang);
+	ASpell(BufferParams const & params, std::string const & lang);
 
 	virtual ~ASpell();
 
@@ -46,22 +54,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 speller of the given language
-	void addSpeller(string const & lang);
+	void addSpeller(std::string const & lang);
 
 	struct Speller {
 		AspellSpeller * speller;
 		AspellConfig * config;
 	};
 
-	typedef std::map<string, struct Speller> Spellers;
+	typedef std::map<std::string, Speller> Spellers;
 
 	/// the spellers
 	Spellers spellers_;
@@ -72,4 +80,7 @@ private:
 	AspellCanHaveError * spell_error_object;
 };
 
-#endif // ASPELL_H
+
+} // namespace lyx
+
+#endif // LYX_ASPELL_H