following rev. 18724 boost/signal is not needed.

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

diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index f2be434e9ba9d4287342ef1b3a1af08dfa5f9cb7..d3a6cb3a258764d1ca3f6539eb6fe29c44367107 100644 (file)
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -17,20 +17,20 @@
 #include "insets/RenderGraphic.h"
 #include "insets/RenderPreview.h"
 
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "Cursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "exporter.h"
+#include "DispatchResult.h"
+#include "Exporter.h"
 #include "FuncStatus.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyx_main.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyX.h"
+#include "Lexer.h"
+#include "LyXRC.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 
 #include "graphics/PreviewLoader.h"
 
@@ -38,7 +38,7 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/convert.h"
-#include "support/translator.h"
+#include "support/Translator.h"
 
 #include <boost/bind.hpp>
 
@@ -239,7 +239,7 @@ void InsetExternalParams::write(Buffer const & buffer, ostream & os) const
 }
 
 
-bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
+bool InsetExternalParams::read(Buffer const & buffer, Lexer & lex)
 {
        enum ExternalTags {
                EX_TEMPLATE = 1,
@@ -277,7 +277,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
                { "width",           EX_WIDTH }
        };
 
-       pushpophelper pph(lex, external_tags, EX_END);
+       PushPopHelper pph(lex, external_tags, EX_END);
 
        bool found_end  = false;
        bool read_error = false;
@@ -337,7 +337,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
                case EX_HEIGHT:
                        lex.next();
-                       resizedata.height = LyXLength(lex.getString());
+                       resizedata.height = Length(lex.getString());
                        break;
 
                case EX_KEEPASPECTRATIO:
@@ -361,7 +361,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
                case EX_WIDTH:
                        lex.next();
-                       resizedata.width = LyXLength(lex.getString());
+                       resizedata.width = Length(lex.getString());
                        break;
 
                case EX_END:
@@ -400,16 +400,16 @@ InsetExternal::InsetExternal()
 
 
 InsetExternal::InsetExternal(InsetExternal const & other)
-       : InsetOld(other),
+       : Inset(other),
          boost::signals::trackable(),
          params_(other.params_),
          renderer_(other.renderer_->clone(this))
 {}
 
 
-auto_ptr<InsetBase> InsetExternal::doClone() const
+auto_ptr<Inset> InsetExternal::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetExternal(*this));
+       return auto_ptr<Inset>(new InsetExternal(*this));
 }
 
 
@@ -425,7 +425,7 @@ void InsetExternal::statusChanged() const
 }
 
 
-void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetExternal::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -450,16 +450,17 @@ void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_MOUSE_RELEASE:
-               InsetExternalMailer(*this).showDialog(&cur.bv());
+               if (!cur.selection())
+                       InsetExternalMailer(*this).showDialog(&cur.bv());
                break;
 
        default:
-               InsetBase::doDispatch(cur, cmd);
+               Inset::doDispatch(cur, cmd);
        }
 }
 
 
-bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetExternal::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
@@ -471,12 +472,12 @@ bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetBase::getStatus(cur, cmd, flag);
+               return Inset::getStatus(cur, cmd, flag);
        }
 }
 
 
-void InsetExternal::edit(LCursor & cur, bool)
+void InsetExternal::edit(Cursor & cur, bool)
 {
        InsetExternalMailer(*this).showDialog(&cur.bv());
 }
@@ -665,7 +666,7 @@ void InsetExternal::write(Buffer const & buffer, ostream & os) const
 }
 
 
-void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
+void InsetExternal::read(Buffer const & buffer, Lexer & lex)
 {
        InsetExternalParams params;
        if (params.read(buffer, lex))
@@ -674,7 +675,7 @@ void InsetExternal::read(Buffer const & buffer, LyXLex & lex)
 
 
 int InsetExternal::latex(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
        if (params_.draft) {
                // FIXME UNICODE
@@ -705,37 +706,37 @@ int InsetExternal::latex(Buffer const & buf, odocstream & os,
 
                if (cit != et.formats.end()) {
                        return external::writeExternal(params_, "PDFLaTeX",
-                                                       buf, os,
-                                                       *(runparams.exportdata),
-                                                       external_in_tmpdir,
-                                                       dryrun);
-                }
+                                                      buf, os,
+                                                      *(runparams.exportdata),
+                                                      external_in_tmpdir,
+                                                      dryrun);
+               }
        }
 
        return external::writeExternal(params_, "LaTeX", buf, os,
-                                       *(runparams.exportdata),
-                                       external_in_tmpdir,
-                                       dryrun);
+                                      *(runparams.exportdata),
+                                      external_in_tmpdir,
+                                      dryrun);
 }
 
 
 int InsetExternal::plaintext(Buffer const & buf, odocstream & os,
-                             OutputParams const & runparams) const
+                            OutputParams const & runparams) const
 {
        os << '\n'; // output external material on a new line
        external::writeExternal(params_, "Ascii", buf, os,
-                               *(runparams.exportdata), false,
-                               runparams.dryrun || runparams.inComment);
+                               *(runparams.exportdata), false,
+                               runparams.dryrun || runparams.inComment);
        return PLAINTEXT_NEWLINE;
 }
 
 
 int InsetExternal::docbook(Buffer const & buf, odocstream & os,
-                           OutputParams const & runparams) const
+                          OutputParams const & runparams) const
 {
        return external::writeExternal(params_, "DocBook", buf, os,
                                       *(runparams.exportdata), false,
-                                      runparams.dryrun || runparams.inComment);
+                                      runparams.dryrun || runparams.inComment);
 }
 
 
@@ -868,7 +869,7 @@ void InsetExternalMailer::string2params(string const & in,
                return;
 
        istringstream data(in);
-       LyXLex lex(0,0);
+       Lexer lex(0,0);
        lex.setStream(data);
 
        string name;
@@ -877,7 +878,7 @@ void InsetExternalMailer::string2params(string const & in,
                return print_mailer_error("InsetExternalMailer", in, 1, name_);
 
        // This is part of the inset proper that is usually swallowed
-       // by LyXText::readInset
+       // by Text::readInset
        string id;
        lex >> id;
        if (!lex || id != "External")