cosmetics. mainly replace #include "dostring.h" by #include "strfwd.h"

[lyx.git] / src / insets / Inset.cpp

diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 1876f5ec3fb05ca549a3360307758eddce5266d6..10a2e04ebc65d56ea15a4bc9dbd89734fb5ecaed 100644 (file)
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -19,7 +19,6 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "Color.h"
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "debug.h"
@@ -63,8 +62,7 @@ static TranslatorMap const build_translator()
                InsetName("toc", TOC_CODE),
                InsetName("quote", QUOTE_CODE),
                InsetName("ref", REF_CODE),
-               InsetName("url", URL_CODE),
-               InsetName("htmlurl", HTMLURL_CODE),
+               InsetName("href", HYPERLINK_CODE),
                InsetName("separator", SEPARATOR_CODE),
                InsetName("ending", ENDING_CODE),
                InsetName("label", LABEL_CODE),
@@ -104,6 +102,8 @@ static TranslatorMap const build_translator()
                InsetName("mathmacroarg", MATHMACROARG_CODE),
                InsetName("listings", LISTINGS_CODE),
                InsetName("info", INFO_CODE),
+               InsetName("collapsable", COLLAPSABLE_CODE),
+               InsetName("pagebreak", PAGEBREAK_CODE),
        };
 
        std::size_t const insetnames_size =
@@ -119,8 +119,10 @@ static TranslatorMap const build_translator()
 }
 
 
-Inset::Inset()
-{}
+docstring Inset::name() const
+{
+       return from_ascii("unknown");
+}
 
 
 Dimension const Inset::dimension(BufferView const & bv) const
@@ -138,6 +140,20 @@ InsetCode insetCode(std::string const & name)
 }
 
 
+std::string insetName(InsetCode c) 
+{
+       static TranslatorMap const translator = build_translator();
+
+       TranslatorMap::const_iterator it =  translator.begin();
+       TranslatorMap::const_iterator end = translator.end();
+       for (; it != end; ++it) {
+               if (it->second == c)
+                       return it->first;
+       }
+       return std::string();
+}
+
+
 void Inset::dispatch(Cursor & cur, FuncRequest & cmd)
 {
        cur.updateFlags(Update::Force | Update::FitCursor);
@@ -282,8 +298,8 @@ void Inset::metricsMarkers2(Dimension & dim, int framesize) const
 
 void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 {
-       Color::color pen_color = mouseHovered() || editing(pi.base.bv)?
-               Color::mathframe : Color::mathcorners;
+       ColorCode pen_color = mouseHovered() || editing(pi.base.bv)?
+               Color_mathframe : Color_mathcorners;
 
        Dimension const dim = dimension(*pi.base.bv);
 
@@ -299,8 +315,8 @@ void Inset::drawMarkers(PainterInfo & pi, int x, int y) const
 
 void Inset::drawMarkers2(PainterInfo & pi, int x, int y) const
 {
-       Color::color pen_color = mouseHovered() || editing(pi.base.bv)?
-               Color::mathframe : Color::mathcorners;
+       ColorCode pen_color = mouseHovered() || editing(pi.base.bv)?
+               Color_mathframe : Color_mathcorners;
 
        drawMarkers(pi, x, y);
        Dimension const dim = dimension(*pi.base.bv);
@@ -351,9 +367,9 @@ void Inset::dump() const
 }
 
 
-Color_color Inset::backgroundColor() const
+ColorCode Inset::backgroundColor() const
 {
-       return Color::background;
+       return Color_background;
 }