trying to track down a bug in lyxlex with gcc 2.96, new insetmarginal, mini fix to...

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

diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index 3c098202bb7973b9c72c3a90c6dfff089140ac5b..b89284af8f9789dac7b1b336eea84f3fd8337834 100644 (file)
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -53,6 +53,8 @@ libinsets_la_SOURCES = \
        insetlof.h \
        insetlot.C \
        insetlot.h \
+       insetmarginal.h \
+       insetmarginal.C \
        insetparent.C \
        insetparent.h \
        insetquotes.C \

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index 6c67189a5c1f00d6ad333f2304ea7d557edf2b03..41496c6dd51f3ab02fe39b95e413e957ce5659b0 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -39,7 +39,7 @@ InsetFoot::InsetFoot() : InsetCollapsable()
 
 Inset * InsetFoot::Clone() const
 {
-    InsetFoot * result = new InsetFoot();
+    InsetFoot * result = new InsetFoot;
     result->init(this);
 
     result->collapsed = collapsed;

diff --git a/src/lyxlex.C b/src/lyxlex.C
index d50f08ebc441f0d0704462a8f988eeb7fb518598..178ad888337526791704706f1cd90ee35ab5c1bb 100644 (file)
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -123,7 +123,7 @@ float LyXLex::GetFloat() const
 }
 
 
-string const LyXLex::GetString() const
+string LyXLex::GetString() const
 {
        return pimpl_->GetString();
 }

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 8da47fb035bbec87b5aabcd344906430e3f42cbd..9f260653db8eb88aa7eafbd813cf55a8b9e66c8f 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -84,7 +84,7 @@ public:
        ///
        float GetFloat() const;
        ///
-       string const GetString() const;
+       string GetString() const;
        
        /**
         * Get a long string, ended by the tag `endtag'

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index 4bff9f5c1ebbac2b3c9b19d3c987d5c75e6bad3d..4068b7eb2ade0a1e97ec65a05e87203b404ececa 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -52,7 +52,7 @@ LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
 }
 
 
-string const LyXLex::Pimpl::GetString() const
+string LyXLex::Pimpl::GetString() const
 {
        return string(buff);
 }
@@ -119,11 +119,11 @@ void LyXLex::Pimpl::popTable()
 
 bool LyXLex::Pimpl::setFile(string const & filename)
 {
-       if (fb__.is_open())
-               lyxerr << "Error in LyXLex::setFile: "
-                       "file or stream already set." << endl;
+       //if (fb__.is_open())
+       //      lyxerr << "Error in LyXLex::setFile: "
+       //              "file or stream already set." << endl;
        fb__.open(filename.c_str(), ios::in);
-       is.rdbuf(&fb__);
+       //is.rdbuf(&fb__);
        name = filename;
        lineno = 0;
        return fb__.is_open() && is.good();

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index cfbb720555e1330656991a7f5353c5b2ed41923d..2991328f79c46f42f0ce15d03c1789ee28e52a0f 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -36,7 +36,7 @@ struct LyXLex::Pimpl {
        
        Pimpl(keyword_item * tab, int num);
        
-       string const GetString() const;
+       string GetString() const;
        
        void printError(string const & message) const;
        

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 4533ac0875f116500c79663c8c9327acb2ab96bf..fdef9a3dcb602ad298ac09c2cf65df99edd19203 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -1128,8 +1128,9 @@ void LyXRC::output(ostream & os) const
                // bind files are not done here.
        case RC_BEGINTOOLBAR:
                // Toolbar is not written here (yet).
-       case RC_SET_COLOR:
+       //case RC_SET_COLOR:
                // color bindings not written to preference file.
+               // And we want to be warned about that. (Lgb)
        case RC_FONT_ENCODING:
                os << "\\font_encoding \"" << fontenc << "\"\n";
        case RC_PRINTER: