plasma: rename methods and arguments to fix clashes with definitions

fixes build on OpenIndiana

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/plasma/dataengines/time/solarsystem.cpp b/plasma/dataengines/time/solarsystem.cpp
index 82ca262..88d20db 100644 (file)
--- a/plasma/dataengines/time/solarsystem.cpp
+++ b/plasma/dataengines/time/solarsystem.cpp
@@ -55,8 +55,8 @@ void Sun::rotate(double* y, double* z)
     *z *= sind(m_obliquity);
 }
 
-Moon::Moon(Sun *sun)
-    : m_sun(sun)
+Moon::Moon(Sun *sunptr)
+    : m_sun(sunptr)
 {
 }
 

diff --git a/plasma/dataengines/time/solarsystem.h b/plasma/dataengines/time/solarsystem.h
index 85b06f9..da43d3d 100644 (file)
--- a/plasma/dataengines/time/solarsystem.h
+++ b/plasma/dataengines/time/solarsystem.h
@@ -110,7 +110,7 @@ class Sun : public SolarSystemObject
 class Moon : public SolarSystemObject
 {
     public:
-        Moon(Sun *sun);
+        Moon(Sun *sunptr);
         virtual ~Moon() {}; // to not delete the Sun
 
         virtual void calcForDateTime(const QDateTime& local, int offset);

diff --git a/plasma/dataengines/time/timesource.cpp b/plasma/dataengines/time/timesource.cpp
index fb3339b..5768d77 100644 (file)
--- a/plasma/dataengines/time/timesource.cpp
+++ b/plasma/dataengines/time/timesource.cpp
@@ -193,7 +193,7 @@ QString TimeSource::parseName(const QString &name)
     return list.at(0);
 }
 
-Sun* TimeSource::sun()
+Sun* TimeSource::sunptr()
 {
     if (!m_sun) {
         m_sun = new Sun();
@@ -202,10 +202,10 @@ Sun* TimeSource::sun()
     return m_sun;
 }
 
-Moon* TimeSource::moon()
+Moon* TimeSource::moonptr()
 {
     if (!m_moon) {
-        m_moon = new Moon(sun());
+        m_moon = new Moon(sunptr());
     }
     m_moon->setPosition(m_latitude, m_longitude);
     return m_moon;
@@ -213,7 +213,7 @@ Moon* TimeSource::moon()
 
 void TimeSource::addMoonPositionData(const QDateTime &dt)
 {
-    Moon* m = moon();
+    Moon* m = moonptr();
     m->calcForDateTime(dt, m_offset);
     setData("Moon Azimuth", m->azimuth());
     setData("Moon Zenith", 90 - m->altitude());
@@ -223,7 +223,7 @@ void TimeSource::addMoonPositionData(const QDateTime &dt)
 
 void TimeSource::addDailyMoonPositionData(const QDateTime &dt)
 {
-    Moon* m = moon();
+    Moon* m = moonptr();
     QList< QPair<QDateTime, QDateTime> > times = m->timesForAngles(
             QList<double>() << -0.833, dt, m_offset);
     setData("Moonrise", times[0].first);
@@ -234,7 +234,7 @@ void TimeSource::addDailyMoonPositionData(const QDateTime &dt)
 
 void TimeSource::addSolarPositionData(const QDateTime &dt)
 {
-    Sun* s = sun();
+    Sun* s = sunptr();
     s->calcForDateTime(dt, m_offset);
     setData("Azimuth", s->azimuth());
     setData("Zenith", 90.0 - s->altitude());
@@ -243,7 +243,7 @@ void TimeSource::addSolarPositionData(const QDateTime &dt)
 
 void TimeSource::addDailySolarPositionData(const QDateTime &dt)
 {
-    Sun* s = sun();
+    Sun* s = sunptr();
     QList< QPair<QDateTime, QDateTime> > times = s->timesForAngles(
             QList<double>() << -0.833 << -6.0 << -12.0 << -18.0, dt, m_offset);
 

diff --git a/plasma/dataengines/time/timesource.h b/plasma/dataengines/time/timesource.h
index e733e45..f6266bd 100644 (file)
--- a/plasma/dataengines/time/timesource.h
+++ b/plasma/dataengines/time/timesource.h
@@ -43,8 +43,8 @@ private:
     void addDailyMoonPositionData(const QDateTime &dt);
     void addSolarPositionData(const QDateTime &dt);
     void addDailySolarPositionData(const QDateTime &dt);
-    Sun* sun();
-    Moon* moon();
+    Sun* sunptr();
+    Moon* moonptr();
 
     QString m_tzName;
     int m_offset;