X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.h;h=cc383c02497820d8a127b56a29afcf79c607abe9;hb=4300feb8595c8542050adedf664cd4bfda7ede12;hp=07c081bf71a08b22d45c2bc16c766e2862521f9b;hpb=cb0a4c6639f5901b3d1d76900e44195347037a34;p=lyx.git

diff --git a/src/Format.h b/src/Format.h
index 07c081bf71..cc383c0249 100644
--- a/src/Format.h
+++ b/src/Format.h
@@ -143,9 +143,9 @@ public:
 	///
 	typedef FormatList::const_iterator const_iterator;
 	///
-	Format const & get(FormatList::size_type i) const { return formatlist[i]; }
+	Format const & get(FormatList::size_type i) const { return formatlist_[i]; }
 	///
-	Format & get(FormatList::size_type i) { return formatlist[i]; }
+	Format & get(FormatList::size_type i) { return formatlist_[i]; }
 	/// \returns format named \p name if it exists, otherwise 0
 	Format const * getFormat(std::string const & name) const;
 	/*!
@@ -200,16 +200,16 @@ public:
 	///
 	std::string const extensions(std::string const & name) const;
 	///
-	const_iterator begin() const { return formatlist.begin(); }
+	const_iterator begin() const { return formatlist_.begin(); }
 	///
-	const_iterator end() const { return formatlist.end(); }
+	const_iterator end() const { return formatlist_.end(); }
 	///
-	bool empty() const { return formatlist.empty(); }
+	bool empty() const { return formatlist_.empty(); }
 	///
-	FormatList::size_type size() const { return formatlist.size(); }
+	FormatList::size_type size() const { return formatlist_.size(); }
 private:
 	///
-	FormatList formatlist;
+	FormatList formatlist_;
 };
 
 ///
@@ -217,10 +217,13 @@ std::string flavor2format(OutputParams::FLAVOR flavor);
 // Not currently used.
 // OutputParams::FLAVOR format2flavor(std::string fmt);
 
-extern Formats formats;
-
-extern Formats system_formats;
+/// The global instance.
+/// Implementation is in LyX.cpp.
+extern Formats & theFormats();
 
+/// The global copy after reading lyxrc.defaults.
+/// Implementation is in LyX.cpp.
+extern Formats & theSystemFormats();
 
 } // namespace lyx