* src/LaTeXFeatures.cpp: simplify greektext definition. Patch by G. Milde (bug #6458)

[lyx.git] / src / Thesaurus.cpp

diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp
index a80ef87ad7c09bae4d9b829278cc38a255f66699..a0f15150f4f33ec11b976ef356fec140e82bd444 100644 (file)
--- a/src/Thesaurus.cpp
+++ b/src/Thesaurus.cpp
@@ -21,7 +21,6 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
-#include "support/unicode.h"
 
 #include "support/mythes/mythes.hxx"
 
@@ -38,21 +37,6 @@ namespace lyx {
 
 namespace {
 
-string const to_iconv_encoding(docstring const & s, string const & encoding)
-{
-       std::vector<char> const encoded =
-               ucs4_to_eightbit(s.data(), s.length(), encoding);
-       return string(encoded.begin(), encoded.end());
-}
-
-
-docstring const from_iconv_encoding(string const & s, string const & encoding)
-{
-       std::vector<char_type> const ucs4 =
-               eightbit_to_ucs4(s.data(), s.length(), encoding);
-       return docstring(ucs4.begin(), ucs4.end());
-}
-
 typedef std::map<docstring, MyThes *> Thesauri;
 
 } // namespace anon
@@ -79,6 +63,10 @@ struct Thesaurus::Private
                return false;
        }
 
+       ///
+       typedef std::pair<std::string, std::string> ThesFiles;
+       ///
+       ThesFiles getThesaurus(docstring const & lang);
        /// add a thesaurus to the list
        bool addThesaurus(docstring const & lang);
 
@@ -86,15 +74,16 @@ struct Thesaurus::Private
        Thesauri thes_;
 };
 
-bool Thesaurus::Private::addThesaurus(docstring const & lang)
+
+pair<string, string> Thesaurus::Private::getThesaurus(docstring const & lang)
 {
        string const thes_path = external_path(lyxrc.thesaurusdir_path);
        LYXERR(Debug::FILES, "thesaurus path: " << thes_path);
        if (thes_path.empty())
-               return false;
+               return make_pair(string(), string());
 
        if (thesaurusAvailable(lang))
-               return true;
+               return make_pair(string(), string());
 
        FileNameList const idx_files = FileName(thes_path).dirList("idx");
        FileNameList const data_files = FileName(thes_path).dirList("dat");
@@ -121,6 +110,16 @@ bool Thesaurus::Private::addThesaurus(docstring const & lang)
                        }
                }
 
+       return make_pair(idx, data);
+}
+
+
+bool Thesaurus::Private::addThesaurus(docstring const & lang)
+{
+       ThesFiles files = getThesaurus(lang);
+       string const idx = files.first;
+       string const data = files.second;
+
        if (idx.empty() || data.empty())
                return false;
 
@@ -137,6 +136,13 @@ bool Thesaurus::thesaurusAvailable(docstring const & lang) const
 }
 
 
+bool Thesaurus::thesaurusInstalled(docstring const & lang) const
+{
+       pair<string, string> files = d->getThesaurus(lang);
+       return (!files.first.empty() && !files.second.empty());
+}
+
+
 Thesaurus::Meanings Thesaurus::lookup(docstring const & t, docstring const & lang)
 {
        Meanings meanings;