adjust

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

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 878b73f41d3bbd06f2df29e5ad8e31fa4d7358e9..0ff7091d880ebd83d9c4afea1ce46aaee9ab849c 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -231,7 +231,6 @@ string const fixlabel(string const & str)
 #endif
 }
 
-} // namespace anon
 
 
 void add_toc2(int menu, string const & extra_label,
@@ -318,6 +317,7 @@ void add_toc2(int menu, string const & extra_label,
        }
 }
 
+} // namespace anon
 
 void Menubar::Pimpl::add_toc(int menu, string const & extra_label,
                             vector<int> & smn, Window win)

diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C
index e356bbaeb5d53869063ea4bc1c6ff6aba1d1362f..dae43e651a1b96de5b3b063b6cec93d846436763 100644 (file)
--- a/src/frontends/xforms/Toolbar_pimpl.C
+++ b/src/frontends/xforms/Toolbar_pimpl.C
@@ -392,7 +392,7 @@ void Toolbar::Pimpl::set(bool doingmain)
 
                        // Set the tooltip
 #if FL_REVISION >= 89
-                       string help = _(lyxaction.helpText(item->action));
+                       string const help(_(lyxaction.helpText(item->action)));
                        fl_set_object_helper(obj, help.c_str());        
 #else
                        fl_set_object_posthandler(obj, C_Toolbar_BubblePost);

diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index 701356141938598a09c88c223694da0a952385dc..839a50acfdd5c3430528b1e1bc822bf6f95f5f48 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -130,7 +130,7 @@ bool XformsColor::read(string const & filename)
        if (!lexrc.setFile(filename))
                return false;
 
-       while (lexrc.IsOK()) {
+       while (lexrc.isOK()) {
                int const le = lexrc.lex();
 
                switch (le) {
@@ -145,13 +145,13 @@ bool XformsColor::read(string const & filename)
                RGBColor col;
 
                if (!lexrc.next()) break;
-               col.r = lexrc.GetInteger();
+               col.r = lexrc.getInteger();
 
                if (!lexrc.next()) break;
-               col.g = lexrc.GetInteger();
+               col.g = lexrc.getInteger();
 
                if (!lexrc.next()) break;
-               col.b = lexrc.GetInteger();
+               col.b = lexrc.getInteger();
 
                fl_mapcolor(le, col.r, col.g, col.b);
        }

diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 377429edcd833a51a28a4453fa391dcda0e82620..5e8252b4bc63ff3be3985187ce9acaf2d3abfe66 100644 (file)
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -163,11 +163,11 @@ void ExternalTemplateManager::readTemplates(string const & path)
                return;
        }
        
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                switch (lex.lex()) {
                case TM_TEMPLATE: {
                        lex.next();
-                       string temp = lex.GetString();
+                       string const temp = lex.getString();
                        ExternalTemplate & tmp = templates[temp];
                        tmp.lyxName = temp;
                        tmp.readTemplate(lex);
@@ -208,11 +208,11 @@ void ExternalTemplate::readTemplate(LyXLex & lex)
 
        pushpophelper pph(lex, templateoptiontags, TO_END);
        
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                switch (lex.lex()) {
                case TO_GUINAME:
                        lex.next(true);
-                       guiName = lex.GetString();
+                       guiName = lex.getString();
                        break;
                        
                case TO_HELPTEXT:
@@ -221,12 +221,12 @@ void ExternalTemplate::readTemplate(LyXLex & lex)
                        
                case TO_FILTER:
                        lex.next(true);
-                       fileRegExp = lex.GetString();
+                       fileRegExp = lex.getString();
                        break;
                        
                case TO_VIEWCMD:
                        lex.next(true);
-                       viewCommand = lex.GetString();
+                       viewCommand = lex.getString();
                        // For security reasons, a command may not be empty!
                        if (viewCommand.empty())
                                viewCommand = "true";
@@ -234,7 +234,7 @@ void ExternalTemplate::readTemplate(LyXLex & lex)
                        
                case TO_EDITCMD:
                        lex.next(true);
-                       editCommand = lex.GetString();
+                       editCommand = lex.getString();
                        // For security reasons, a command may not be empty!
                        if (editCommand.empty())
                                editCommand = "true";
@@ -242,12 +242,12 @@ void ExternalTemplate::readTemplate(LyXLex & lex)
                        
                case TO_AUTOMATIC:
                        lex.next();
-                       automaticProduction = lex.GetBool();
+                       automaticProduction = lex.getBool();
                        break;
                        
                case TO_FORMAT:
                        lex.next(true);
-                       formats[lex.GetString()].readFormat(lex);
+                       formats[lex.getString()].readFormat(lex);
                        break;
                        
                case TO_END:
@@ -283,16 +283,16 @@ void ExternalTemplate::FormatTemplate::readFormat(LyXLex & lex)
 
        pushpophelper pph(lex, formattags, FO_END);
        
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                switch (lex.lex()) {
                case FO_PRODUCT:
                        lex.next(true);
-                       product = lex.GetString();
+                       product = lex.getString();
                        break;
                        
                case FO_UPDATECMD:
                        lex.next(true);
-                       updateCommand = lex.GetString();
+                       updateCommand = lex.getString();
                        // For security reasons, a command may not be empty!
                        if (updateCommand.empty())
                                updateCommand = "true";
@@ -300,7 +300,7 @@ void ExternalTemplate::FormatTemplate::readFormat(LyXLex & lex)
                        
                case FO_REQUIREMENT:
                        lex.next(true);
-                       requirement = lex.GetString();
+                       requirement = lex.getString();
                        break;
                        
                case FO_PREAMBLE:

diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index 7dfc447e131c3f238a4278cb1dcfec7da2c66fe2..96ccb14f20d72afdfec674a7fe807d51bfdb6099 100644 (file)
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -1074,10 +1074,10 @@ void InsetFig::read(Buffer const *, LyXLex & lex)
        string buf;
        bool finished = false;
        
-       while (lex.IsOK() && !finished) {
+       while (lex.isOK() && !finished) {
                lex.next();
 
-               string const token = lex.GetString();
+               string const token = lex.getString();
                lyxerr[Debug::INFO] << "Token: " << token << endl;
                
                if (token.empty())
@@ -1086,8 +1086,8 @@ void InsetFig::read(Buffer const *, LyXLex & lex)
                        finished = true;
                } else if (token == "file") {
                        if (lex.next()) {
-                               buf = lex.GetString();
-                               string buf1 = OnlyPath(owner->fileName());
+                               buf = lex.getString();
+                               string const buf1(OnlyPath(owner->fileName()));
                                fname = MakeAbsPath(buf, buf1);
                                changedfname = true;
                        }
@@ -1095,30 +1095,30 @@ void InsetFig::read(Buffer const *, LyXLex & lex)
                        if (lex.next());
                        // kept for backwards compability. Delete in 0.13.x
                } else if (token == "subcaption") {
-                       if (lex.EatLine())
-                               subcaption = lex.GetString();
+                       if (lex.eatLine())
+                               subcaption = lex.getString();
                } else if (token == "label") {
                        if (lex.next());
                        // kept for backwards compability. Delete in 0.13.x
                } else if (token == "angle") {
                        if (lex.next())
-                               angle = lex.GetFloat();
+                               angle = lex.getFloat();
                } else if (token == "size") {
                        if (lex.next())
-                               wid = lex.GetInteger();
+                               wid = lex.getInteger();
                        if (lex.next())
-                               hgh = lex.GetInteger();
+                               hgh = lex.getInteger();
                } else if (token == "flags") {
                        if (lex.next())
-                               flags = pflags = lex.GetInteger();
+                               flags = pflags = lex.getInteger();
                } else if (token == "subfigure") {
                        subfigure = psubfigure = true;
                } else if (token == "width") {
                        int typ = 0;
                        if (lex.next())
-                               typ = lex.GetInteger();
+                               typ = lex.getInteger();
                        if (lex.next())
-                               xwid = lex.GetFloat();
+                               xwid = lex.getFloat();
                        switch (typ) {
                        case DEF: wtype = DEF; break;
                        case CM: wtype = CM; break;
@@ -1133,9 +1133,9 @@ void InsetFig::read(Buffer const *, LyXLex & lex)
                } else if (token == "height") {
                        int typ = 0;
                        if (lex.next())
-                               typ = lex.GetInteger();
+                               typ = lex.getInteger();
                        if (lex.next())
-                               xhgh = lex.GetFloat();
+                               xhgh = lex.getFloat();
                        switch (typ) {
                        case DEF: htype = DEF; break;
                        case CM: htype = CM; break;

diff --git a/src/insets/inset.h b/src/insets/inset.h
index 230b0f5c38bba8b0e0fb3d9f9b7ed1d3f8881533..c301ca901adcc4f5c355ed7375d9eddfe0167d1e 100644 (file)
--- a/src/insets/inset.h
+++ b/src/insets/inset.h
@@ -148,10 +148,6 @@ public:
        /// update the inset representation
        virtual void update(BufferView *, LyXFont const &, bool = false)
                {}
-#if 0
-       ///
-       virtual LyXFont const convertFont(LyXFont const & font) const;
-#endif
        /// what appears in the minibuffer when opening
        virtual string const editMessage() const;
        ///

diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C
index 81a73e5938c9cc9660eb78dc9d403e931b4bbbdb..044431ded0c4dce9c78867d38fe8069652f2f9f0 100644 (file)
--- a/src/insets/insetbib.C
+++ b/src/insets/insetbib.C
@@ -79,14 +79,13 @@ void InsetBibKey::write(Buffer const *, ostream & os) const
 // This is necessary here because this is written without begin_inset
 // This should be changed!!! (Jug)
 void InsetBibKey::read(Buffer const *, LyXLex & lex)
-{    
-       string token;
-
-       if (lex.EatLine()) {
-               token = lex.GetString();
+{
+       if (lex.eatLine()) {
+               string const token = lex.getString();
                scanCommand(token);
-       } else
+       } else {
                lex.printError("InsetCommand: Parse error: `$$Token'");
+       }
 
        if (prefixIs(getContents(), key_prefix)) {
                int key = strToInt(getContents().substr(key_prefix.length()));

diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C
index beb5728367899f973eae4977e676edc6fef5faef..c08039052689cd6867b344d7d2767c5923fa5a86 100644 (file)
--- a/src/insets/insetcollapsable.C
+++ b/src/insets/insetcollapsable.C
@@ -87,12 +87,12 @@ void InsetCollapsable::write(Buffer const * buf, ostream & os) const
 
 void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
 {
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "collapsed") {
                        lex.next();
-                       collapsed_ = lex.GetBool();
+                       collapsed_ = lex.getBool();
                } else {
                        lyxerr << "InsetCollapsable::Read: Missing collapsed!"
                               << endl;

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index dba48236cdb414d3dbeb170dcc02b122a0d95018..9d10720328abb6da9a5bbf5996fc1ee19f5e49fb 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -144,14 +144,16 @@ void InsetCommandParams::read(LyXLex & lex)
 {    
        string token;
 
-       if (lex.EatLine()) {
-               token = lex.GetString();
+       if (lex.eatLine()) {
+               token = lex.getString();
                scanCommand(token);
-       } else
+       } else {
                lex.printError("InsetCommand: Parse error: `$$Token'");
-       while (lex.IsOK()) {
+       }
+       
+       while (lex.isOK()) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
                if (token == "\\end_inset")
                        break;
        }

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 5c27bdd83fb752506dccef30320d9c30e6054e29..cc1ea5ba3ced5ca192dded39962137738a777e60 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -91,32 +91,37 @@ InsetERT::~InsetERT()
 void InsetERT::read(Buffer const * buf, LyXLex & lex)
 {
        bool token_found = false;
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "status") {
                        lex.next();
-                       string st;
-                       if (lex.GetString() == "Inlined")
+                       string const tmp_token = lex.getString();
+                       
+                       if (tmp_token == "Inlined") {
                                status_ = Inlined;
-                       else if (lex.GetString() == "Collapsed")
+                       } else if (tmp_token == "Collapsed") {
                                status_ = Collapsed;
-                       else // leave this as default!
+                       } else {
+                               // leave this as default!
                                status_ = Open;
+                       }
+                       
                        token_found = true;
                } else {
                        lyxerr << "InsetERT::Read: Missing 'status'-tag!"
-                                  << endl;
+                                  << std::endl;
                        // take countermeasures
                        lex.pushToken(token);
                }
        }
        InsetCollapsable::read(buf, lex);
        if (!token_found) {
-               if (collapsed_)
+               if (collapsed_) {
                        status_ = Collapsed;
-               else
+               } else {
                        status_ = Open;
+               }
        }
        setButtonLabel();
 }

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index cfa91cfe3f13cd24dc95fc3d1ffd65a6235c0ea0..8ee91192fec70e2bdeb0d2d92d9b27031ca1c687 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -97,13 +97,15 @@ void InsetExternal::read(Buffer const *, LyXLex & lex)
        string token;
 
        // Read inset data from lex and store in format
-       if (lex.EatLine()) {
-               format = lex.GetString();
-       } else
+       if (lex.eatLine()) {
+               format = lex.getString();
+       } else {
                lex.printError("InsetExternal: Parse error: `$$Token'");
-       while (lex.IsOK()) {
+       }
+       
+       while (lex.isOK()) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
                if (token == "\\end_inset")
                        break;
        }

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index e3230b37408a91c850d353684e8352076c92d08d..16d47652bdc14a68dae1c7b5fe206d50ef53c8bf 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -150,12 +150,12 @@ void InsetFloat::write(Buffer const * buf, ostream & os) const
 
 void InsetFloat::read(Buffer const * buf, LyXLex & lex)
 {
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string token = lex.GetString();
+               string token = lex.getString();
                if (token == "placement") {
                        lex.next();
-                       floatPlacement_ = lex.GetString();
+                       floatPlacement_ = lex.getString();
                } else {
                        lyxerr << "InsetFloat::Read: Missing placement!"
                               << endl;
@@ -163,10 +163,10 @@ void InsetFloat::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
                lex.next();
-               token = lex.GetString();
+               token = lex.getString();
                if (token == "wide") {
                        lex.next();
-                       string const tmptoken = lex.GetString();
+                       string const tmptoken = lex.getString();
                        if (tmptoken == "true")
                                wide(true);
                        else

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index 5b35f22f56f9c5bfa88bee7e193ce3a18d05ea56..f6378fa87c0559e75ba5bd9dfbfd32bda121796b 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -39,14 +39,14 @@ void InsetFloatList::read(Buffer const *, LyXLex & lex)
 {
        string token;
 
-       if (lex.EatLine()) {
-               float_type = lex.GetString();
+       if (lex.eatLine()) {
+               float_type = lex.getString();
                lyxerr << "FloatList::float_type: " << float_type << endl;
        } else
                lex.printError("InsetFloatList: Parse error: `$$Token'");
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
                if (token == "\\end_inset")
                        break;
        }

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 7630dc4a139e9146949fdc287837bf301d0b5ff7..bdbd09366f13088bbad41fb7c26088f1ceac80cd 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -354,7 +354,7 @@ void InsetGraphics::write(Buffer const * buf, ostream & os) const
 
 void InsetGraphics::read(Buffer const * buf, LyXLex & lex)
 {
-       string const token = lex.GetString();
+       string const token = lex.getString();
 
        if (token == "Graphics")
                readInsetGraphics(buf, lex);
@@ -370,10 +370,10 @@ void InsetGraphics::readInsetGraphics(Buffer const * buf, LyXLex & lex)
 {
        bool finished = false;
 
-       while (lex.IsOK() && !finished) {
+       while (lex.isOK() && !finished) {
                lex.next();
 
-               string const token = lex.GetString();
+               string const token = lex.getString();
                lyxerr[Debug::INFO] << "Token: '" << token << '\'' 
                                    << std::endl;
 
@@ -383,7 +383,7 @@ void InsetGraphics::readInsetGraphics(Buffer const * buf, LyXLex & lex)
                        finished = true;
                } else if (token == "FormatVersion") {
                        lex.next();
-                       int version = lex.GetInteger();
+                       int version = lex.getInteger();
                        if (version > 1)
                                lyxerr
                                << "This document was created with a newer Graphics widget"
@@ -405,10 +405,10 @@ void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
 {
        bool finished = false;
        
-       while (lex.IsOK() && !finished) {
+       while (lex.isOK() && !finished) {
                lex.next();
 
-               string const token = lex.GetString();
+               string const token = lex.getString();
                lyxerr[Debug::INFO] << "Token: " << token << endl;
                
                if (token.empty())
@@ -417,7 +417,7 @@ void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
                        finished = true;
                } else if (token == "file") {
                        if (lex.next()) {
-                               string const name = lex.GetString();
+                               string const name = lex.getString();
                                string const path = OnlyPath(buf->fileName());
                                params.filename = MakeAbsPath(name, path);
                        }
@@ -425,25 +425,27 @@ void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
                        if (lex.next());
                        // kept for backwards compability. Delete in 0.13.x
                } else if (token == "subcaption") {
-                       if (lex.EatLine())
-                               params.subcaptionText = lex.GetString();
+                       if (lex.eatLine())
+                               params.subcaptionText = lex.getString();
                } else if (token == "label") {
                        if (lex.next());
                        // kept for backwards compability. Delete in 0.13.x
                } else if (token == "angle") {
                        if (lex.next())
-                               params.rotateAngle = lex.GetFloat();
+                               params.rotateAngle = lex.getFloat();
                } else if (token == "size") {
                        // Size of image on screen is ignored in InsetGraphics, just eat
                        // the input.
-                       if (lex.next())
-                               lex.GetInteger();
-                       if (lex.next())
-                               lex.GetInteger();
+                       if (lex.next()) {
+                               lex.getInteger();
+                       }
+                       if (lex.next()) {
+                               lex.getInteger();
+                       }
                } else if (token == "flags") {
                        InsetGraphicsParams::DisplayType tmp = InsetGraphicsParams::COLOR;
                        if (lex.next())
-                               switch (lex.GetInteger()) {
+                               switch (lex.getInteger()) {
                                case 1: tmp = InsetGraphicsParams::MONOCHROME; break;
                                case 2: tmp = InsetGraphicsParams::GRAYSCALE; break;
                                }
@@ -451,15 +453,19 @@ void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
                } else if (token == "subfigure") {
                        params.subcaption = true;
                } else if (token == "width") {
-                       if (lex.next())
-                               params.widthResize = static_cast<InsetGraphicsParams::Resize>(lex.GetInteger());
-                       if (lex.next())
-                               params.widthSize = lex.GetFloat();
+                       if (lex.next()) {
+                               params.widthResize = static_cast<InsetGraphicsParams::Resize>(lex.getInteger());
+                       }
+                       if (lex.next()) {
+                               params.widthSize = lex.getFloat();
+                       }
                } else if (token == "height") {
-                       if (lex.next())
-                               params.heightResize = static_cast<InsetGraphicsParams::Resize>(lex.GetInteger());
-                       if (lex.next())
-                               params.heightSize = lex.GetFloat();
+                       if (lex.next()) {
+                               params.heightResize = static_cast<InsetGraphicsParams::Resize>(lex.getInteger());
+                       }
+                       if (lex.next()) {
+                               params.heightSize = lex.getFloat();
+                       }
                }
        }
 }

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index f817136eebd226b7d7b7c5ee0a31557a7db30195..83956d378aa23e4c84c7e9b99729a138e6c3ce87 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -286,7 +286,7 @@ bool InsetGraphicsParams::Read(Buffer const * buf, LyXLex & lex,
 {
        if (token == "filename") {
                lex.next();
-               filename = lex.GetString();
+               filename = lex.getString();
 
                if (!filename.empty()) {
                        // Make the filename with absolute directory.
@@ -294,38 +294,38 @@ bool InsetGraphicsParams::Read(Buffer const * buf, LyXLex & lex,
                }
        } else if (token == "display") {
                lex.next();
-               string const type = lex.GetString();
+               string const type = lex.getString();
 
                display = displayTranslator.find(type);
        } else if (token == "subcaption") {
                subcaption = true;
        } else if (token == "subcaptionText") {
                lex.next();
-               subcaptionText = lex.GetString();
+               subcaptionText = lex.getString();
        } else if (token == "widthResize") {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
 
                readResize(this, false, token);
        } else if (token == "width") {
                lex.next();
-               widthSize = lex.GetFloat();
+               widthSize = lex.getFloat();
        } else if (token == "heightResize") {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
 
                readResize(this, true, token);
        } else if (token == "height") {
                lex.next();
-               heightSize = lex.GetFloat();
+               heightSize = lex.getFloat();
        } else if (token == "rotateOrigin") {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
 
                readOrigin(this, token);
        } else if (token == "rotateAngle") {
                lex.next();
-               rotateAngle = lex.GetFloat();
+               rotateAngle = lex.getFloat();
        } else {
                // If it's none of the above, its not ours.
                return false;

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 3709a847bd30f61b482c8a6fee12e052d2165c45..39f249b620baf045f46109fea087896671374b3e 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -621,8 +621,8 @@ void InsetLatexAccent::write(Buffer const *, ostream & os) const
 
 void InsetLatexAccent::read(Buffer const *, LyXLex & lex)
 {
-       lex.EatLine();
-       contents = lex.GetString();
+       lex.eatLine();
+       contents = lex.getString();
        checkContents();
 }
 

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index b5f24249140c79be7c0958fb48c59f6eba636d9c..b4085bfc0d49f084bab13c4c09c33bb18ac22376 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -115,12 +115,12 @@ void InsetMinipage::write(Buffer const * buf, ostream & os) const
 
 void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
 {
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "position") {
                        lex.next();
-                       pos_ = static_cast<Position>(lex.GetInteger());
+                       pos_ = static_cast<Position>(lex.getInteger());
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'position'-tag!"
                                   << endl;
@@ -128,12 +128,12 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
        }
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "inner_position") {
                        lex.next();
-                       inner_pos_ = static_cast<InnerPosition>(lex.GetInteger());
+                       inner_pos_ = static_cast<InnerPosition>(lex.getInteger());
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'inner_position'-tag!"
                                   << endl;
@@ -141,12 +141,12 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
        }
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "height") {
                        lex.next();
-                       height_ = lex.GetString();
+                       height_ = lex.getString();
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'height'-tag!"
                                   << endl;
@@ -154,12 +154,12 @@ void InsetMinipage::read(Buffer const * buf, LyXLex & lex)
                        lex.pushToken(token);
                }
        }
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "width") {
                        lex.next();
-                       width_ = lex.GetString();
+                       width_ = lex.getString();
                } else {
                        lyxerr << "InsetMinipage::Read: Missing 'width'-tag!"
                                   << endl;

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 26c0e626491b0237a3f4383a4d8f571ae4f91b6c..d379c99a8650a8d5060ee6400a1a102bca085f35 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -243,10 +243,11 @@ void InsetQuotes::write(Buffer const *, ostream & os) const
 void InsetQuotes::read(Buffer const *, LyXLex & lex)
 {
        lex.nextToken();
-       parseString(lex.GetString());
+       parseString(lex.getString());
        lex.next();
-       if (lex.GetString() != "\\end_inset")
+       if (lex.getString() != "\\end_inset") {
                lex.printError("Missing \\end_inset at this point");
+       }
 }
 
 

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index 7d322c1bc2ccc34c23baaf5b970ac15f00998efa..eacb1d4c4f9a6301b2307044359b82a5f713e52f 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -193,7 +193,7 @@ void InsetSpecialChar::write(Buffer const *, ostream & os) const
 void InsetSpecialChar::read(Buffer const *, LyXLex & lex)
 {    
        lex.nextToken();
-       string const command = lex.GetString();
+       string const command = lex.getString();
 
        if (command == "\\-")
                kind_ = HYPHENATION;

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index dc52ffc95b9d59a944fbb7e7724f7dfba7127226..a757b5129d20fc555c34ff5ce3f1375ec9fa08c7 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -178,7 +178,7 @@ void InsetTabular::write(Buffer const * buf, ostream & os) const
 
 void InsetTabular::read(Buffer const * buf, LyXLex & lex)
 {
-       bool const old_format = (lex.GetString() == "\\LyXTable");
+       bool const old_format = (lex.getString() == "\\LyXTable");
 
        //if (tabular)
        //delete tabular;
@@ -191,10 +191,10 @@ void InsetTabular::read(Buffer const * buf, LyXLex & lex)
                return;
 
        lex.nextToken();
-       string token = lex.GetString();
-       while (lex.IsOK() && (token != "\\end_inset")) {
+       string token = lex.getString();
+       while (lex.isOK() && (token != "\\end_inset")) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
        }
        if (token != "\\end_inset") {
                lex.printError("Missing \\end_inset at this point. "

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 03a58fa4e9d74ab844d5014190c34ee35894430b..3355374259fdf4c345b553e51ce725933b41c29f 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -234,9 +234,9 @@ void InsetText::read(Buffer const * buf, LyXLex & lex)
 
        clear();
        
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
                if (token.empty())
                        continue;
                if (token == "\\end_inset") {