StelLocationMgr.hpp   StelLocationMgr.hpp 
skipping to change at line 48 skipping to change at line 48
StelLocationMgr(); StelLocationMgr();
//! Destructor //! Destructor
~StelLocationMgr(); ~StelLocationMgr();
//! Return the model containing all the city //! Return the model containing all the city
QStringListModel* getModelAll() {return modelAllLocation;} QStringListModel* getModelAll() {return modelAllLocation;}
//! Return the list of all loaded locations //! Return the list of all loaded locations
QList<StelLocation> getAll() const {return locations.values();} QList<StelLocation> getAll() const {return locations.values();}
//! Return the StelLocation for a given string
//! Can match location name, or coordinates
const StelLocation locationForString(const QString& s, bool* ok=NULL
) const;
//! Return the StelLocation for the given row (match modelAllLocatio n index row) //! Return the StelLocation for the given row (match modelAllLocatio n index row)
const StelLocation locationForSmallString(const QString& s) const; const StelLocation locationForSmallString(const QString& s, bool* ok
=NULL) const;
//! Return a valid location when no valid one was found.
const StelLocation& getLastResortLocation() const {return lastResort
Location;}
//! Get whether a location can be permanently added to the list of u ser locations //! Get whether a location can be permanently added to the list of u ser locations
//! The main constraint is that the small string must be unique //! The main constraint is that the small string must be unique
bool canSaveUserLocation(const StelLocation& loc) const; bool canSaveUserLocation(const StelLocation& loc) const;
//! Add permanently a location to the list of user locations //! Add permanently a location to the list of user locations
//! It is later identified by its small string //! It is later identified by its small string
bool saveUserLocation(const StelLocation& loc); bool saveUserLocation(const StelLocation& loc);
//! Get whether a location can be deleted from the list of user loca tions //! Get whether a location can be deleted from the list of user loca tions
skipping to change at line 81 skipping to change at line 88
//! Load cities from a file //! Load cities from a file
QMap<QString, StelLocation> loadCities(const QString& fileName, bool isUserLocation) const; QMap<QString, StelLocation> loadCities(const QString& fileName, bool isUserLocation) const;
QMap<QString, StelLocation> loadCitiesBin(const QString& fileName) c onst; QMap<QString, StelLocation> loadCitiesBin(const QString& fileName) c onst;
//! Model containing all the city information //! Model containing all the city information
QStringListModel* modelAllLocation; QStringListModel* modelAllLocation;
//! The list of all loaded locations //! The list of all loaded locations
QMap<QString, StelLocation> locations; QMap<QString, StelLocation> locations;
StelLocation lastResortLocation;
}; };
#endif // _STELLOCATIONMGR_HPP_ #endif // _STELLOCATIONMGR_HPP_
 End of changes. 3 change blocks. 
1 lines changed or deleted 13 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/