pos=string::npos for regex not found, use handcoded transform in lstring.C, fix the...

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

diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h
index c995be0f54fe1cb3bc2c3ac2830516cfbc115f84..b7478a114faa08ec2f58fcb1e1e311d13bc0d534 100644 (file)
--- a/src/insets/inseturl.h
+++ b/src/insets/inseturl.h
@@ -1,15 +1,15 @@
 // -*- C++ -*-
 /* This file is part of*
- * ======================================================
+ * ====================================================== 
  *
  *           LyX, The Document Processor
  *      
  *         Copyright (C) 1997 LyX Team (this file was created this year)
  * 
- *======================================================*/
+ * ====================================================== */
 
-#ifndef _INSET_URL_H
-#define _INSET_URL_H
+#ifndef INSET_URL_H
+#define INSET_URL_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -17,12 +17,13 @@
 
 #include "insetcommand.h"
 #include "buffer.h"
+#include "form_url.h"
 
 struct LaTeXFeatures;
 
 /** The url inset  
  */
-class InsetUrl: public InsetCommand {
+class InsetUrl : public InsetCommand {
 public:
         ///
         enum Url_Flags {
@@ -33,17 +34,19 @@ public:
        };
        
        ///
-       InsetUrl(): InsetCommand("url"), form(0) { flag = InsetUrl::URL; }
+       InsetUrl() : InsetCommand("url"), fd_form_url(0) {
+               flag = InsetUrl::URL;
+       }
        ///
-       InsetUrl(LString const &);
+       InsetUrl(string const &);
        ///
-       InsetUrl(InsetCommand const&);
+       InsetUrl(InsetCommand const &);
        ///
-       InsetUrl(LString const &,LString const &,LString const &);
+       InsetUrl(string const &, string const &, string const &);
        ///
        ~InsetUrl();
         ///
-        Inset* Clone() { return new InsetUrl(getCommand()); }
+        Inset * Clone() const { return new InsetUrl(getCommand()); }
        ///
        Inset::Code LyxCode() const { return Inset::URL_CODE; }
        ///
@@ -55,38 +58,32 @@ public:
                return 1;
        }
        ///
-       char const* EditMessage() {return "Opened Url";}
+       char const * EditMessage() const {return _("Opened Url");}
         ///
-       bool Display() const { return false; }
+       bool display() const { return false; }
        ///
-       LString getScreenLabel() const;
+       string getScreenLabel() const;
        ///
-       InsetUrl::Url_Flags getFlag() { return flag; }
+       InsetUrl::Url_Flags getFlag() const { return flag; }
        ///
        void setFlag(InsetUrl::Url_Flags f) { flag = f; }
         ///
         void gotoLabel();
        ///
-       int Latex(FILE *file, signed char fragile);
+       int Latex(ostream &, signed char fragile);
+       ///
+       int Latex(string & file, signed char fragile);
        ///
-       int Latex(LString &file, signed char fragile);
+       int Linuxdoc(string & file);
        ///
-       int Linuxdoc(LString &file);
+       int DocBook(string & file);
        ///
-       int DocBook(LString &file);
+       static void CloseUrlCB(FL_OBJECT *, long data);
 private:
        ///
         Url_Flags flag;
        ///
-        FL_FORM *form;
-       ///
-       FL_OBJECT *url_name;
-       ///
-       FL_OBJECT *name_name;
-       ///
-       FL_OBJECT *radio_html;
-       ///
-       static void CloseUrlCB(FL_OBJECT *, long data);
+        FD_form_url * fd_form_url;
 };
 
 #endif