X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FThesaurus.h;h=5f2793274122dab76ba568aa777ddaf40286285f;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=5ade7daf8d70337045483fd0bac895e6f198aa3d;hpb=8254b16fd11fea6224e4db951839747e642115d3;p=lyx.git

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index 5ade7daf8d..5f27932741 100644
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -9,16 +9,15 @@
 
 #ifndef THESAURUS_H
 #define THESAURUS_H
- 
+
 #include <vector>
+#include <map>
 
-#include <config.h>
- 
 #include "LString.h"
 #ifdef HAVE_LIBAIKSAURUS
-#include "AikSaurus.h"
+#include AIKSAURUS_H_LOCATION
 #endif
- 
+
 /**
  * This class provides an interface to whatever thesauri we might support.
  */
@@ -30,41 +29,19 @@ public:
 	///
 	~Thesaurus();
 
-	/**
-	 * enum of possible part of speech types
-	 */
-	enum POS {
-		NONE = 0x0,
-		OTHER = 0x01,
-		NOUN = 0x02,
-		VERB = 0x04,
-		ADJECTIVE = 0x08,
-		ADVERB = 0x10
-	};
-
-	/**
-	 * an individual entry from the thesaurus 
-	 */
-	struct ThesaurusEntry {
-		/// 
-		ThesaurusEntry(const string & ent, char pos); 
-		/// the actual entry 
-		string entry;
-		/// entry's part of speech
-		int pos;
-	};
+	typedef std::map<string, std::vector<string> > Meanings;
 
 	/**
 	 * look up some text in the thesaurus
 	 */
-	std::vector<ThesaurusEntry> lookup(string const & text);
+	Meanings lookup(string const & text);
 
 private:
 #ifdef HAVE_LIBAIKSAURUS
-	AikSaurus * aik_;
+	Aiksaurus * aik_;
 #endif
 };
- 
+
 extern Thesaurus thesaurus;
- 
+
 #endif