John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / Thesaurus.C

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index 8e30bf9da7d6b267b4426f820a6d641e0058bc8d..785332c510ff2bb87b6f832a4e67796a225fe9b5 100644 (file)
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -6,6 +6,8 @@
  * \author John Levon
  */
 
+#include <config.h>
+
 #include "Thesaurus.h"
 
 Thesaurus thesaurus; 
@@ -15,18 +17,24 @@ Thesaurus thesaurus;
 Thesaurus::ThesaurusEntry::ThesaurusEntry(string const & ent, char part)
        : entry(ent), pos(Thesaurus::NONE)
 {
-       if (part & AikSaurus::Unknown) pos |= OTHER;
-       if (part & AikSaurus::Other) pos |= OTHER;
-       if (part & AikSaurus::Noun) pos |= NOUN;
-       if (part & AikSaurus::Verb) pos |= VERB;
-       if (part & AikSaurus::Adjective) pos |= ADJECTIVE;
-       if (part & AikSaurus::Adverb) pos |= ADVERB;
+       if (part & AikSaurus::Unknown)
+               pos |= OTHER;
+       if (part & AikSaurus::Other)
+               pos |= OTHER;
+       if (part & AikSaurus::Noun)
+               pos |= NOUN;
+       if (part & AikSaurus::Verb)
+               pos |= VERB;
+       if (part & AikSaurus::Adjective)
+               pos |= ADJECTIVE;
+       if (part & AikSaurus::Adverb)
+               pos |= ADVERB;
 }
 
 
 Thesaurus::Thesaurus()
 {
-       aik_ = new AikSaurus();
+       aik_ = new AikSaurus;
 }
 
 
@@ -44,9 +52,8 @@ std::vector<Thesaurus::ThesaurusEntry> Thesaurus::lookup(string const & text)
                return entries;
 
        char pos;
-       string ret;
 
-       ret = aik_->next(pos);
+       string ret = aik_->next(pos);
        while (!ret.empty()) {
                entries.push_back(ThesaurusEntry(ret, pos));
                ret = aik_->next(pos);
@@ -72,7 +79,8 @@ Thesaurus::~Thesaurus()
 }
 
  
-std::vector<Thesaurus::ThesaurusEntry> Thesaurus::lookup(string const & text)
+std::vector<Thesaurus::ThesaurusEntry>
+Thesaurus::lookup(string const & /*text*/)
 {
        return std::vector<ThesaurusEntry>();
 }