It would be nice if you could say "must derive" in C++ I think thanks john -- "Who can afford to do professional work for nothing ? What hobbyist can put 3-man years into programming, finding all bugs, documenting his product and distribute for free ?" - Bill Gates
Index: src/insets/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v retrieving revision 1.102 diff -u -r1.102 ChangeLog --- src/insets/ChangeLog 2001/06/28 10:25:17 1.102 +++ src/insets/ChangeLog 2001/06/29 02:37:41 @@ -1,3 +1,11 @@ +2001-06-29 John Levon <[EMAIL PROTECTED]> + + * insettoc.h: + * insettoc.C: + * inseturl.h: + * inseturl.C: fix method names in these to begin + with small char too, so they inherit + 2001-06-28 Lars Gullik Bjønnes <[EMAIL PROTECTED]> * Change a lot of method names to begin with a small char. Index: src/insets/insettoc.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettoc.h,v retrieving revision 1.26 diff -u -r1.26 insettoc.h --- src/insets/insettoc.h 2001/06/28 10:25:20 1.26 +++ src/insets/insettoc.h 2001/06/29 02:37:42 @@ -31,17 +31,17 @@ /// string const getScreenLabel() const; /// - void Edit(BufferView * bv, int, int, unsigned int); + void edit(BufferView * bv, int, int, unsigned int); /// - EDITABLE Editable() const { return IS_EDITABLE; } + EDITABLE editable() const { return IS_EDITABLE; } /// bool display() const { return true; } /// - Inset::Code LyxCode() const; + Inset::Code lyxCode() const; /// - int Ascii(Buffer const *, std::ostream &, int linelen) const; + int ascii(Buffer const *, std::ostream &, int linelen) const; /// - int Linuxdoc(Buffer const *, std::ostream &) const; + int linuxdoc(Buffer const *, std::ostream &) const; /// int DocBook(Buffer const *, std::ostream &) const; }; Index: src/insets/insettoc.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettoc.C,v retrieving revision 1.26 diff -u -r1.26 insettoc.C --- src/insets/insettoc.C 2001/05/04 10:36:36 1.26 +++ src/insets/insettoc.C 2001/06/29 02:37:42 @@ -24,7 +24,7 @@ } -Inset::Code InsetTOC::LyxCode() const +Inset::Code InsetTOC::lyxCode() const { string const cmdname(getCmdName()); if (cmdname == "tableofcontents") @@ -33,13 +33,13 @@ } -void InsetTOC::Edit(BufferView * bv, int, int, unsigned int) +void InsetTOC::edit(BufferView * bv, int, int, unsigned int) { bv->owner()->getDialogs()->showTOC(this); } -int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const +int InsetTOC::ascii(Buffer const * buffer, std::ostream & os, int) const { os << getScreenLabel() << "\n\n"; @@ -63,7 +63,7 @@ } -int InsetTOC::Linuxdoc(Buffer const *, std::ostream & os) const +int InsetTOC::linuxdoc(Buffer const *, std::ostream & os) const { if (getCmdName() == "tableofcontents") os << "<toc>"; Index: src/insets/inseturl.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inseturl.h,v retrieving revision 1.35 diff -u -r1.35 inseturl.h --- src/insets/inseturl.h 2001/06/28 10:25:20 1.35 +++ src/insets/inseturl.h 2001/06/29 02:37:42 @@ -31,24 +31,24 @@ return new InsetUrl(params()); } /// - Inset::Code LyxCode() const { return Inset::URL_CODE; } + Inset::Code lyxCode() const { return Inset::URL_CODE; } /// - void Validate(LaTeXFeatures &) const; + void validate(LaTeXFeatures &) const; /// string const getScreenLabel() const; /// - EDITABLE Editable() const { return IS_EDITABLE; } + EDITABLE editable() const { return IS_EDITABLE; } /// - void Edit(BufferView *, int, int, unsigned int); + void edit(BufferView *, int, int, unsigned int); /// bool display() const { return false; } /// - int Latex(Buffer const *, std::ostream &, + int latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const; /// - int Ascii(Buffer const *, std::ostream &, int linelen) const; + int ascii(Buffer const *, std::ostream &, int linelen) const; /// - int Linuxdoc(Buffer const *, std::ostream &) const; + int linuxdoc(Buffer const *, std::ostream &) const; /// int DocBook(Buffer const *, std::ostream &) const; }; Index: src/insets/inseturl.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inseturl.C,v retrieving revision 1.34 diff -u -r1.34 inseturl.C --- src/insets/inseturl.C 2001/04/05 12:26:41 1.34 +++ src/insets/inseturl.C 2001/06/29 02:37:42 @@ -20,7 +20,7 @@ {} -void InsetUrl::Edit(BufferView * bv, int, int, unsigned int) +void InsetUrl::edit(BufferView * bv, int, int, unsigned int) { bv->owner()->getDialogs()->showUrl( this ); } @@ -43,7 +43,7 @@ } -int InsetUrl::Latex(Buffer const *, ostream & os, +int InsetUrl::latex(Buffer const *, ostream & os, bool fragile, bool /*free_spc*/) const { if (!getOptions().empty()) @@ -55,7 +55,7 @@ } -int InsetUrl::Ascii(Buffer const *, ostream & os, int) const +int InsetUrl::ascii(Buffer const *, ostream & os, int) const { if (getOptions().empty()) os << "[" << getContents() << "]"; @@ -65,7 +65,7 @@ } -int InsetUrl::Linuxdoc(Buffer const *, ostream & os) const +int InsetUrl::linuxdoc(Buffer const *, ostream & os) const { os << "<" << getCmdName() << " url=\"" << getContents() << "\"" @@ -83,7 +83,7 @@ } -void InsetUrl::Validate(LaTeXFeatures & features) const +void InsetUrl::validate(LaTeXFeatures & features) const { features.url = true; }