X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=397a8d0380db6f773df9689221d731b4fdde025a;hb=c0adb03a7ae15cf6409ee3cb64f4cc91c24c052e;hp=b458c8181bfe74f50c049c6e3017c6f12f96f33b;hpb=29378af4cdf9db7a7d6a72a9df34b8593f73f0e8;p=lyx.git

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index b458c8181b..397a8d0380 100644
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -62,7 +62,7 @@ static InsetName insetnames[INSET_CODE_SIZE];
 
 
 // This list should be kept in sync with the list of dialogs in
-// src/frontends/qt4/GuiView.cpp, I.e., if a dialog goes with an
+// src/frontends/qt/GuiView.cpp, I.e., if a dialog goes with an
 // inset, the dialog should have the same name as the inset.
 // Changes should be also recorded in LFUN_DIALOG_SHOW doxygen
 // docs in LyXAction.cpp.
@@ -117,7 +117,7 @@ static void build_translator()
 	insetnames[MATH_MACROARG_CODE] = InsetName("mathmacroarg");
 	insetnames[LISTINGS_CODE] = InsetName("listings");
 	insetnames[INFO_CODE] = InsetName("info", _("Info"));
-	insetnames[COLLAPSABLE_CODE] = InsetName("collapsable");
+	insetnames[COLLAPSIBLE_CODE] = InsetName("collapsible");
 	insetnames[NEWPAGE_CODE] = InsetName("newpage");
 	insetnames[SCRIPT_CODE] = InsetName("script");
 	insetnames[CELL_CODE] = InsetName("tablecell");
@@ -246,7 +246,7 @@ bool Inset::allowEmpty() const
 }
 
 
-bool Inset::forceLTR() const
+bool Inset::forceLTR(OutputParams const &) const
 {
 	return getLayout().forceLTR();
 }
@@ -553,22 +553,6 @@ void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 }
 
 
-void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
-{
-	ColorCode pen_color = mouseHovered(pi.base.bv) || editing(pi.base.bv)?
-		Color_mathframe : Color_mathcorners;
-
-	drawMarkers(pi, x, y);
-	Dimension const dim = dimension(*pi.base.bv);
-	int const t = x + dim.width() - 1;
-	int const a = y - dim.ascent();
-	pi.pain.line(x, a + 3, x, a, pen_color);
-	pi.pain.line(t, a + 3, t, a, pen_color);
-	pi.pain.line(x, a, x + 3, a, pen_color);
-	pi.pain.line(t - 3, a, t, a, pen_color);
-}
-
-
 bool Inset::editing(BufferView const * bv) const
 {
 	return bv->cursor().isInside(this);