A better fix for bug 675:

[lyx.git] / src / pspell.h

diff --git a/src/pspell.h b/src/pspell.h
index 4de75c2320f470b5f7e1d015795a36a2905a3d00..44071dc3e17d3647949aab433ed0cb21deef3c2d 100644 (file)
--- a/src/pspell.h
+++ b/src/pspell.h
@@ -17,11 +17,14 @@
 
 #include <map>
 
+
 class PspellManager;
 class PspellStringEmulation;
 class PspellCanHaveError;
 class PspellConfig;
 
+namespace lyx {
+
 class BufferParams;
 
 
@@ -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 docstring 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