From cfcb59904b0e84e597ddb528a76a2cf88ffce78d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 1 Jan 2006 20:28:05 +0000 Subject: [PATCH] fix some syntax errors git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10695 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 8 ++++++++ src/MenuBackend.h | 2 +- src/bufferlist.h | 2 +- src/insets/ChangeLog | 4 ++++ src/insets/insetcharstyle.h | 2 +- src/lyxtext.h | 2 +- src/mathed/ChangeLog | 4 ++++ src/mathed/command_inset.C | 2 +- src/paragraph.h | 8 ++++---- src/vspace.h | 2 +- 10 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0120f0400e..e182b015e2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2006-01-01 Lars Gullik Bjønnes + + * MenuBackend.h: + * bufferlist.h: + * lyxtext.h: + * paragraph.h: + * vspace.h: fix syntax error + 2005-12-31 Martin Vermeer * text3.C (dispatch): Force refresh if typing into inset changes its diff --git a/src/MenuBackend.h b/src/MenuBackend.h index 2fe43c9ceb..20e34f0fde 100644 --- 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 0b480edc03..2ca9fefe55 100644 --- 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 0b7df590d7..715c7a273a 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2006-01-01 + + * insetcharstyle.h: fix syntax error + 2005-12-31 Martin Vermeer * insetcollapsable.C (metrics): reverse patch of 2005-12-16 because diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h index 84c20cbb58..c1e59d9e3f 100644 --- 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 535d7623de..8b0242bb3f 100644 --- 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 b0d7820af8..d17e15ae70 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2006-01-01 + + * command_inset.C (editXY): unused parameters + 2005-12-15 Jürgen Spitzmüller * 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 40c38acc44..fcfa79d16a 100644 --- 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 9cb720cfb7..6a9e027244 100644 --- 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 e95c5ec7b5..dd21209ab3 100644 --- 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; -- 2.39.5