static_cast-based key/mouse-state. Kill insetKeyPress.

[lyx.git] / src / insets / inseturl.C

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index 2be9d6d96f648a49064bb6dff13329412c6cdc61..4a61ad859380745ed08188f93af02a4550fb7fd8 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -7,9 +7,10 @@
 #include "inseturl.h"
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "debug.h"
 #include "frontends/Dialogs.h"
+#include "support/lstrings.h"
 #include "gettext.h"
 
 using std::ostream;
@@ -20,24 +21,24 @@ InsetUrl::InsetUrl(InsetCommandParams const & p, bool)
 {}
 
 
-void InsetUrl::edit(BufferView * bv, int, int, unsigned int)
+void InsetUrl::edit(BufferView * bv, int, int, mouse_button::state)
 {
-       bv->owner()->getDialogs()->showUrl( this );
+       bv->owner()->getDialogs()->showUrl(this);
 }
 
 
 void InsetUrl::edit(BufferView * bv, bool)
 {
-       edit(bv, 0, 0, 0);
+       edit(bv, 0, 0, mouse_button::none);
 }
 
 
 string const InsetUrl::getScreenLabel(Buffer const *) const
 {
        string temp;
-       if (getCmdName() == "url" )
+       if (getCmdName() == "url")
                temp = _("Url: ");
-       else 
+       else
                temp = _("HtmlUrl: ");
 
        if (!getOptions().empty())
@@ -83,8 +84,8 @@ int InsetUrl::linuxdoc(Buffer const *, ostream & os) const
 
 int InsetUrl::docbook(Buffer const *, ostream & os) const
 {
-       os << "<ulink url=\"" << getContents() << "\">"
-          << getOptions() << "</ulink>";
+       os << "<ulink url=\"" << subst(getContents(),"&","&amp;")
+          << "\">" << getOptions() << "</ulink>";
        return 0;
 }