include shuffling and a mathed compile fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3182 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17e2f1d40cdd557c75714eb3c5ceca23454d8790..43f1bf43df7a7c835b28639680d21db205d500d7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,6 +9,7 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
+src/ext_l10n.h
 src/figure_form.C
 src/figureForm.C
 src/FontLoader.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 05b40ef781c48de9c51d230392d7f0d7452bfe16..2fad793b7bab3817cda0e9e9499d4b671c6bcb04 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -8,32 +8,35 @@
  *
  * ====================================================== */
 
-#include <fstream>
-#include <algorithm>
-
 #include <config.h>
 
 #include "BufferView.h"
 #include "buffer.h"
 #include "lyxcursor.h"
 #include "lyxtext.h"
-#include "insets/inseterror.h"
 #include "LyXView.h"
 #include "bufferlist.h"
-#include "support/FileInfo.h"
 #include "lyxscreen.h"
-#include "support/filetools.h"
-#include "frontends/Alert.h"
 #include "LaTeX.h"
 #include "BufferView_pimpl.h"
-#include "insets/insetcommand.h" //ChangeRefs
-#include "support/lyxfunctional.h" //equal_1st_in_pair
 #include "language.h"
 #include "gettext.h"
 #include "undo_funcs.h"
 #include "debug.h"
 #include "iterators.h"
 
+#include "frontends/Alert.h"
+
+#include "insets/insetcommand.h" //ChangeRefs
+#include "insets/inseterror.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h" //equal_1st_in_pair
+
+#include <fstream>
+#include <algorithm>
+
 extern BufferList bufferlist;
 
 using std::pair;

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 5c6b555f3a0c3923114f70182b53d262994740c2..49a805cf635e6eea2170cc5ea0fc61838b490a64 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -1,10 +1,5 @@
 #include <config.h>
 
-#include <ctime>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <locale.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -26,19 +21,20 @@
 #include "lyx_gui_misc.h"
 #include "lyxrc.h"
 #include "intl.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
+// added for Dispatch functions
+#include "lyx_cb.h"
+#include "lyx_main.h"
+#include "FloatList.h"
+#include "gettext.h"
+#include "ParagraphParameters.h"
+#include "undo_funcs.h"
+
 #include "frontends/Dialogs.h"
 #include "frontends/Alert.h"
+#include "frontends/FileDialog.h"
+
 #include "insets/insetbib.h"
 #include "insets/insettext.h"
-/// added for Dispatch functions
-#include "lyx_cb.h"
-#include "frontends/FileDialog.h"
-#include "lyx_main.h"
-#include "FloatList.h"
-#include "support/filetools.h"
-#include "support/lyxfunctional.h"
 #include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
@@ -63,11 +59,20 @@
 #include "insets/insetcaption.h"
 #include "insets/insetfloatlist.h"
 #include "insets/insetspecialchar.h"
-#include "gettext.h"
-#include "ParagraphParameters.h"
-#include "undo_funcs.h"
+
 #include "mathed/formulabase.h"
 
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+#include "support/filetools.h"
+#include "support/lyxfunctional.h"
+
+#include <ctime>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <locale.h>
+
+
 extern lyx::layout_type current_layout;
 
 using std::vector;

diff --git a/src/ChangeLog b/src/ChangeLog
index 723f071d5d83a7f25bf84d2be65b3c91824d2e56..d55f2671dc8e5c129d35af56aa7af8064aedcb71 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -28,7 +28,7 @@
 2001-12-08  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * buffer.C (insertErtContents): try to handle font and language
-       interaction a bit better.
+       interaction a bit better.g
 
        * ColorHandler.C (updateColor): change the hash to cover the whole
        LColor enum, ws cleanup

diff --git a/src/Chktex.C b/src/Chktex.C
index fbe1f047fcb7207f5acd38b81fc57068605b23ca..1193c7590a72eb39c9ba92f13ef25b3dd2c75a4b 100644 (file)
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -13,23 +13,24 @@
 
 #include <config.h>
 
-#include <fstream>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "Chktex.h"
 #include "LaTeX.h" // TeXErrors
-#include "support/filetools.h"
 #include "lyxlex.h"
-#include "support/FileInfo.h"
 #include "debug.h"
+#include "gettext.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
 #include "support/syscall.h"
 #include "support/syscontr.h"
 #include "support/path.h"
 #include "support/lstrings.h"
-#include "gettext.h"
+
+#include <fstream>
 
 using std::ifstream;
 using std::getline;

diff --git a/src/LyXView.C b/src/LyXView.C
index df55886c3e03d4981b026224b28c45edbd75afe1..97ab981e68bd215e78dda7eddb8353f351587a80 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -15,20 +15,13 @@
 #pragma implementation
 #endif
 
-#include <sys/time.h>
-#include <unistd.h>
-
 #include "LyXView.h"
 #include "minibuffer.h"
 #include "debug.h"
 #include "intl.h"
 #include "lyxrc.h"
-#include "support/filetools.h"        // OnlyFilename()
 #include "lyxtext.h"
 #include "buffer.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
 #include "MenuBackend.h"
 #include "lyx_gui_misc.h"      // [update,Close,Redraw]AllBufferRelatedDialogs
 #include "bufferview_funcs.h" // CurrentState()
@@ -36,6 +29,15 @@
 #include "lyxfunc.h"
 #include "BufferView.h"
 
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+
+#include "support/filetools.h"        // OnlyFilename()
+
+#include <sys/time.h>
+#include <unistd.h>
+
 using std::endl;
 using lyx::layout_type;
 

diff --git a/src/Painter.C b/src/Painter.C
index eac9623c3679c39edf8ba09dfec1b2f91f4e65a4..5015383c6028d3c15a2c1bb7a37f3f2d467fff04 100644 (file)
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -13,19 +13,10 @@
 #pragma implementation
 #endif
 
-#ifdef USE_STL_MEMORY
-#include <memory>
-#endif
-
-#include <cmath>
-
 #include "Painter.h"
 #include "LString.h"
 #include "debug.h"
 #include "lyxfont.h"
-#include "frontends/GUIRunTime.h"
-#include "support/LAssert.h"
-#include "support/lstrings.h"
 #include "WorkArea.h"
 #include "font.h"
 #include "ColorHandler.h"
@@ -33,8 +24,16 @@
 #include "encoding.h"
 #include "language.h"
 
+#include "frontends/GUIRunTime.h"
 #include "frontends/support/LyXImage.h"
 
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+
+#include <boost/smart_ptr.hpp>
+
+#include <cmath>
+
 using std::endl;
 using std::max;
 
@@ -45,7 +44,7 @@ Painter::Painter(WorkArea & wa)
 }
 
 
-/* Basic drawing routines */
+// Basic drawing routines
 
 PainterBase & Painter::point(int x, int y, LColor::color c)
 {
@@ -72,11 +71,8 @@ PainterBase & Painter::lines(int const * xp, int const * yp, int np,
                             enum line_style ls,
                             enum line_width lw)
 {
-#ifndef HAVE_AUTO_PTR
-       XPoint * points = new XPoint[np];
-#else
-       auto_ptr<XPoint> points(new Xpoint[np]);
-#endif
+       boost::scoped_array<XPoint> points(new XPoint[np]);
+
        for (int i = 0; i < np; ++i) {
                points[i].x = xp[i];
                points[i].y = yp[i];
@@ -84,11 +80,8 @@ PainterBase & Painter::lines(int const * xp, int const * yp, int np,
 
         XDrawLines(display, owner.getPixmap(),
                   lyxColorHandler->getGCLinepars(ls, lw, col), 
-                  points, np, CoordModeOrigin);
+                  points.get(), np, CoordModeOrigin);
 
-#ifndef HAVE_AUTO_PTR
-       delete[] points;
-#endif 
        return *this;
 }      
 
@@ -117,22 +110,17 @@ PainterBase & Painter::fillRectangle(int x, int y, int w, int h,
 PainterBase & Painter::fillPolygon(int const * xp, int const * yp, int np,
                               LColor::color col)
 {
-#ifndef HAVE_AUTO_PTR
-       XPoint * points = new XPoint[np];
-#else
-       auto_ptr<XPoint> points(new XPoint[np]);
-#endif
-       for (int i=0; i < np; ++i) {
+       boost::scoped_array<XPoint> points(new XPoint[np]);
+
+       for (int i = 0; i < np; ++i) {
                points[i].x = xp[i];
                points[i].y = yp[i];
        }
 
        XFillPolygon(display, owner.getPixmap(),
-                    lyxColorHandler->getGCForeground(col), points, np, 
+                    lyxColorHandler->getGCForeground(col), points.get(), np, 
                     Nonconvex, CoordModeOrigin);
-#ifndef HAVE_AUTO_PTR
-       delete[] points;
-#endif 
+
        return *this;
 }      
 
@@ -154,26 +142,22 @@ PainterBase & Painter::segments(int const * x1, int const * y1,
                            LColor::color col,
                            enum line_style ls, enum line_width lw)
 {
-#ifndef HAVE_AUTO_PTR
-       XSegment * s= new XSegment[ns];
-#else
-       auto_ptr<XSegment> s(new XSegment[ns]);
-#endif
-       for (int i=0; i<ns; ++i) {
+       boost::scoped_array<XSegment> s(new XSegment[ns]);
+
+       for (int i = 0; i < ns; ++i) {
                s[i].x1 = x1[i];
                s[i].y1 = y1[i];
                s[i].x2 = x2[i];
                s[i].y2 = y2[i];
        }
        XDrawSegments(display, owner.getPixmap(),
-                     lyxColorHandler->getGCLinepars(ls, lw, col), s, ns);
+                     lyxColorHandler->getGCLinepars(ls, lw, col),
+                     s.get(), ns);
 
-#ifndef HAVE_AUTO_PTR
-       delete [] s;
-#endif
        return *this;
 }
 
+
 PainterBase & Painter::pixmap(int x, int y, int w, int h, Pixmap bitmap)
 {
        XGCValues val;
@@ -186,6 +170,7 @@ PainterBase & Painter::pixmap(int x, int y, int w, int h, Pixmap bitmap)
        return *this;
 }
 
+
 PainterBase & Painter::image(int x, int y, int w, int h, LyXImage const * image)
 {
        Pixmap bitmap = image->getPixmap();
@@ -211,7 +196,7 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
                        LyXFont const & f)
 {
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
-               XChar2b * xs = new XChar2b[ls];
+               boost::scoped_array<XChar2b> xs(new XChar2b[ls]);
                Encoding const * encoding = f.language()->encoding();
                LyXFont font(f);
                if (f.isSymbolFont()) {
@@ -226,8 +211,7 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
                        xs[i].byte1 = c >> 8;
                        xs[i].byte2 = c & 0xff;
                }
-               text(x , y, xs, ls, font);
-               delete[] xs;
+               text(x , y, xs.get(), ls, font);
                return *this;
        }
 
@@ -238,10 +222,9 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
        } else {
                LyXFont smallfont(f);
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
-               char c;
                int tmpx = x;
                for (size_t i = 0; i < ls; ++i) {
-                       c = s[i];
+                       char c = s[i];
                        if (islower(static_cast<unsigned char>(c))) {
                                c = toupper(c);
                                lyxfont::XSetFont(display, gc, smallfont);
@@ -303,8 +286,8 @@ PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
 
 void Painter::underline(LyXFont const & f, int x, int y, int width)
 {
-       int below = max(lyxfont::maxDescent(f) / 2, 2);
-       int height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
+       int const below = max(lyxfont::maxDescent(f) / 2, 2);
+       int const height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
        if (height < 2)
                line(x, y + below, x + width, y + below, f.color());
        else

diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index d45b3d4fbbc9def050c65a305f381fce8c0aa491..a166de5ec54fef6e14e888187aed428e936d9300 100644 (file)
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -15,18 +15,24 @@ Thesaurus thesaurus;
 Thesaurus::ThesaurusEntry::ThesaurusEntry(string const & ent, char part)
        : entry(ent), pos(Thesaurus::NONE)
 {
-       if (part & AikSaurus::Unknown) pos |= OTHER;
-       if (part & AikSaurus::Other) pos |= OTHER;
-       if (part & AikSaurus::Noun) pos |= NOUN;
-       if (part & AikSaurus::Verb) pos |= VERB;
-       if (part & AikSaurus::Adjective) pos |= ADJECTIVE;
-       if (part & AikSaurus::Adverb) pos |= ADVERB;
+       if (part & AikSaurus::Unknown)
+               pos |= OTHER;
+       if (part & AikSaurus::Other)
+               pos |= OTHER;
+       if (part & AikSaurus::Noun)
+               pos |= NOUN;
+       if (part & AikSaurus::Verb)
+               pos |= VERB;
+       if (part & AikSaurus::Adjective)
+               pos |= ADJECTIVE;
+       if (part & AikSaurus::Adverb)
+               pos |= ADVERB;
 }
 
 
 Thesaurus::Thesaurus()
 {
-       aik_ = new AikSaurus();
+       aik_ = new AikSaurus;
 }
 
 
@@ -44,9 +50,8 @@ std::vector<Thesaurus::ThesaurusEntry> Thesaurus::lookup(string const & text)
                return entries;
 
        char pos;
-       string ret;
 
-       ret = aik_->next(pos);
+       string ret = aik_->next(pos);
        while (!ret.empty()) {
                entries.push_back(ThesaurusEntry(ret, pos));
                ret = aik_->next(pos);

diff --git a/src/WorkArea.C b/src/WorkArea.C
index c70a8c720c76ac02867508af9d4ea7bfd3fe9bf8..c3b0d5f0abc0f38b1d69f7d34f42a0109657b38d 100644 (file)
--- a/src/WorkArea.C
+++ b/src/WorkArea.C
@@ -9,25 +9,28 @@
  * ====================================================== */
 
 #include <config.h>
-#include <cmath>
-#include <cctype>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "WorkArea.h"
 #include "debug.h"
-#include "support/lstrings.h"
 #include "LyXView.h"
-#include "support/filetools.h" // LibFileSearch
 #include "lyxrc.h" // lyxrc.show_banner
 #include "version.h" // lyx_version
-#include "support/LAssert.h"
 
 #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
 #endif
 
+#include "support/filetools.h" // LibFileSearch
+#include "support/lstrings.h"
+#include "support/LAssert.h"
+
+#include <cmath>
+#include <cctype>
+
 using std::endl;
 
 FL_OBJECT * figinset_canvas;

diff --git a/src/buffer.C b/src/buffer.C
index b2c50a9d700b4e102365531708bbd63baa2493f3..48b3a755c0d1da2fb0a4dab7ed73f602d9ad166d 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -30,8 +30,25 @@
 #include "bufferview_funcs.h"
 #include "lyxfont.h"
 #include "version.h"
+#include "LaTeX.h"
+#include "Chktex.h"
+#include "LyXView.h"
+#include "debug.h"
+#include "LaTeXFeatures.h"
+#include "lyxtext.h"
+#include "gettext.h"
+#include "language.h"
+#include "encoding.h"
+#include "exporter.h"
+#include "Lsstream.h"
+#include "converter.h"
+#include "BufferView.h"
+#include "ParagraphParameters.h"
+#include "iterators.h"
+
 #include "mathed/formulamacro.h"
 #include "mathed/formula.h"
+
 #include "insets/inset.h"
 #include "insets/inseterror.h"
 #include "insets/insetlabel.h"
@@ -63,37 +80,25 @@
 #endif
 #include "insets/insetcaption.h"
 #include "insets/insetfloatlist.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/Alert.h"
+
 #include "support/textutils.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/os.h"
-#include "LaTeX.h"
-#include "Chktex.h"
-#include "LyXView.h"
-#include "debug.h"
-#include "LaTeXFeatures.h"
 #include "support/syscall.h"
 #include "support/lyxlib.h"
 #include "support/FileInfo.h"
 #include "support/lyxmanip.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "language.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Alert.h"
-#include "encoding.h"
-#include "exporter.h"
-#include "Lsstream.h"
-#include "converter.h"
-#include "BufferView.h"
-#include "ParagraphParameters.h"
-#include "iterators.h"
 
 #include <fstream>
 #include <iomanip>
 #include <map>
 #include <stack>
 #include <list>
+#include <algorithm>
 
 #include <cstdlib>
 #include <cmath>
@@ -101,7 +106,6 @@
 #include <sys/types.h>
 #include <utime.h>
 
-#include <algorithm>
 
 #ifdef HAVE_LOCALE
 #include <locale>

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 41327e41ecfecbfb67b30241cd611235e121ba6d..8455604fe9570b6e97f2eafb13e7084349f31c41 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -12,24 +12,14 @@
  * ====================================================== 
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-
-#include <assert.h>
-#include <algorithm>
-#include <functional>
-
-#include "frontends/Alert.h"
 #include "bufferlist.h"
 #include "lyx_main.h"
-#include "support/FileInfo.h"
-#include "support/filetools.h"
-#include "support/lyxmanip.h"
-#include "support/lyxfunctional.h"
-#include "support/LAssert.h"
 #include "lyx_gui_misc.h"
 #include "lastfiles.h"
 #include "debug.h"
@@ -43,6 +33,19 @@
 #include "vc-backend.h"
 #include "TextCache.h"
 
+#include "frontends/Alert.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxmanip.h"
+#include "support/lyxfunctional.h"
+#include "support/LAssert.h"
+
+#include <assert.h>
+#include <algorithm>
+#include <functional>
+
+
 using std::vector;
 using std::find;
 using std::endl;

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 72b5f6d95dfba2540fae028dcae7e9487607c18f..1c0fceb1fe3e27ff90ab782fed443a6dc23fda44 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -10,26 +10,13 @@
 
 #include <config.h>
 
-#include "Lsstream.h"
-
-#include <ctime>
-#include <clocale>
-
-#include <utility> 
-#include <algorithm> 
-
-#include <cstdlib>
-#include <cctype>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include "support/lyxalgo.h"
-#include "support/LAssert.h"
+#include "lyxfunc.h"
 #include "version.h"
 #include "kbmap.h"
-#include "lyxfunc.h"
 #include "lyxrow.h"
 #include "bufferlist.h"
 #include "BufferView.h"
@@ -39,6 +26,30 @@
 #include "lyx_main.h"
 #include "lyx_cb.h"
 #include "LyXAction.h"
+#include "debug.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
+#include "gettext.h"
+#include "Lsstream.h"
+#include "trans_mgr.h"
+#include "layout.h"
+#include "WorkArea.h"
+#include "bufferview_funcs.h"
+#include "minibuffer.h"
+#include "vspace.h"
+#include "LyXView.h"
+#include "lyx_gui_misc.h"
+#include "FloatList.h"
+#include "converter.h"
+#include "exporter.h"
+#include "importer.h"
+#include "FontLoader.h"
+#include "TextCache.h"
+#include "lyxfind.h"
+#include "undo_funcs.h"
+#include "ParagraphParameters.h"
+#include "figureForm.h"
+
 #include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
@@ -62,42 +73,34 @@
 #endif
 #include "insets/insettabular.h"
 #include "insets/insetcaption.h"
+
 #include "mathed/formulamacro.h"
 #include "mathed/math_cursor.h"
 #include "mathed/math_inset.h"
-#include "minibuffer.h"
-#include "vspace.h"
-#include "LyXView.h"
-#include "lyx_gui_misc.h"
+
+#include "frontends/FileDialog.h"
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+#include "frontends/Alert.h"
+
+#include "support/lyxalgo.h"
+#include "support/LAssert.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
 #include "support/syscall.h"
 #include "support/lstrings.h"
 #include "support/path.h"
 #include "support/lyxfunctional.h"
-#include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "gettext.h"
-#include "trans_mgr.h"
-#include "layout.h"
-#include "WorkArea.h"
-#include "bufferview_funcs.h"
-#include "frontends/FileDialog.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
-#include "frontends/Alert.h"
-#include "FloatList.h"
-#include "converter.h"
-#include "exporter.h"
-#include "importer.h"
-#include "FontLoader.h"
-#include "TextCache.h"
-#include "lyxfind.h"
-#include "undo_funcs.h"
-#include "ParagraphParameters.h"
-#include "figureForm.h"
+
+#include <ctime>
+#include <clocale>
+#include <cstdlib>
+#include <cctype>
+
+#include <utility> 
+#include <algorithm> 
+
 
 using std::pair;
 using std::make_pair; 

diff --git a/src/mathed/math_iterator.C b/src/mathed/math_iterator.C
index c0841de2bd1cc9f9fc5f32107b136b71f45447ec..ca65d4a3403fa5ef11f58e37fa8663d8ecf60188 100644 (file)
--- a/src/mathed/math_iterator.C
+++ b/src/mathed/math_iterator.C
@@ -63,7 +63,7 @@ MathAtom * MathIterator::nextInset() const
 {
        if (position().pos_ == xcell().data_.size())
                return 0;
-       return const_cast<MathAtom *>(xcell().begin() + position().pos_);
+       return const_cast<MathAtom *>(&*(xcell().begin() + position().pos_));
 }
 
 

diff --git a/src/mathed/math_iterator.h b/src/mathed/math_iterator.h
index e351080906326e0f94aaa3c00ae2bfd347899d96..9f721b7f02ecf6d985d7d7d1f124ae580d597b25 100644 (file)
--- a/src/mathed/math_iterator.h
+++ b/src/mathed/math_iterator.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 #ifndef MATH_ITERATOR_H
 #define MATH_ITERATOR_H
 

diff --git a/src/text2.C b/src/text2.C
index 019f7b891cfdb18d73a8994bbbdac5df0b83ded2..4ddf68cae9e2b6fe881073596a901347c4e79ba8 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -17,15 +17,8 @@
 #include "lyxtext.h"
 #include "LString.h"
 #include "paragraph.h"
-#include "insets/inseterror.h"
-#include "insets/insetbib.h"
-#include "insets/insetspecialchar.h"
-#include "insets/insettext.h"
-#include "insets/insetfloat.h"
 #include "layout.h"
 #include "LyXView.h"
-#include "support/textutils.h"
-#include "support/lstrings.h"
 #include "undo_funcs.h"
 #include "buffer.h"
 #include "bufferparams.h"
@@ -42,7 +35,16 @@
 #include "FloatList.h"
 #include "language.h"
 #include "ParagraphParameters.h"
+
+#include "insets/inseterror.h"
+#include "insets/insetbib.h"
+#include "insets/insetspecialchar.h"
+#include "insets/insettext.h"
+#include "insets/insetfloat.h"
+
 #include "support/LAssert.h"
+#include "support/textutils.h"
+#include "support/lstrings.h"
 
 using std::copy;
 using std::find;