Amend febd1855eb: fix compilability of tex2lyx

[lyx.git] / src / DepTable.h

diff --git a/src/DepTable.h b/src/DepTable.h
index f74e8cbec03bfb8464e45c34887ffedf81e7b813..13498b7593b2203beb60a13d73e1b3311d7778d9 100644 (file)
--- a/src/DepTable.h
+++ b/src/DepTable.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  *
  * Full author contact details are available in file CREDITS.
@@ -13,53 +13,63 @@
 #ifndef DEP_TABLE_H
 #define DEP_TABLE_H
 
+#include <ctime>
 #include <map>
 #include <string>
 
+
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
 class DepTable {
 public:
        /** This one is a little bit harder since we need the absolute
          filename. Should we insert files with .sty .cls etc as
          extension? */
-       void insert(std::string const & f, bool upd = false);
+       void insert(support::FileName const & f, bool upd = false);
        ///
        void update();
 
        ///
-       void write(std::string const & f) const;
+       void write(support::FileName const & f) const;
        /// returns true if dep file was read successfully
-       bool read(std::string const & f);
+       bool read(support::FileName const & f);
        /// returns true if any of the files has changed
        bool sumchange() const;
        /// return true if fil has changed.
-       bool haschanged(std::string const & fil) const;
+       bool haschanged(support::FileName const & fil) const;
        /// return true if a file with extension ext has changed.
        bool extchanged(std::string const & ext) const;
        ///
-       bool exist(std::string const & fil) const;
+       bool exist(support::FileName const & fil) const;
        /// returns true if any files with ext exist
        bool ext_exist(std::string const & ext) const;
        ///
        void remove_files_with_extension(std::string const &);
        ///
-       void remove_file(std::string const &);
+       void remove_file(support::FileName const &);
 private:
        ///
-       struct dep_info {
+       class dep_info {
+       public:
                /// Previously calculated CRC value
                unsigned long crc_prev;
                /// Current CRC value - only re-computed if mtime has changed.
                unsigned long crc_cur;
                /// mtime from last time current CRC was calculated.
-               long mtime_cur;
+               std::time_t mtime_cur;
                ///
                bool changed() const;
        };
        ///
-       typedef std::map<std::string, dep_info> DepList;
+       typedef std::map<support::FileName, dep_info> DepList;
        ///
        DepList deplist;
 };
 
+
+} // namespace lyx
+
 #endif