From fb1ac4faa0168e4b5fc19b6eb730980fe2cbbdb1 Mon Sep 17 00:00:00 2001 From: anbr Date: Sat, 30 Jun 2012 15:31:10 +0200 Subject: =?UTF-8?q?Fix=20warning=20hidden=20=E2=80=98ciMonFont::DrawText?= =?UTF-8?q?=E2=80=99=20[-Werror=3Doverloaded-virtual]=20(Closes=20#1034)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ffont.h | 1 + imon.c | 4 ++-- imon.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ffont.h b/ffont.h index 3521c49..2681650 100644 --- a/ffont.h +++ b/ffont.h @@ -66,6 +66,7 @@ private: int Kerning(ciMonGlyph *Glyph, uint PrevSym) const; ciMonGlyph* Glyph(uint CharCode) const; virtual void DrawText(cBitmap*, int, int, const char*, tColor, tColor, int) const {}; + virtual void DrawText(cPixmap*, int, int, const char*, tColor, tColor, int) const {}; public: ciMonFont(const char *Name, int CharHeight, int CharWidth = 0); virtual ~ciMonFont(); diff --git a/imon.c b/imon.c index 43d48a6..789a76e 100644 --- a/imon.c +++ b/imon.c @@ -626,9 +626,9 @@ void ciMonLCD::setBuiltinProgressBars(int topLine, int botLine, * \param length The length of the bar. * \return The pixmap that represents the given length. */ -int ciMonLCD::lengthToPixels(int length) +unsigned int ciMonLCD::lengthToPixels(int length) { - int pixLen[] = + unsigned int pixLen[] = { 0x00, 0x00000080, 0x000000c0, 0x000000e0, 0x000000f0, 0x000000f8, 0x000000fc, 0x000000fe, 0x000000ff, diff --git a/imon.h b/imon.h index 14cff8d..0f588f7 100644 --- a/imon.h +++ b/imon.h @@ -109,7 +109,7 @@ protected: void setLineLength(int topLine, int botLine, int topProgress, int botProgress); void setBuiltinProgressBars(int topLine, int botLine, int topProgress, int botProgress); - int lengthToPixels(int length); + unsigned int lengthToPixels(int length); bool SendCmd(const uint64_t & cmdData); bool SendCmdClock(time_t tAlarm); -- cgit v1.2.3