fix some syntax errors

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0120f0400ec01da81926e962de9a5ce21efff0e2..e182b015e2fc5fc625e4d97fde0a0609b1e2ee83 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-01  Lars Gullik Bjønnes <larsbj@gullik.net>
+
+       * MenuBackend.h: 
+       * bufferlist.h: 
+       * lyxtext.h: 
+       * paragraph.h:
+       * vspace.h: fix syntax error
+
 2005-12-31  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * text3.C (dispatch): Force refresh if typing into inset changes its

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 2fe43c9cebdb497d5e6d79b306d1d970dada360d..20e34f0fde06aa0a828ad01d721ce0dfab8897a1 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -190,7 +190,7 @@ public:
        ///
        typedef MenuList::iterator iterator;
        ///
-       MenuBackend::MenuBackend() : specialmenu_(0) {}
+       MenuBackend() : specialmenu_(0) {}
        ///
        void read(LyXLex &);
        ///

diff --git a/src/bufferlist.h b/src/bufferlist.h
index 0b480edc03de4731b134351dd9369a0f697aa07d..2ca9fefe551d2db3404e8b16ba85323abf66b422 100644 (file)
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -69,7 +69,7 @@ public:
        /// returns a pointer to the buffer with the given number.
        Buffer * getBuffer(unsigned int);
        /// returns a pointer to the buffer whose temppath matches the string
-       Buffer * BufferList::getBufferFromTmp(std::string const &);
+       Buffer * getBufferFromTmp(std::string const &);
 
        /** returns a pointer to the buffer that follows argument in
         * buffer list. The buffer following the last in list is the

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 0b7df590d731762df4788d0d43731a0cfe45a5da..715c7a273a7ac0ff367142f9270d781a26a9031a 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-01    <larsbj@gullik.net>
+
+       * insetcharstyle.h: fix syntax error
+
 2005-12-31  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * insetcollapsable.C (metrics): reverse patch of 2005-12-16 because

diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index 84c20cbb588a3b10d3a0afa1f1f4fb8618bad423..c1e59d9e3fb8d9f104ab074dbfd653b258fac3a5 100644 (file)
--- a/src/insets/insetcharstyle.h
+++ b/src/insets/insetcharstyle.h
@@ -44,7 +44,7 @@ public:
 class InsetCharStyle : public InsetCollapsable {
 public:
        /// Construct an undefined character style
-       InsetCharStyle::InsetCharStyle(BufferParams const &, std::string const);
+       InsetCharStyle(BufferParams const &, std::string const);
        ///
        InsetCharStyle(BufferParams const &, CharStyles::iterator);
        /// Is this character style defined in the document's textclass?

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 535d7623deda38ceab0c5fbb3cdb01177972b77e..8b0242bb3fb943a66a97e3abeff189192d7a4209 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -133,7 +133,7 @@ public:
        /// read-write access to individual paragraph
        Paragraph & getPar(pit_type pit) { return pars_[pit]; }
        // Returns the current font and depth as a message.
-       std::string LyXText::currentState(LCursor & cur);
+       std::string currentState(LCursor & cur);
 
        /** returns row near the specified
          * y-coordinate in given paragraph (relative to the screen).

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index b0d7820af8068b322ea64da46c461f23f5582dab..d17e15ae70417230a076da2a962e9ddde0875f21 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-01    <larsbj@gullik.net>
+
+       * command_inset.C (editXY): unused parameters
+
 2005-12-15  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * math_hullinset.C: initialize Math (symbol fonts and parser) if not

diff --git a/src/mathed/command_inset.C b/src/mathed/command_inset.C
index 40c38acc44fee8ffccd9dcb8e54a7639ceb8905c..fcfa79d16a326288eff6da2e1787351dfa7c6ee0 100644 (file)
--- a/src/mathed/command_inset.C
+++ b/src/mathed/command_inset.C
@@ -47,7 +47,7 @@ void CommandInset::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-InsetBase * CommandInset::editXY(LCursor & cur, int x, int y)
+InsetBase * CommandInset::editXY(LCursor & cur, int /*x*/, int /*y*/)
 {
        edit(cur, true);
        return this;

diff --git a/src/paragraph.h b/src/paragraph.h
index 9cb720cfb704d7b624b1dcef0cd7cdb79cb9c31e..6a9e0272441060ad12b0ac2ea1d407582141d98c 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -107,10 +107,10 @@ public:
        ///
        std::string const asString(Buffer const &, bool label) const;
        ///
-       std::string const Paragraph::asString(Buffer const & buffer,
-                                             lyx::pos_type beg,
-                                             lyx::pos_type end,
-                                             bool label) const;
+       std::string const asString(Buffer const & buffer,
+                                  lyx::pos_type beg,
+                                  lyx::pos_type end,
+                                  bool label) const;
        ///
        std::string const asString(Buffer const &,
                                   OutputParams const & runparams,

diff --git a/src/vspace.h b/src/vspace.h
index e95c5ec7b55a8b9c562fa6e3513e513bbde7e97b..dd21209ab33c19c86537913d29974f871fb92931 100644 (file)
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -62,7 +62,7 @@ public:
        /// the latex representation
        std::string const asLatexCommand(BufferParams const & params) const;
        /// how it is seen in the LyX window
-       std::string const VSpace::asGUIName() const;
+       std::string const asGUIName() const;
        /// the size of the space on-screen
        int inPixels(BufferView const & bv) const;