X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInset.cpp;h=0cfb10cdd3e074dd2057529624b56f83a2b2a4e6;hb=c3a8b3a566e9e90f9ade72acbc723232d721d0b1;hp=b8e6c7cb5122456f0c1ac42ed105723417e8a294;hpb=dac06728cb240de7ca4ae996a93a15029298dff1;p=lyx.git

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index b8e6c7cb51..0cfb10cdd3 100644
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -21,12 +21,10 @@
 #include "BufferView.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "Text.h"
 #include "TextClass.h"
 #include "MetricsInfo.h"
@@ -34,15 +32,14 @@
 
 #include "frontends/Painter.h"
 #include "frontends/Application.h"
-#include "frontends/Gui.h"
 
 #include "support/convert.h"
-
-#include <boost/current_function.hpp>
+#include "support/debug.h"
+#include "support/gettext.h"
 
 #include <map>
-#include <typeinfo>
 
+using namespace std;
 
 namespace lyx {
 
@@ -50,13 +47,13 @@ extern bool quitting;
 
 class InsetName {
 public:
-	InsetName(std::string const & n, InsetCode c) : name(n), code(c) {}
-	std::string name;
+	InsetName(string const & n, InsetCode c) : name(n), code(c) {}
+	string name;
 	InsetCode code;
 };
 
 
-typedef std::map<std::string, InsetCode> TranslatorMap;
+typedef map<string, InsetCode> TranslatorMap;
 
 
 static TranslatorMap const build_translator()
@@ -106,14 +103,14 @@ static TranslatorMap const build_translator()
 		InsetName("listings", LISTINGS_CODE),
 		InsetName("info", INFO_CODE),
 		InsetName("collapsable", COLLAPSABLE_CODE),
-		InsetName("pagebreak", PAGEBREAK_CODE),
+		InsetName("newpage", NEWPAGE_CODE),
 	};
 
-	std::size_t const insetnames_size =
+	size_t const insetnames_size =
 		sizeof(insetnames) / sizeof(insetnames[0]);
 
-	std::map<std::string, InsetCode> data;
-	for (std::size_t i = 0; i != insetnames_size; ++i) {
+	map<string, InsetCode> data;
+	for (size_t i = 0; i != insetnames_size; ++i) {
 		InsetName const & var = insetnames[i];
 		data[var.name] = var.code;
 	}
@@ -128,13 +125,25 @@ docstring Inset::name() const
 }
 
 
+docstring Inset::toolTip(BufferView const &, int, int) const
+{
+	return docstring();
+}
+
+
+docstring Inset::contextMenu(BufferView const &, int, int) const
+{
+	return docstring();
+}
+
+
 Dimension const Inset::dimension(BufferView const & bv) const
 {
 	return bv.coordCache().getInsets().dim(this);
 }
 
 
-InsetCode insetCode(std::string const & name)
+InsetCode insetCode(string const & name)
 {
 	static TranslatorMap const translator = build_translator();
 
@@ -143,7 +152,7 @@ InsetCode insetCode(std::string const & name)
 }
 
 
-std::string insetName(InsetCode c) 
+string insetName(InsetCode c) 
 {
 	static TranslatorMap const translator = build_translator();
 
@@ -153,7 +162,7 @@ std::string insetName(InsetCode c)
 		if (it->second == c)
 			return it->first;
 	}
-	return std::string();
+	return string();
 }
 
 
@@ -204,15 +213,15 @@ bool Inset::getStatus(Cursor &, FuncRequest const & cmd,
 }
 
 
-void Inset::edit(Cursor &, bool)
+void Inset::edit(Cursor &, bool, EntryDirection)
 {
-	LYXERR(Debug::INSETS, BOOST_CURRENT_FUNCTION << ": edit left/right");
+	LYXERR(Debug::INSETS, "edit left/right");
 }
 
 
 Inset * Inset::editXY(Cursor &, int x, int y)
 {
-	LYXERR(Debug::INSETS, BOOST_CURRENT_FUNCTION << ": x=" << x << " y= " << y);
+	LYXERR(Debug::INSETS, "x: " << x << " y: " << y);
 	return this;
 }
 
@@ -220,11 +229,9 @@ Inset * Inset::editXY(Cursor &, int x, int y)
 Inset::idx_type Inset::index(row_type row, col_type col) const
 {
 	if (row != 0)
-		lyxerr << BOOST_CURRENT_FUNCTION
-		       << ": illegal row: " << row << std::endl;
+		LYXERR0("illegal row: " << row);
 	if (col != 0)
-		lyxerr << BOOST_CURRENT_FUNCTION
-		       << ": illegal col: " << col << std::endl;
+		LYXERR0("illegal col: " << col);
 	return 0;
 }
 
@@ -275,7 +282,7 @@ docstring const Inset::editMessage() const
 void Inset::cursorPos(BufferView const & /*bv*/, CursorSlice const &,
 		bool, int & x, int & y) const
 {
-	lyxerr << "Inset::cursorPos called directly" << std::endl;
+	LYXERR0("Inset::cursorPos called directly");
 	x = 100;
 	y = 100;
 }
@@ -330,7 +337,7 @@ void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
 }
 
 
-bool Inset::editing(BufferView * bv) const
+bool Inset::editing(BufferView const * bv) const
 {
 	return bv->cursor().isInside(this);
 }
@@ -375,7 +382,7 @@ ColorCode Inset::backgroundColor() const
 
 void Inset::setPosCache(PainterInfo const & pi, int x, int y) const
 {
-	//lyxerr << "Inset:: position cache to " << x << " " << y << std::endl;
+	//LYXERR("Inset: set position cache to " << x << " " << y);
 	pi.base.bv->coordCache().insets().add(this, x, y);
 }
 
@@ -390,7 +397,7 @@ Buffer const * Inset::updateFrontend() const
 {
 	if (quitting)
 		return 0;
-	return theApp()->gui().updateInset(this);
+	return theApp()->updateInset(this);
 }
 
 } // namespace lyx