Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: rename methods and arguments to fix clashes with definitions

Browse source 
fixes build on OpenIndiana

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-09-18 18:23:29 +03:00
parent 6b9b691e4a
commit 101548c608
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plasma/dataengines/time/solarsystem.cpp
View file

@ -55,8 +55,8 @@ void Sun::rotate(double* y, double* z)
*z *= sind(m_obliquity); *z *= sind(m_obliquity);
} }
Moon::Moon(Sun *sun) Moon::Moon(Sun *sunptr)
: m_sun(sun) : m_sun(sunptr)
{ {
} }

2
plasma/dataengines/time/solarsystem.h
View file

@ -110,7 +110,7 @@ class Sun : public SolarSystemObject
class Moon : public SolarSystemObject class Moon : public SolarSystemObject
{ {
public: public:
Moon(Sun *sun); Moon(Sun *sunptr);
virtual ~Moon() {}; // to not delete the Sun virtual ~Moon() {}; // to not delete the Sun
virtual void calcForDateTime(const QDateTime& local, int offset); virtual void calcForDateTime(const QDateTime& local, int offset);

14
plasma/dataengines/time/timesource.cpp
View file

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

4
plasma/dataengines/time/timesource.h
View file

@ -43,8 +43,8 @@ private:
void addDailyMoonPositionData(const QDateTime &dt); void addDailyMoonPositionData(const QDateTime &dt);
void addSolarPositionData(const QDateTime &dt); void addSolarPositionData(const QDateTime &dt);
void addDailySolarPositionData(const QDateTime &dt); void addDailySolarPositionData(const QDateTime &dt);
Sun* sun(); Sun* sunptr();
Moon* moon(); Moon* moonptr();
QString m_tzName; QString m_tzName;
int m_offset; int m_offset;