tex2lyx/text.cpp: fix 2 typos

[lyx.git] / src / Format.h

diff --git a/src/Format.h b/src/Format.h
index 21721fa8e6c10cfcfb1a480b5aaf1c11bbfb06f6..12e14f9e15b04299d4e0efa3839bd2202f47d2cf 100644 (file)
--- a/src/Format.h
+++ b/src/Format.h
@@ -17,8 +17,6 @@
 #include "OutputParams.h"
 
 #include <vector>
-#include <map>
-#include <ctime>
 
 namespace lyx {
 
@@ -65,7 +63,7 @@ public:
                return extension_list_.empty() ? empty_string() : extension_list_[0];
        }
        ///
-       std::string const & extensions() const { return extensions_; }
+       std::string const extensions() const;
        ///
        void setExtensions(std::string const & v);
        ///
@@ -98,9 +96,7 @@ private:
        /// Internal name. Needs to be unique.
        std::string name_;
        /// Filename extensions, the first one being the default
-       mutable std::vector<std::string> extension_list_;
-       /// All filename extensions
-       std::string extensions_;
+       std::vector<std::string> extension_list_;
        /// Name presented to the user. Needs to be unique.
        std::string prettyname_;
        /// Keyboard shortcut for the View and Export menu.
@@ -145,6 +141,8 @@ public:
        std::string getFormatFromFile(support::FileName const & filename) const;
        /// Finds a format from a file extension. Returns string() if not found.
        std::string getFormatFromExtension(std::string const & ext) const;
+       /// Finds a format by pretty name. Returns string() if not found.
+       std::string getFormatFromPrettyName(std::string const & prettyname) const;
        /** Returns true if the file referenced by \p filename is zipped and
         ** needs to be unzipped for being handled
         ** @note For natively zipped formats, such as dia/odg, this returns false.
@@ -191,14 +189,6 @@ public:
 private:
        ///
        FormatList formatlist;
-       /// Used to store last timestamp of file and whether it is (was) zipped
-       struct ZippedInfo {
-               bool zipped; std::time_t timestamp;
-               ZippedInfo(bool zipped, std::time_t timestamp)
-               : zipped(zipped), timestamp(timestamp) { }
-       };
-       ///
-       mutable std::map<std::string, ZippedInfo> zipped_;
 };
 
 ///