another safety belt

[lyx.git] / src / support / translator.h

diff --git a/src/support/translator.h b/src/support/translator.h
index aff39251d9f1c7bca82c396d83870fe346940c4a..17d2bae887371157f6ee23e86038218f9199f2e6 100644 (file)
--- a/src/support/translator.h
+++ b/src/support/translator.h
@@ -1,13 +1,13 @@
 // -*- C++ -*-
-/* This file is part of
- * =================================================
- * 
- *          LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file translator.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *          This file Copyright 2000 Baruch Even
- * ================================================= */
+ * \author Baruch Even
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef TRANSLATOR_H
 #define TRANSLATOR_H
@@ -19,12 +19,13 @@
 
 #include "support/LAssert.h"
 #include "support/lyxfunctional.h"
-/** This class template is used to translate between two elements, specifically
-    it was worked out to translate between an enum and strings when reading
-    the lyx file.
-    
-    The two template arguments should be of different types.
-*/
+/**
+ * This class template is used to translate between two elements, specifically
+ * it was worked out to translate between an enum and strings when reading
+ * the lyx file.
+ *
+ * The two template arguments should be of different types.
+ */
 template<typename T1, typename T2>
 class Translator {
 public:
@@ -36,42 +37,42 @@ public:
        typedef std::pair<T1, T2> MapPair;
        ///
        typedef std::vector<MapPair> Map;
-       
+
        ///
-       Translator(T1 const & t1, T2 const & t2) 
-               : default_t1(t1), default_t2(t2) 
+       Translator(T1 const & t1, T2 const & t2)
+               : default_t1(t1), default_t2(t2)
                {}
-       
+
        /// Add a mapping to the translator.
        void addPair(T1 const & first, T2 const & second) {
                map.push_back(MapPair(first, second));
        }
-       
+
        /// Find the mapping for the first argument
        T2 const & find(T1 const & first) const {
                lyx::Assert(!map.empty());
-               
+
                // For explanation see the next find() function.
-               Map::const_iterator it =
+               typename Map::const_iterator it =
                        std::find_if(map.begin(), map.end(),
                                     lyx::equal_1st_in_pair<MapPair>(first)
                                );
-               
+
                if (it != map.end()) {
                        return it->second;
                } else {
                        return default_t2;
                }
        }
-       
+
        /// Find the mapping for the second argument
        T1 const & find(T2 const & second) const {
                lyx::Assert(!map.empty());
-               
+
                // The idea is as follows:
                // find_if() will try to compare the data in the vector with
                // the value. The vector is made of pairs and the value has
-               // the type of the second part of the pair. 
+               // the type of the second part of the pair.
                // We thus give find_if() an equal_to functor and assign to
                // its second post the value we want to compare. We now
                // compose the equal_to functor with the select2nd functor
@@ -79,11 +80,11 @@ public:
                //
                // We can depict it as follows:
                // equal_to(select2nd(pair) , second)
-               Map::const_iterator it =
+               typename Map::const_iterator it =
                        std::find_if(map.begin(), map.end(),
                                     lyx::equal_2nd_in_pair<MapPair>(second)
                                );
-               
+
                if (it != map.end())
                        return it->first;
                else {
@@ -99,4 +100,4 @@ private:
        T2 const default_t2;
 };
 
-#endif
+#endif // TRANSLATOR_H