X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetexternal.h;h=e6fb0e946140bc0ea3eedfa3665a462060ea2fd2;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=278ad8a8275df008016364bc5d2573439034c01e;hpb=6a6bb5a017e041e5fe3a1fbf7053a2d0d4357ae3;p=lyx.git

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index 278ad8a827..e6fb0e9461 100644
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.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.
  *
  * ====================================================== */
 
@@ -21,16 +21,12 @@
 #include "LString.h"
 #include <sigc++/signal_system.h>
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-#endif
-
 ///
 class InsetExternal : public InsetButton {
 public:
 	/// hold parameters settable from the GUI
-	struct InsetExternalParams {
-		InsetExternalParams(string const & f = string(), 
+	struct Params {
+		Params(string const & f = string(), 
 					string const & p = string(), 
 					ExternalTemplate const & t = ExternalTemplate())
 			: filename(f), parameters(p), templ(t) {}
@@ -46,15 +42,17 @@ public:
 	///
 	virtual ~InsetExternal();
 	/// what appears in the minibuffer when opening
-	virtual string const EditMessage() const;
+	virtual string const editMessage() const;
+	///
+	virtual void edit(BufferView *, int x, int y, unsigned int button);
 	///
-	virtual void Edit(BufferView *, int x, int y, unsigned int button);
+	virtual void edit(BufferView * bv, bool front = true);
 	///
-	virtual EDITABLE Editable() const { return IS_EDITABLE; }
+	virtual EDITABLE editable() const { return IS_EDITABLE; }
 	///
-	virtual void Write(Buffer const *, std::ostream &) const;
+	virtual void write(Buffer const *, std::ostream &) const;
 	///
-	virtual void Read(Buffer const *, LyXLex & lex);
+	virtual void read(Buffer const *, LyXLex & lex);
 
 	/** returns the number of rows (\n's) of generated tex code.
 	 fragile == true means, that the inset should take care about
@@ -62,35 +60,38 @@ public:
 	 If the free_spc (freespacing) variable is set, then this inset
 	 is in a free-spacing paragraph.
 	 */
-	virtual int Latex(Buffer const *, std::ostream &, bool fragile,
-			  bool free_spc) const;
+	virtual int latex(Buffer const *, std::ostream &, bool fragile,
+	                  bool free_spc) const;
 	/// write ASCII output to the ostream
-	virtual int Ascii(Buffer const *, std::ostream &, int linelen) const;
+	virtual int ascii(Buffer const *, std::ostream &, int linelen) const;
 	/// write LinuxDoc output to the ostream
-	virtual int Linuxdoc(Buffer const *, std::ostream &) const;
+	virtual int linuxdoc(Buffer const *, std::ostream &) const;
 	/// write DocBook output to the ostream
-	virtual int DocBook(Buffer const *, std::ostream &) const;
+	virtual int docbook(Buffer const *, std::ostream &) const;
 
 	/// Updates needed features for this inset.
-	virtual void Validate(LaTeXFeatures & features) const;
+	virtual void validate(LaTeXFeatures & features) const;
 
 	/// returns LyX code associated with the inset. Used for TOC, ...)
-	virtual Inset::Code LyxCode() const { return EXTERNAL_CODE; }
+	virtual Inset::Code lyxCode() const { return EXTERNAL_CODE; }
  
 	///
-	virtual Inset * Clone(Buffer const &) const;
+	virtual Inset * clone(Buffer const &, bool same_id = false) const;
 
 	/// returns the text of the button
-	virtual string const getScreenLabel() const;
+	virtual string const getScreenLabel(Buffer const *) const;
 
 	// The following public members are used from the frontends code
 
 	/// set the parameters from a Params structure
-	virtual void setFromParams(InsetExternalParams const &);
+	virtual void setFromParams(Params const &);
 
-	/// update the file represented by the template
+	///
 	void updateExternal() const;
 
+	/// update the file represented by the template
+	void updateExternal(string const &, Buffer const *) const;
+
 	/// edit file of this template
 	void editExternal() const;
 
@@ -98,10 +99,10 @@ public:
 	void viewExternal() const;
 
 	/// return a copy of our current params
-	InsetExternalParams params() const;
+	Params params() const;
 
 	/// hide connection
-	Signal0<void> hideDialog;
+	SigC::Signal0<void> hideDialog;
 
 private:
 	/// Write the output for a specific file format
@@ -115,13 +116,18 @@ private:
 	string const doSubstitution(Buffer const *, string const & s) const;
 
 	/// our owning view
-	BufferView * view;
+	BufferView * view_;
 
 	/// the current params
-	InsetExternalParams params_;
+	Params params_;
 
 	/// A temp filename
-	string tempname;
+	string tempname_;
 };
 
+///
+bool operator==(InsetExternal::Params const &, InsetExternal::Params const &);
+///
+bool operator!=(InsetExternal::Params const &, InsetExternal::Params const &);
+
 #endif