--- plasma/generic/dataengines/time/timesource.cpp.orig	2010-07-09 19:25:14.952617745 +0200
+++ plasma/generic/dataengines/time/timesource.cpp	2010-07-09 19:25:41.697249840 +0200
@@ -175,7 +175,7 @@
     return list.at(0);
 }
 
-Sun* TimeSource::sun()
+Sun* TimeSource::x_sun()
 {
     if (!m_sun) {
         m_sun = new Sun();
@@ -187,7 +187,7 @@
 Moon* TimeSource::moon()
 {
     if (!m_moon) {
-        m_moon = new Moon(sun());
+        m_moon = new Moon(x_sun());
     }
     m_moon->setPosition(m_latitude, m_longitude);
     return m_moon;
@@ -216,7 +216,7 @@
 
 void TimeSource::addSolarPositionData(const QDateTime &dt)
 {
-    Sun* s = sun();
+    Sun* s = x_sun();
     s->calcForDateTime(dt, m_offset);
     setData("Azimuth", s->azimuth());
     setData("Zenith", 90.0 - s->altitude());
@@ -225,7 +225,7 @@
 
 void TimeSource::addDailySolarPositionData(const QDateTime &dt)
 {
-    Sun* s = sun();
+    Sun* s = x_sun();
     QList< QPair<QDateTime, QDateTime> > times = s->timesForAngles(
             QList<double>() << -0.833 << -6.0 << -12.0 << -18.0, dt, m_offset);