X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FThesaurus.C;h=af37e4df6629fc8dcbeba25b9a61317b01adf7c5;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=e41ecf5fb04b98733b3872c262c03b211b15dded;hpb=822c8ce43043d0f1d4d0b3a21039768e3c1d6e7b;p=lyx.git

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index e41ecf5fb0..af37e4df66 100644
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -1,9 +1,11 @@
 /**
  * \file Thesaurus.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -11,15 +13,21 @@
 #include "Thesaurus.h"
 
 #include <algorithm>
- 
-Thesaurus thesaurus; 
+#include <string>
+
+
+namespace lyx {
+
+using std::string;
 
 #ifdef HAVE_LIBAIKSAURUS
- 
+
+using std::sort;
+
+
 Thesaurus::Thesaurus()
-{
-	aik_ = new Aiksaurus;
-}
+	: aik_(new Aiksaurus)
+{}
 
 
 Thesaurus::~Thesaurus()
@@ -36,14 +44,14 @@ Thesaurus::Meanings Thesaurus::lookup(string const & text)
 		return meanings;
 
 	// weird api, but ...
- 
+
 	int prev_meaning = -1;
 	int cur_meaning;
 	string meaning;
 
-	// correct, returns "" at the end 
+	// correct, returns "" at the end
 	string ret = aik_->next(cur_meaning);
- 
+
 	while (!ret.empty()) {
 		if (cur_meaning != prev_meaning) {
 			meaning = ret;
@@ -52,17 +60,17 @@ Thesaurus::Meanings Thesaurus::lookup(string const & text)
 		} else {
 			if (ret != text) {
 				meanings[meaning].push_back(ret);
-			} 
+			}
 		}
- 
+
 		ret = aik_->next(cur_meaning);
 	}
 
 	for (Meanings::iterator it = meanings.begin();
 		it != meanings.end(); ++it) {
-			std::sort(it->second.begin(), it->second.end());
+			sort(it->second.begin(), it->second.end());
 	}
- 
+
 	return meanings;
 }
 
@@ -71,16 +79,22 @@ Thesaurus::Meanings Thesaurus::lookup(string const & text)
 Thesaurus::Thesaurus()
 {
 }
- 
- 
+
+
 Thesaurus::~Thesaurus()
 {
 }
 
- 
+
 Thesaurus::Meanings Thesaurus::lookup(string const &)
 {
 	return Meanings();
 }
 
 #endif // HAVE_LIBAIKSAURUS
+
+// Global instance
+Thesaurus thesaurus;
+
+
+} // namespace lyx