gnome build removal, gtk build fix

[lyx.git] / src / chset.h

diff --git a/src/chset.h b/src/chset.h
index 0ba6294d1f132086f865d65947b1dfb6dcb7a690..468ce2399540d2aee9d8b1f731370ff81dee9132 100644 (file)
--- a/src/chset.h
+++ b/src/chset.h
@@ -1,8 +1,13 @@
 // -*- C++ -*-
 /**
  * \file chset.h
- * Copyright 2002 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 Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef CHSET_H
@@ -10,8 +15,8 @@
 
 #include <map>
 #include <utility>
+#include <string>
 
-#include "LString.h"
 
 /// a class for mapping char strings such as "\^{A}" to the integer value
 class CharacterSet {
@@ -24,21 +29,21 @@ public:
         * and parses it. This function is only intended to be
         * called once.
         */
-       bool loadFile(string const & charset);
+       bool loadFile(std::string const & charset);
        /// return the name of the current charset
-       string const & getName() const;
+       std::string const & getName() const;
        /**
         * Return the encoded charset value of the given string.
         *
         * The bool value is false if an encoding could not be found
         * in this charset, and true otherwise.
         */
-       std::pair<bool, int> const encodeString(string const &) const;
+       std::pair<bool, int> const encodeString(std::string const &) const;
 private:
        /// charset name
-       string name_;
+       std::string name_;
        ///
-       typedef std::map<string, unsigned char> Cdef;
+       typedef std::map<std::string, unsigned char> Cdef;
        /// mapping from string representation to encoded value
        Cdef map_;
 };