hopefully fix tex2lyx linking.

[lyx.git] / src / aspell_local.h

diff --git a/src/aspell_local.h b/src/aspell_local.h
index 645b2cd6cbd4226791070d15b9e67a60abfbd49c..1b45c704513e3fcf23a9cd9104d9bc93bf62858b 100644 (file)
--- a/src/aspell_local.h
+++ b/src/aspell_local.h
@@ -13,15 +13,20 @@
 #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;
 
 
@@ -30,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();
 
@@ -49,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_;
@@ -75,4 +80,7 @@ private:
        AspellCanHaveError * spell_error_object;
 };
 
-#endif // ASPELL_H
+
+} // namespace lyx
+
+#endif // LYX_ASPELL_H