From d0655188bcdbaeccc1fbcbb5ab997841da7ea6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 27 Sep 2000 13:52:39 +0000 Subject: [PATCH] some inset fixes + other fixes for warnings from cxx git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1046 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 10 ++++++++++ src/Bullet.h | 6 +++--- src/buffer.C | 4 ---- src/insets/insetlabel.C | 2 +- src/insets/insetlabel.h | 2 +- src/insets/insetref.C | 2 +- src/insets/insetref.h | 2 +- src/insets/inseturl.C | 2 +- src/insets/inseturl.h | 2 +- src/insets/lyxinset.h | 3 ++- 10 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b61f6b1db..ae2ff75b9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-09-27 Lars Gullik Bjønnes + + * src/Bullet.h: changed type of font, character and size to int + + * src/buffer.C (asciiParagraph): remove actcell and fname1. + + * src/insets/inseturl.[Ch]: + * src/insets/insetref.[Ch]: + * src/insets/insetlabel.[Ch]: add linelen to Ascii + 2000-09-26 Angus Leeming * src/buffer.C (readFile): block-if statement rearranged to minimise diff --git a/src/Bullet.h b/src/Bullet.h index b1eb94d516..38fc29e4cb 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -106,11 +106,11 @@ private: static string const bulletEntry(short int, short int); /// - short font; + int font; /// - short character; + int character; /// - short size; + int size; // size, character and font are array indices to access // the predefined arrays of LaTeX equivalent strings. diff --git a/src/buffer.C b/src/buffer.C index 9858be6672..67d59801bc 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1472,12 +1472,9 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, int linelen) const int j; int ltype = 0; int ltype_depth = 0; - int actcell = 0; int currlinelen = 0; bool ref_printed = false; - string fname1 = TmpFileName(); - int noparbreak = 0; int islatex = 0; if ( @@ -1573,7 +1570,6 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, int linelen) const } font1 = LyXFont(LyXFont::ALL_INHERIT, params.language_info); - actcell = 0; for (i = 0; i < par->size(); ++i) { if (!i && !footnoteflag && !noparbreak){ buffer << "\n\n"; diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C index 666c41a3be..8e1bbe75f4 100644 --- a/src/insets/insetlabel.C +++ b/src/insets/insetlabel.C @@ -73,7 +73,7 @@ int InsetLabel::Latex(Buffer const *, ostream & os, return 0; } -int InsetLabel::Ascii(Buffer const *, ostream & os) const +int InsetLabel::Ascii(Buffer const *, ostream & os, int linelen) const { os << "<" << getContents() << ">"; return 0; diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h index ccaa4c084b..38b7c534b4 100644 --- a/src/insets/insetlabel.h +++ b/src/insets/insetlabel.h @@ -38,7 +38,7 @@ public: int Latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const; /// - int Ascii(Buffer const *, std::ostream &) const; + int Ascii(Buffer const *, std::ostream &, int linelen) const; /// int Linuxdoc(Buffer const *, std::ostream &) const; /// diff --git a/src/insets/insetref.C b/src/insets/insetref.C index 31cce3a5d2..01008adad2 100644 --- a/src/insets/insetref.C +++ b/src/insets/insetref.C @@ -72,7 +72,7 @@ int InsetRef::Latex(Buffer const *, ostream & os, } -int InsetRef::Ascii(Buffer const *, ostream & os) const +int InsetRef::Ascii(Buffer const *, ostream & os, int linelen) const { os << "[" << getContents() << "]"; return 0; diff --git a/src/insets/insetref.h b/src/insets/insetref.h index 655602350d..621dcf1252 100644 --- a/src/insets/insetref.h +++ b/src/insets/insetref.h @@ -41,7 +41,7 @@ public: int Latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const; /// - int Ascii(Buffer const *, std::ostream &) const; + int Ascii(Buffer const *, std::ostream &, int linelen) const; /// int Linuxdoc(Buffer const *, std::ostream &) const; /// diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C index 161fe59fa9..ab8aec39df 100644 --- a/src/insets/inseturl.C +++ b/src/insets/inseturl.C @@ -54,7 +54,7 @@ int InsetUrl::Latex(Buffer const *, ostream & os, } -int InsetUrl::Ascii(Buffer const *, ostream & os) const +int InsetUrl::Ascii(Buffer const *, ostream & os, int linelen) const { if (getOptions().empty()) os << "[" << getContents() << "]"; diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h index 1f66ada053..1aaddcfab2 100644 --- a/src/insets/inseturl.h +++ b/src/insets/inseturl.h @@ -44,7 +44,7 @@ public: int Latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const; /// - int Ascii(Buffer const *, std::ostream &) const; + int Ascii(Buffer const *, std::ostream &, int linelen) const; /// int Linuxdoc(Buffer const *, std::ostream &) const; /// diff --git a/src/insets/lyxinset.h b/src/insets/lyxinset.h index 14831464cb..49ba016fa0 100644 --- a/src/insets/lyxinset.h +++ b/src/insets/lyxinset.h @@ -171,7 +171,8 @@ public: virtual int Latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const = 0; /// - virtual int Ascii(Buffer const *, std::ostream &, int linelen=0) const = 0; + virtual int Ascii(Buffer const *, + std::ostream &, int linelen = 0) const = 0; /// virtual int Linuxdoc(Buffer const *, std::ostream &) const = 0; ///