X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.h;h=07c081bf71a08b22d45c2bc16c766e2862521f9b;hb=02e82157ec583c3900e359de86be79fac6512387;hp=74d2c4ea2651ef4bd7f6f7b44528e19d3845be12;hpb=0a8b7f6a5740f4b4f976eb308841ad3b98166015;p=lyx.git diff --git a/src/Format.h b/src/Format.h index 74d2c4ea26..07c081bf71 100644 --- a/src/Format.h +++ b/src/Format.h @@ -42,7 +42,7 @@ public: zipped_native = 8 }; /// - Format(std::string const & n, std::string const & e, std::string const & p, + Format(std::string const & n, std::string const & e, docstring const & p, std::string const & s, std::string const & v, std::string const & ed, std::string const & m, int); /// @@ -68,9 +68,9 @@ public: /// void setExtensions(std::string const & v); /// - std::string const prettyname() const { return prettyname_; } + docstring const prettyname() const { return prettyname_; } /// - void setPrettyname(std::string const & v) { prettyname_ = v; } + void setPrettyname(docstring const & v) { prettyname_ = v; } /// std::string const shortcut() const { return shortcut_; } /// @@ -106,7 +106,7 @@ private: /// Filename extensions, the first one being the default std::vector extension_list_; /// Name presented to the user. Needs to be unique. - trivstring prettyname_; + trivdocstring prettyname_; /// Keyboard shortcut for the View and Export menu. trivstring shortcut_; /*! @@ -176,7 +176,7 @@ public: void add(std::string const & name); /// void add(std::string const & name, std::string const & extensions, - std::string const & prettyname, std::string const & shortcut, + docstring const & prettyname, std::string const & shortcut, std::string const & viewer, std::string const & editor, std::string const & mime, int flags); ///