X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClassList.cpp;h=a696936f535380c5a9a77dbca4d8308801d76ddf;hb=6b651f2ad9f698c01993dcc6e340682c279f1c55;hp=eceacd29da1f3d3d6bfd6c0b124cff10d2f0e252;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index eceacd29da..a696936f53 100644
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -16,6 +16,7 @@
 #include "support/debug.h"
 #include "Lexer.h"
 
+#include "support/FileName.h"
 #include "support/filetools.h"
 
 #include <boost/bind.hpp>
@@ -23,20 +24,15 @@
 
 #include <fstream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::FileName;
-using support::addName;
-using support::libFileSearch;
-using support::makeDisplayPath;
-
 using boost::bind;
 using boost::regex;
 using boost::smatch;
 
-using namespace std;
-
 // Gets textclass number from name
 pair<bool, textclass_type> const
 TextClassList::numberOfClass(string const & textclass) const
@@ -68,7 +64,7 @@ TextClassList::operator[](textclass_type textclass) const
 
 // used when sorting the textclass list.
 class less_textclass_avail_desc
-	: public std::binary_function<TextClass, TextClass, int>
+	: public binary_function<TextClass, TextClass, int>
 {
 public:
 	int operator()(TextClass const & tc1,
@@ -89,7 +85,7 @@ public:
 bool TextClassList::read()
 {
 	Lexer lex(0, 0);
-	support::FileName const real_file = libFileSearch("", "textclass.lst");
+	FileName const real_file = libFileSearch("", "textclass.lst");
 	LYXERR(Debug::TCLASS, "Reading textclasses from `" << real_file << '\'');
 
 	if (real_file.empty()) {
@@ -178,8 +174,8 @@ void TextClassList::reset(textclass_type const textclass) {
 }
 
 
-std::pair<bool, textclass_type> const
-TextClassList::addTextClass(std::string const & textclass, std::string const & path)
+pair<bool, textclass_type> const
+TextClassList::addTextClass(string const & textclass, string const & path)
 {
 	// only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS
 	// NOTE: latex class name is defined in textclass.layout, which can be different from textclass