X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=ef946db3388e3dcb326f4529bb1b8dba4caa50e6;hb=705302f6dee4e4be9ea46213aa1b0cc18be0cfb0;hp=77323e6efe741fa159419fd6faa595544f21b4d6;hpb=425c190d623daeb6d05bce1aa2244b548225305a;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 77323e6efe..ef946db338 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -69,7 +69,7 @@ NoteTranslator const & notetranslator()
 }
 
 
-} // anon
+} // namespace
 
 
 InsetNoteParams::InsetNoteParams()
@@ -100,7 +100,7 @@ void InsetNoteParams::read(Lexer & lex)
 /////////////////////////////////////////////////////////////////////
 
 InsetNote::InsetNote(Buffer * buf, string const & label)
-	: InsetCollapsable(buf)
+	: InsetCollapsible(buf)
 {
 	params_.type = notetranslator().find(label);
 }
@@ -127,14 +127,14 @@ Inset::DisplayType InsetNote::display() const
 void InsetNote::write(ostream & os) const
 {
 	params_.write(os);
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
 void InsetNote::read(Lexer & lex)
 {
 	params_.read(lex);
-	InsetCollapsable::read(lex);
+	InsetCollapsible::read(lex);
 }
 
 
@@ -176,7 +176,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCollapsible::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -203,7 +203,7 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return true;
 
 	default:
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
 }
 
@@ -214,7 +214,7 @@ bool InsetNote::isMacroScope() const
 	if (params_.type == InsetNoteParams::Note)
 		return true;
 
-	return InsetCollapsable::isMacroScope();
+	return InsetCollapsible::isMacroScope();
 }
 
 
@@ -228,7 +228,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 		runparams.inComment = true;
 		// Ignore files that are exported inside a comment
 		runparams.exportdata.reset(new ExportData);
-	} 
+	}
 
 	// the space after the comment in 'a[comment] b' will be eaten by the
 	// comment environment since the space before b is ignored with the
@@ -245,7 +245,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 	// insets whose InsetLayout Display tag is false. This is achieved
 	// by telling otexstream to protect an immediately following space
 	// and is done for both comment and greyedout insets.
-	InsetCollapsable::latex(os, runparams);
+	InsetCollapsible::latex(os, runparams);
 
 	runparams_in.encoding = runparams.encoding;
 }
@@ -300,7 +300,7 @@ docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	if (params_.type == InsetNoteParams::Note)
 		return docstring();
 
-	return InsetCollapsable::xhtml(xs, rp);
+	return InsetCollapsible::xhtml(xs, rp);
 }
 
 
@@ -311,13 +311,13 @@ void InsetNote::validate(LaTeXFeatures & features) const
 		if (features.runparams().flavor == OutputParams::HTML)
 			// we do output this but set display to "none" by default,
 			// but people might want to use it.
-			InsetCollapsable::validate(features);
+			InsetCollapsible::validate(features);
 		else
 			// Only do the requires
 			features.useInsetLayout(getLayout());
 		break;
 	case InsetNoteParams::Greyedout:
-		InsetCollapsable::validate(features);
+		InsetCollapsible::validate(features);
 		break;
 	case InsetNoteParams::Note:
 		break;