X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetfloat.C;h=1d4c3614cb81a9fbc0dc6b67415468138b08ec09;hb=b922cdd796f9e4b9a46a79808cdee596e04903eb;hp=8b01326bad54344caf8a247cddba7887534fcb03;hpb=e952d33e0b702265cdac14de9871ecbfcf34863d;p=lyx.git

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 8b01326bad..1d4c3614cb 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -150,12 +150,12 @@ void InsetFloat::write(Buffer const * buf, ostream & os) const
 
 void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 {
-	if (lex.IsOK()) {
+	if (lex.isOK()) {
 		lex.next();
-		string token = lex.GetString();
+		string token = lex.getString();
 		if (token == "placement") {
 			lex.next();
-			floatPlacement_ = lex.GetString();
+			floatPlacement_ = lex.getString();
 		} else {
 			lyxerr << "InsetFloat::Read: Missing placement!"
 			       << endl;
@@ -163,10 +163,10 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 			lex.pushToken(token);
 		}
 		lex.next();
-		token = lex.GetString();
+		token = lex.getString();
 		if (token == "wide") {
 			lex.next();
-			string const tmptoken = lex.GetString();
+			string const tmptoken = lex.getString();
 			if (tmptoken == "true")
 				wide(true);
 			else
@@ -185,10 +185,10 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 void InsetFloat::validate(LaTeXFeatures & features) const
 {
 	if (contains(placement(), "H")) {
-		features.floats = true;
+		features.require("floats");
 	}
 	
-	features.usedFloats.insert(floatType_);
+	features.useFloat(floatType_);
 	InsetCollapsable::validate(features);
 }
 
@@ -240,10 +240,10 @@ int InsetFloat::latex(Buffer const * buf,
 }
 
 
-int InsetFloat::docBook(Buffer const * buf, ostream & os) const
+int InsetFloat::docbook(Buffer const * buf, ostream & os) const
 {
 	os << "<" << floatType_ << ">";
-	int const i = inset.docBook(buf, os);
+	int const i = inset.docbook(buf, os);
 	os << "</" << floatType_ << ">";
 
 	return i;
@@ -271,31 +271,6 @@ bool InsetFloat::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetFloat::insetButtonRelease(BufferView * bv, int x, int y, int button)
-{
-#if 0
-	if (x >= top_x
-	    && x < button_length
-	    && y >= button_top_y
-	    && y < button_bottom_y
-	    && button == 3) {
-		// This obviously need to change.
-		lyxerr << "InsetFloat: Let's edit this floats parameters!"
-		       << endl;
-		//bv->owner()->getDialogs()->showFloat(this);
-	} else {
-		InsetCollapsable::insetButtonRelease(bv, x, y, button);
-	}
-#else
-	if (button == 3) {
-		showInsetDialog(bv);
-		return;
-	}
-	InsetCollapsable::insetButtonRelease(bv, x, y, button);
-#endif
-}
-
-
 string const & InsetFloat::type() const 
 {
 	return floatType_;
@@ -304,11 +279,8 @@ string const & InsetFloat::type() const
 
 void InsetFloat::placement(string const & p)
 {
-	// Here we should only allow the placement to be set
+	// FIX: Here we should only allow the placement to be set
 	// if a valid value.
-#ifdef WITH_WARNINGS
-#warning FIX!
-#endif
 	floatPlacement_ = p;
 }