Account for old versions of Pygments

[lyx.git] / src / WordList.cpp

diff --git a/src/WordList.cpp b/src/WordList.cpp
index 762e1b93c620411af87688dea91cbe0267eb2612..9bc52accea3461fd20f7d825d1a7e4e95519199b 100644 (file)
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -12,14 +12,14 @@
 
 #include "WordList.h"
 
-#include "Language.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/lassert.h"
+#include "support/unique_ptr.h"
 #include "support/weighted_btree.h"
 
-#include "support/lassert.h"
+#include <QThreadStorage>
 
 #include <map>
 
@@ -28,26 +28,23 @@ using namespace std;
 namespace lyx {
 
 ///
-map<Language, WordList *> theGlobalWordList;
+typedef map<string, unique_ptr<WordList>> GlobalWordList;
+// Each thread uses its own word list, but only the one of the GUI thread is
+// used to do real work. The others are only neded to prevent simultanous
+// write access e.g. from a cloned buffer and a true document buffer.
+QThreadStorage<GlobalWordList *> theGlobalWordList;
 
 
-WordList * theWordList(Language const & lang)
+WordList & theWordList(string const & lang)
 {
-       map<Language, WordList *>::iterator it = theGlobalWordList.find(lang);
-       if (it != theGlobalWordList.end())
-               return it->second;
+       if (!theGlobalWordList.hasLocalData())
+               theGlobalWordList.setLocalData(new GlobalWordList);
+       GlobalWordList & globalWordList = *theGlobalWordList.localData();
+       GlobalWordList::iterator it = globalWordList.find(lang);
+       if (it != globalWordList.end())
+               return *it->second;
        else
-               theGlobalWordList[lang] = new WordList;
-       return theGlobalWordList[lang];
-}
-
-
-void WordList::cleanupWordLists()
-{
-       map<Language, WordList *>::const_iterator it = theGlobalWordList.begin();
-       for (; it != theGlobalWordList.end(); ++it)
-               delete it->second;
-       theGlobalWordList.clear();
+               return *(globalWordList[lang] = make_unique<WordList>());
 }
 
 
@@ -62,9 +59,8 @@ struct WordList::Impl {
 };
 
 
-WordList::WordList()
+WordList::WordList() : d(make_unique<Impl>())
 {
-       d = new Impl;
        d->c_ = 0;
 
 #if 0
@@ -75,12 +71,6 @@ WordList::WordList()
 }
 
 
-WordList::~WordList()
-{
-       delete d;
-}
-
-
 docstring const & WordList::word(size_t idx) const
 {
        Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);