Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix compilation for Qt 4.6

  • Loading branch information...
commit b778ca1ef845d2c0a73c8bae904f846c4ee16a34 1 parent 82318f6
@natanojl natanojl authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 mythtv/libs/libmythtv/osd.cpp
View
8 mythtv/libs/libmythtv/osd.cpp
@@ -609,7 +609,7 @@ bool OSD::DrawDirect(MythPainter* painter, QSize size, bool repaint)
bool visible = false;
bool redraw = m_Refresh;
m_Refresh = false;
- QDateTime now = MythDate::current();
+ QTime now = MythDate::current().time();
CheckExpiry();
QMap<QString,MythScreenType*>::const_iterator it;
@@ -621,7 +621,7 @@ bool OSD::DrawDirect(MythPainter* painter, QSize size, bool repaint)
it.value()->Pulse();
if (m_Effects && m_ExpireTimes.contains(it.value()))
{
- QDateTime expires = m_ExpireTimes.value(it.value());
+ QTime expires = m_ExpireTimes.value(it.value()).time();
int left = now.msecsTo(expires);
if (left < m_FadeTime)
(*it)->SetAlpha((255 * left) / m_FadeTime);
@@ -664,7 +664,7 @@ QRegion OSD::Draw(MythPainter* painter, QPaintDevice *device, QSize size,
if (!painter || !device)
return visible;
- QDateTime now = MythDate::current();
+ QTime now = MythDate::current().time();
CheckExpiry();
// first update for alpha pulse and fade
@@ -682,7 +682,7 @@ QRegion OSD::Draw(MythPainter* painter, QPaintDevice *device, QSize size,
it.value()->Pulse();
if (m_Effects && m_ExpireTimes.contains(it.value()))
{
- QDateTime expires = m_ExpireTimes.value(it.value());
+ QTime expires = m_ExpireTimes.value(it.value()).time();
int left = now.msecsTo(expires);
if (left < m_FadeTime)
(*it)->SetAlpha((255 * left) / m_FadeTime);
Please sign in to comment.
Something went wrong with that request. Please try again.