X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FThesaurus.h;h=9c13b044cb9ecf30980b0bbdb9b3073d0a046eb9;hb=19f5aa58aa55fe210c689052967ade0f943f82fb;hp=9a238ce5ab52bf7ea164216351f3288483b3a52d;hpb=df4814e0267789ce84802d69aa6725395517ca9b;p=lyx.git

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index 9a238ce5ab..9c13b044cb 100644
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -13,27 +13,24 @@
 #ifndef THESAURUS_H
 #define THESAURUS_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
-#include <vector>
 #include <map>
-#include <string>
-
-#ifdef HAVE_LIBMYTHES
-#include MYTHES_H_LOCATION
-#else
-#ifdef HAVE_LIBAIKSAURUS
-#include AIKSAURUS_H_LOCATION
-#endif // HAVE_LIBAIKSAURUS
-#endif // !HAVE_LIBMYTHES
+#include <vector>
 
 namespace lyx {
 
+class WordLangTuple;
+
 /**
  * This class provides an interface to whatever thesauri we might support.
  */
 
-class Thesaurus {
+class Thesaurus
+{
+	/// noncopyable
+	Thesaurus(Thesaurus const &);
+	void operator=(Thesaurus const &);
 public:
 	///
 	Thesaurus();
@@ -45,23 +42,17 @@ public:
 	/**
 	 * look up some text in the thesaurus
 	 */
-	Meanings lookup(docstring const & text, docstring const & lang);
-	/// check if a thesaurus for a given language \p lang is available
+	Meanings lookup(WordLangTuple const & wl);
+	/** check if a thesaurus for a given language \p lang is available
+	 *  (installed and loaded)
+	 */
 	bool thesaurusAvailable(docstring const & lang) const;
+	/// check if a thesaurus for a given language \p lang is installed
+	bool thesaurusInstalled(docstring const & lang) const;
 
 private:
-#ifdef HAVE_LIBMYTHES
-	/// add a thesaurus to the list
-	bool addThesaurus(docstring const & lang);
-
-	typedef std::map<docstring, MyThes *> Thesauri;
-	/// the thesauri
-	Thesauri thes_;
-#else
-#ifdef HAVE_LIBAIKSAURUS
-	Aiksaurus * thes_;
-#endif // HAVE_LIBAIKSAURUS
-#endif // !HAVE_LIBMYTHES
+	struct Private;
+	Private * const d;
 };
 
 extern Thesaurus thesaurus;