FILMagain changes (will need some work)

[features.git] / src / insets / insetgraphics.C

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index dcc25313db0931fe67f0335cacf48a6b5de44d08..39c3b19e6323e5b8b25ac6f5e452403e1ab85b92 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -22,6 +22,9 @@
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 
+using std::ostream;
+using std::endl;
+
 extern string system_lyxdir;
 extern string user_lyxdir;
 extern string system_tempdir;
@@ -135,7 +138,7 @@ void InsetGraphics::draw(Painter & pain, LyXFont const & font,
 {
        // This will draw the graphics. As for now we only draw a
        // placeholder rectangele.
-       pain.rectangle(x, baseline - ascent(pain, font),
+       pain.rectangle(int(x), baseline - ascent(pain, font),
                       width(pain, font),
                       ascent(pain, font) + descent(pain, font));
 }
@@ -168,7 +171,7 @@ Inset::EDITABLE InsetGraphics::Editable() const
 }
 
 
-void InsetGraphics::Write(ostream & os) const
+void InsetGraphics::Write(Buffer const *, ostream & os) const
 {
        // The question on the file format is still open.
        // Suggestions?
@@ -178,7 +181,7 @@ void InsetGraphics::Write(ostream & os) const
 }
 
 
-void InsetGraphics::Read(LyXLex & /*lex*/) 
+void InsetGraphics::Read(Buffer const *, LyXLex & /*lex*/) 
 {
        // For now we only use a static file...
        graphicsfile = "testfile.xpm";
@@ -188,7 +191,8 @@ void InsetGraphics::Read(LyXLex & /*lex*/)
 }
 
 
-int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) const
+int InsetGraphics::Latex(Buffer const *, ostream & os,
+                        bool /*fragile*/, bool/*fs*/) const
 {
        // MISSING: We have to decide how to do the order of the options
        // that is depentant of order, like witdth, height, andlge. Should
@@ -201,7 +205,7 @@ int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) cons
        string command("\\insetgraphics");
        
 #ifdef HAVE_SSTREAM
-       ostringstream options;
+       std::ostringstream options;
 #else
        ostrstream options;
 #endif
@@ -330,13 +334,19 @@ int InsetGraphics::Latex(ostream & os, signed char /*fragile*/, bool/*fs*/) cons
 }
 
 
-int InsetGraphics::Linuxdoc(ostream &) const
+int InsetGraphics::Ascii(Buffer const *, ostream &) const
+{
+       return 0;
+}
+
+
+int InsetGraphics::Linuxdoc(Buffer const *, ostream &) const
 {
        return 0;
 }
 
 
-int InsetGraphics::DocBook(ostream &) const
+int InsetGraphics::DocBook(Buffer const *, ostream &) const
 {
        return 0;
 }