Fix event loop to no longer eat CPU

[lyx.git] / src / mathed / math_xyarrowinset.C

diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/math_xyarrowinset.C
index e9d9bcdf5c19fbb855d43aa34ba94bf138893d85..bb16eb90dd83e914f37639eaeeee9e814b3034e0 100644 (file)
--- a/src/mathed/math_xyarrowinset.C
+++ b/src/mathed/math_xyarrowinset.C
@@ -1,11 +1,16 @@
-#include <config.h>
+/**
+ * \file math_xyarrowinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_xyarrowinset.h"
-#include "math_xymatrixinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
@@ -21,9 +26,9 @@ MathXYArrowInset::MathXYArrowInset()
 {}
 
 
-MathInset * MathXYArrowInset::clone() const
+std::auto_ptr<InsetBase> MathXYArrowInset::clone() const
 {
-       return new MathXYArrowInset(*this);
+       return std::auto_ptr<InsetBase>(new MathXYArrowInset(*this));
 }
 
 
@@ -35,7 +40,7 @@ MathXYMatrixInset const * MathXYArrowInset::targetMatrix() const
 
 MathArray const & MathXYArrowInset::targetCell() const
 {
-#if 0  
+#if 0
        MathXYMatrixInset const * p = targetMatrix();
        int x = 0;
        int y = 0;
@@ -48,14 +53,14 @@ MathArray const & MathXYArrowInset::targetCell() const
                        case 'd': ++y; break;
                }
        }
-       //lyxerr << "target: x: " << x << " y: " << y << "\n";
+       //lyxerr << "target: x: " << x << " y: " << y << endl;
        MathInset::idx_type n = mi_.idx + p->ncols() * y + x;
        if (n >= p->nargs()) {
-               lyxerr << "source: n: " << mi_.idx << "\n";
-               lyxerr << "target: n: " << n << " out of range\n";
+               lyxerr << "source: n: " << mi_.idx << "\n"
+                      << "target: n: " << n << " out of range" << endl;
                n = 0;
        }
-  return p->cell(n);
+       return p->cell(n);
 #else
        static MathArray dummy;
        return dummy;
@@ -66,7 +71,7 @@ MathArray const & MathXYArrowInset::targetCell() const
 MathArray const & MathXYArrowInset::sourceCell() const
 {
 #if 0
-  return targetMatrix()->cell(mi_.idx);
+       return targetMatrix()->cell(mi_.idx);
 #else
        static MathArray dummy;
        return dummy;
@@ -74,11 +79,11 @@ MathArray const & MathXYArrowInset::sourceCell() const
 }
 
 
-void MathXYArrowInset::metrics(MathMetricsInfo & mi) const
+void MathXYArrowInset::metrics(MetricsInfo & mi) const
 {
        MathNestInset::metrics(mi);
        mi_   = mi;
-       MathFontSetChanger dummy(mi.base, "textrm");
+       FontSetChanger dummy(mi.base, "textrm");
 #if 0
        target_ = mi.inset ? mi.inset->asXYMatrixInset() : 0;
 
@@ -97,10 +102,10 @@ void MathXYArrowInset::metrics(MathMetricsInfo & mi) const
 }
 
 
-void MathXYArrowInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathXYArrowInset::draw(PainterInfo & pi, int x, int y) const
 {
        metrics(mi_);
-       MathFontSetChanger dummy(pi.base, "textrm");
+       FontSetChanger dummy(pi.base, "textrm");
 
        if (editing()) {
 
@@ -112,18 +117,18 @@ void MathXYArrowInset::draw(MathPainterInfo & pi, int x, int y) const
                mathed_string_dim(pi.base.font, "target: ", lasc, ldes, lwid);
 
                cell(0).draw(pi, x + lwid, y);
-               drawStr(pi, pi.base.font, x + 3, y, "target");
+               pi.base.text(x + 3, y, "target");
                y += max(cell(0).descent(), ldes) + 5;
 
                y += max(cell(1).ascent(), lasc) + 5;
                cell(1).draw(pi, x + lwid, y);
-               drawStr(pi, pi.base.font, x + 3, y, "label");
+               pi.base.text(x + 3, y, "label");
 
 #endif
 
        } else {
 
-               drawStr(pi, font_, x, y, "X");
+               pi.pain.text(x, y, "X");
                MathArray const & s = sourceCell();
                MathArray const & t = targetCell();
                pi.pain.line(s.xm(), s.ym(), t.xm(), t.ym(), LColor::math);
@@ -137,9 +142,9 @@ void MathXYArrowInset::write(WriteStream & os) const
 {
        os << "\\ar";
        if (cell(0).size())
-               os << "[" << cell(0) << "]";
+               os << '[' << cell(0) << ']';
        if (cell(1).size())
-               os << (up_ ? "^" : "_") << "{" << cell(1) << "}";
+               os << (up_ ? '^' : '_') << '{' << cell(1) << '}';
        os << " ";
 }
 
@@ -148,5 +153,5 @@ void MathXYArrowInset::normalize(NormalStream & os) const
 {
        os << "[xyarrow ";
        MathNestInset::normalize(os);
-       os << "]";
+       os << ']';
 }