X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.h;h=6bac8b87ff96420044a29e081df1f6fed1957eb6;hb=7cb3b054916d146ccf5b57d15351b448775af26a;hp=1b8b85556e180047153a322bb55bafdc6aca3e23;hpb=0a16442310eda0baee85054b2b331061a0d90a76;p=lyx.git

diff --git a/src/converter.h b/src/converter.h
index 1b8b85556e..6bac8b87ff 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -61,9 +61,6 @@ public:
 	void setViewer(string const & v) {
 		viewer_ = v;
 	}
-	friend bool operator<(Format const & a, Format const & b) {
-		return compare_no_case(a.prettyname(),b.prettyname()) < 0;
-	}
 private:
 	string name_;
 	///
@@ -77,6 +74,13 @@ private:
 };
 
 
+inline
+bool operator<(Format const & a, Format const & b)
+{
+	return compare_no_case(a.prettyname(),b.prettyname()) < 0;
+}
+
+
 ///
 class Formats {
 public:
@@ -85,7 +89,7 @@ public:
 	///
 	typedef FormatList::const_iterator const_iterator;
 	///
-	Format const & Get(int i) const {
+	Format const & Get(FormatList::size_type i) const {
 		return formatlist[i];
 	}
 	///
@@ -215,10 +219,12 @@ public:
 		     string const & from_file, string const & to_file_base,
 		     string const & from_format, string const & to_format);
 	///
-	string const dvi_papersize(Buffer const * buffer);
+	string const papersize(Buffer const * buffer);
 	///
 	string const dvips_options(Buffer const * buffer);
 	///
+	string const dvipdfm_options(Buffer const * buffer);
+	///
 	void Update(Formats const & formats);
 	///
 	void UpdateLast(Formats const & formats);
@@ -258,6 +264,8 @@ private:
 	std::queue<int> Q;
 	///
 	int BFS_init(string const & start, bool clear_visited = true);
+	///
+	bool Move(string const & from, string const & to, bool copy);
 };
 
 extern Formats formats;