X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.h;h=830a05c3c491f11cd24430441a9761d41b9644ae;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=15684639e71fdbed7c914f26c8b6bfb372f3499e;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/encoding.h b/src/encoding.h
index 15684639e7..830a05c3c4 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -1,19 +1,21 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file encoding.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef ENCODING_H
 #define ENCODING_H
 
-#include "LString.h"
-#include "lyxrc.h"
+#include <map>
+#include <string>
+
 
 ///
 typedef unsigned short int Uchar;
@@ -24,17 +26,17 @@ public:
 	///
 	Encoding() {}
 	///
-	Encoding(string const & n, string const & l, Uchar const * e)
+	Encoding(std::string const & n, std::string const & l, Uchar const * e)
 		: Name_(n), LatexName_(l) {
 		for (int i = 0; i < 256; ++i)
 			encoding_table[i] = e[i];
 	}
 	///
-	string const & Name() const {
+	std::string const & Name() const {
 		return Name_;
 	}
 	///
-	string const & LatexName() const {
+	std::string const & LatexName() const {
 		return LatexName_;
 	}
 	///
@@ -43,9 +45,9 @@ public:
 	}
 private:
 	///
-	string Name_;
+	std::string Name_;
 	///
-	string LatexName_;
+	std::string LatexName_;
 	///
 	Uchar encoding_table[256];
 };
@@ -55,13 +57,13 @@ extern Encoding symbol_encoding;
 class Encodings {
 public:
 	///
-	typedef std::map<string, Encoding> EncodingList;
+	typedef std::map<std::string, Encoding> EncodingList;
 	///
 	Encodings();
 	///
-	void read(string const & filename);
+	void read(std::string const & filename);
 	///
-	Encoding const * getEncoding(string const & encoding) const;
+	Encoding const * getEncoding(std::string const & encoding) const;
 	///
 	Encoding const * symbol_encoding() {
 		return &symbol_encoding_;