From 742cd190cb08b8e81af5eb43fdb7baef0bfa9d1a Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Sun, 8 Oct 2006 14:24:12 +0000 Subject: [PATCH] revert to revision 15266 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15280 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QLPainter.C | 7 +++---- src/frontends/qt4/QLPainter.h | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C index 9bd17c44b4..92744f0d2a 100644 --- a/src/frontends/qt4/QLPainter.C +++ b/src/frontends/qt4/QLPainter.C @@ -183,13 +183,13 @@ void QLPainter::image(int x, int y, int w, int h, } -int QLPainter::text(int x, int y, docstring const & s, LyXFont const & f) +void QLPainter::text(int x, int y, docstring const & s, LyXFont const & f) { return text(x, y, reinterpret_cast(s.data()), s.length(), f); } -int QLPainter::text(int x, int y, char_type c, LyXFont const & f) +void QLPainter::text(int x, int y, char_type c, LyXFont const & f) { char_type s[2] = { c, char_type('\0') }; return text(x, y, s, 1, f); @@ -222,7 +222,7 @@ int QLPainter::smallCapsText(int x, int y, } -int QLPainter::text(int x, int y, char_type const * s, size_t ls, +void QLPainter::text(int x, int y, char_type const * s, size_t ls, LyXFont const & f) { #if 0 @@ -260,7 +260,6 @@ int QLPainter::text(int x, int y, char_type const * s, size_t ls, underline(f, x, y, textwidth); } - return textwidth; } diff --git a/src/frontends/qt4/QLPainter.h b/src/frontends/qt4/QLPainter.h index 145e974c56..f53b0e67c9 100644 --- a/src/frontends/qt4/QLPainter.h +++ b/src/frontends/qt4/QLPainter.h @@ -103,18 +103,18 @@ public: lyx::graphics::Image const & image); /// draw a string at position x, y (y is the baseline) - virtual int text(int x, int y, + virtual void text(int x, int y, lyx::docstring const & str, LyXFont const & f); /** Draw a string at position x, y (y is the baseline) * This is just for fast drawing */ - virtual int text(int x, int y, + virtual void text(int x, int y, lyx::char_type const * str, size_t l, LyXFont const & f); /// draw a char at position x, y (y is the baseline) - virtual int text(int x, int y, + virtual void text(int x, int y, lyx::char_type c, LyXFont const & f); /// draw a pixmap from the image cache -- 2.39.2