X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.h;h=f7ea07a0c3fea27ecf970c044ed24f7938166a21;hb=997f0621c5346bb623cf86713c4fe1be0c941104;hp=c6c40fe5d36cf13fec59e50725bb5bed72312ea7;hpb=b83564d82cbf5ffab48715293df03b6b6284c1b5;p=lyx.git

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index c6c40fe5d3..f7ea07a0c3 100644
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -13,56 +13,49 @@
 #ifndef INSETFLEX_H
 #define INSETFLEX_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
+
 
 namespace lyx {
 
 /** The Flex inset, e.g., CharStyle, Custom inset or XML short element
 
 */
-class InsetFlex : public InsetCollapsable {
+class InsetFlex : public InsetCollapsible {
 public:
 	///
-	InsetFlex(Buffer const &, std::string const & layoutName);
+	InsetFlex(Buffer *, std::string const & layoutName);
 	///
-	docstring name() const { return from_utf8(name_); }
-
+	docstring layoutName() const override { return from_utf8("Flex:" + name_); }
 	///
-	docstring editMessage() const;
+	InsetLayout const & getLayout() const override;
 	///
-	InsetCode lyxCode() const { return FLEX_CODE; }
+	InsetCode lyxCode() const override { return FLEX_CODE; }
+	/// Default looks
+	InsetDecoration decoration() const override;
 	///
-	void write(std::ostream &) const;
+	void write(std::ostream &) const override;
+	/// should paragraph indentation be omitted in any case?
+	bool neverIndent() const override { return true; }
 	///
-	void read(Lexer & lex);
-
+	bool hasSettings() const override { return false; }
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	bool canTrackChanges() const override { return name_ != "URL"; }
 	///
-	int docbook(odocstream &, OutputParams const &) const;
-	/// the string that is passed to the TOC
-	void tocString(odocstream &) const;
-
-	/// should paragraph indendation be ommitted in any case?
-	bool neverIndent() const { return true; }
+	bool getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus &) const override;
+	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd) override;
+	///
+	void updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted = false) override;
 
 protected:
+	///
 	InsetFlex(InsetFlex const &);
 
 private:
-	Inset * clone() const { return new InsetFlex(*this); }
-	// FIXME The following two routines should be moved to InsetCollapsable.
-	// That will allow the redeclarations of these routines to be removed
-	// from its subclasses, such as InsetERT. But it will also require us
-	// to rework stdinsets.inc, to make sure we get the right behavior from
-	// the subclasses.
-	/// should paragraphs be forced to use the empty layout?
-	virtual bool forcePlainLayout(idx_type = 0) const 
-		{ return getLayout().forcePlainLayout(); }
-	/// should the user be allowed to customize alignment, etc.?
-	virtual bool allowParagraphCustomization(idx_type = 0) const 
-		{ return getLayout().allowParagraphCustomization(); }
-
+	///
+	Inset * clone() const override { return new InsetFlex(*this); }
 	///
 	std::string name_;
 };