SVN commit 1212412 by rahn: Backport: rahn * r1212409 trunk/KDE/kdeedu/marble/src/lib/ (Planet.cpp Planet.h) Commit Den's planet part of http://reviewboard.kde.org/r/6223/ Add planet option to map creation wizard M +20 -0 Planet.cpp M +5 -0 Planet.h --- branches/marble/marble-1.1/src/lib/Planet.cpp #1212411:1212412 @@ -348,6 +348,26 @@ return id; } +QStringList Planet::planetList() +{ + + QStringList planets; + + planets << "mercury" + << "venus" + << "earth" + << "mars" + << "jupiter" + << "saturn" + << "uranus" + << "neptune" + << "pluto" + << "sun" + << "moon"; + + return planets; +} + Planet& Planet::operator=(const Planet& rhs) { // PlanetPrivate does not have pointer members, so we can just --- branches/marble/marble-1.1/src/lib/Planet.h #1212411:1212412 @@ -12,6 +12,7 @@ #define MARBLE_PLANET_H #include "marble_export.h" +#include namespace Marble { @@ -94,6 +95,10 @@ static QString name( const QString& id ); + static QStringList planetList(); + + + private: PlanetPrivate * const d; };