← Back to branch summary

~georg-zotti/stellarium/gz_AtmosphereTweaks

« back to all changes in this revision

Viewing changes to plugins/MeteorShowers/src/MeteorShowers.cpp

  • Committer: Georg Zotti
  • Date: 2017-05-23 13:18:09 UTC
  • mfrom: (8115.1.1321 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20170523131809-a6pus0ogpmjwtmd8
merge-in trunk r9436

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/MeteorShowers/src/MeteorShowers.cpp
163
163
        {
164
164
                if (ms->enabled())
165
165
                {
166
 
                        equPos = ms->getJ2000EquatorialPos(NULL);
 
166
                        equPos = ms->getJ2000EquatorialPos(Q_NULLPTR);
167
167
                        equPos.normalize();
168
168
                        if (equPos[0]*v[0] + equPos[1]*v[1] + equPos[2]*v[2] >= cosLimFov)
169
169
                        {
178
178
{
179
179
        if (!m_mgr->getEnablePlugin())
180
180
        {
181
 
                return NULL;
 
181
                return Q_NULLPTR;
182
182
        }
183
183
 
184
184
        foreach(const MeteorShowerP& ms, m_meteorShowers)
194
194
                        }
195
195
                }
196
196
        }
197
 
        return NULL;
 
197
        return Q_NULLPTR;
198
198
}
199
199
 
200
200
StelObjectP MeteorShowers::searchByID(const QString &id) const
204
204
                if (ms->getID() == id)
205
205
                        return qSharedPointerCast<StelObject>(ms);
206
206
        }
207
 
        return NULL;
 
207
        return Q_NULLPTR;
208
208
}
209
209
 
210
210
StelObjectP MeteorShowers::searchByNameI18n(const QString& nameI18n) const
211
211
{
212
212
        if (!m_mgr->getEnablePlugin())
213
213
        {
214
 
                return NULL;
 
214
                return Q_NULLPTR;
215
215
        }
216
216
 
217
217
        foreach(const MeteorShowerP& ms, m_meteorShowers)
224
224
                        }
225
225
                }
226
226
        }
227
 
        return NULL;
 
227
        return Q_NULLPTR;
228
228
}
229
229
 
230
230
QStringList MeteorShowers::listMatchingObjects(const QString& objPrefix, int maxNbItem, bool useStartOfWords, bool inEnglish) const