+2001-04-04 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * lyxrow.C (par): moved
+ (height): moved
+ (next): moved
+ * lyxrox.h: as inlines here
+
+ * lyxfont.h (shape): moved from lyxfont.C
+ (emph): moved from lyxfont.C
+
+ * lyxfont.C (LyXFont): use initialization list for all
+ constructors
+ (shape): move to lyxfont.h as inline
+ (emph): move to lyxfont.h as inline
+
+
2001-04-04 Juergen Vigna <jug@sad.it>
* vspace.C: had to include stdio.h for use of sscanf
LyXFont::LyXFont()
-{
- bits = sane;
- lang = default_language;
-}
+ : bits(sane), lang(default_language)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT1)
-{
- bits = inherit;
- lang = default_language;
-}
+ : bits(inherit), lang(default_language)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT2)
-{
- bits = ignore;
- lang = ignore_language;
-}
+ : bits(ignore), lang(ignore_language)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT3)
-{
- bits = sane;
- lang = default_language;
-}
+ : bits(sane), lang(default_language)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l)
-{
- bits = inherit;
- lang = l;
-}
+ : bits(inherit), lang(l)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l)
-{
- bits = ignore;
- lang = l;
-}
+ : bits(ignore), lang(l)
+{}
LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
-{
- bits = sane;
- lang = l;
-}
+ : bits(sane), lang(l)
+{}
LyXFont::FONT_FAMILY LyXFont::family() const
}
-LyXFont::FONT_SHAPE LyXFont::shape() const
-{
- return bits.shape;
-}
-
-
LyXFont::FONT_SIZE LyXFont::size() const
{
return bits.size;
}
-LyXFont::FONT_MISC_STATE LyXFont::emph() const
-{
- return bits.emph;
-}
-
-
LyXFont::FONT_MISC_STATE LyXFont::underbar() const
{
return bits.underbar;
LyXFont::FONT_MISC_STATE org);
};
+
+inline
+LyXFont::FONT_SHAPE LyXFont::shape() const
+{
+ return bits.shape;
+}
+
+
+inline
+LyXFont::FONT_MISC_STATE LyXFont::emph() const
+{
+ return bits.emph;
+}
+
+
///
std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);
}
-LyXParagraph * Row::par()
-{
- return par_;
-}
-
-
-LyXParagraph * Row::par() const
-{
- return par_;
-}
-
-
void Row::pos(LyXParagraph::size_type p)
{
pos_ = p;
}
-unsigned short Row::height() const
-{
- return height_;
-}
-
-
void Row::width(unsigned int w)
{
width_ = w;
}
-Row * Row::next() const
-{
- return next_;
-}
-
-
void Row::previous(Row * r)
{
previous_ = r;