SolarSystem.hpp   SolarSystem.hpp 
skipping to change at line 18 skipping to change at line 18
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _SOLARSYSTEM_HPP_ #ifndef _SOLARSYSTEM_HPP_
#define _SOLARSYSTEM_HPP_ #define _SOLARSYSTEM_HPP_
//sun is already defined in Sun C/Solaris //sun is already defined in Sun C/Solaris
#if defined(sun) #if defined(sun)
#undef sun #undef sun
#endif #endif
#include <QFont> #include <QFont>
#include "StelObjectModule.hpp" #include "StelObjectModule.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
#include "Planet.hpp" #include "Planet.hpp"
class Orbit; class Orbit;
class StelTranslator; class StelTranslator;
class StelObject; class StelObject;
class StelCore; class StelCore;
class StelProjector; class StelProjector;
class StelNavigator;
class QSettings; class QSettings;
typedef QSharedPointer<Planet> PlanetP; typedef QSharedPointer<Planet> PlanetP;
//! @class SolarSystem //! @class SolarSystem
//! This StelObjectModule derivative is used to model SolarSystem bodies. //! This StelObjectModule derivative is used to model SolarSystem bodies.
//! This includes the Major Planets, Minor Planets and Comets. //! This includes the Major Planets, Minor Planets and Comets.
class SolarSystem : public StelObjectModule class SolarSystem : public StelObjectModule
{ {
Q_OBJECT Q_OBJECT
skipping to change at line 222 skipping to change at line 221
//! Get a hash of locale and ssystem.ini names for use with the TUI. //! Get a hash of locale and ssystem.ini names for use with the TUI.
//! @return A newline delimited hash of localized:standard planet na mes. //! @return A newline delimited hash of localized:standard planet na mes.
//! Planet translated name is PARENT : NAME //! Planet translated name is PARENT : NAME
//! \deprecated ??? //! \deprecated ???
QString getPlanetHashString(); QString getPlanetHashString();
//! Compute the position and transform matrix for every element of t he solar system. //! Compute the position and transform matrix for every element of t he solar system.
//! @param observerPos Position of the observer in heliocentric ecli ptic frame (Required for light travel time computation). //! @param observerPos Position of the observer in heliocentric ecli ptic frame (Required for light travel time computation).
//! @param date the date in JDay //! @param date the date in JDay
//! \deprecated ??? In the "deprecated" section, but used in SolarSy stem::init() //! \deprecated ??? In the "deprecated" section, but used in SolarSy stem::init()
//! and StelNavigator::updateTime()
void computePositions(double date, const Vec3d& observerPos = Vec3d( 0.)); void computePositions(double date, const Vec3d& observerPos = Vec3d( 0.));
//! Get the list of all the bodies of the solar system. //! Get the list of all the bodies of the solar system.
//! \deprecated Used in LandscapeMgr::update(), but commented out. //! \deprecated Used in LandscapeMgr::update(), but commented out.
const QList<PlanetP>& getAllPlanets() const {return systemPlanets;} const QList<PlanetP>& getAllPlanets() const {return systemPlanets;}
private slots: private slots:
//! Called when a new object is selected. //! Called when a new object is selected.
void selectedObjectChange(StelModule::StelModuleSelectAction action) ; void selectedObjectChange(StelModule::StelModuleSelectAction action) ;
 End of changes. 3 change blocks. 
3 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/