The graphics part of J�rgen S's latest patch + a few tweaks of my own.

[lyx.git] / src / Thesaurus.h

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index fc04d72a0cbdbed65ebacdc94cb28dc9f70b8ce7..083fcef223610221789ab9ac61acedcade316eab 100644 (file)
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file Thesaurus.h
  * Copyright 2001 the LyX Team
@@ -10,12 +11,11 @@
 #define THESAURUS_H
  
 #include <vector>
-
-#include <config.h>
+#include <map>
  
 #include "LString.h"
 #ifdef HAVE_LIBAIKSAURUS
-#include "AikSaurus.h"
+#include "Aiksaurus.h"
 #endif
  
 /**
@@ -29,38 +29,16 @@ 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
 };